Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenMapTiles 3.15.0 SNAPSHOT (3) #160

Merged
merged 291 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
291 commits
Select commit Hold shift + click to select a range
6a099de
clean-up: mvn spotless:apply
phanecak-maptiler Oct 2, 2023
afbd863
Long ferries (as per OMT PR 1486)
phanecak-maptiler Oct 2, 2023
19a75a0
regenerate-openmaptiles.sh b3d67ed5b327c9059aeea0b3304772c6b4c8c7e9 …
phanecak-maptiler Oct 2, 2023
899a0c5
Add aboriginal lands (as per OMT PR 1489)
phanecak-maptiler Oct 2, 2023
7043e8c
handle duplicate route relations (to match OMT PR 1501)
phanecak-maptiler Oct 4, 2023
b597ecf
regenerate-openmaptiles.sh master, to match several OMT PRs which adj…
phanecak-maptiler Oct 6, 2023
604f22b
URLs in comments adjusted to match OMT PR 1560
phanecak-maptiler Oct 9, 2023
ed7e357
Convert separated addresses to dashed addresses
phanecak-maptiler Oct 9, 2023
3470989
add brunnel (and layer) attributes only for certain zoomlevels, depen…
phanecak-maptiler Oct 10, 2023
3876d6b
unit test testInterstateMotorway(): brunnel tag for test line no long…
phanecak-maptiler Oct 10, 2023
bca12e2
unit test testInterstateMotorway() clean-up: Z13 was tested twice
phanecak-maptiler Oct 10, 2023
7a22bc6
Merge pull request #15 from phanecak-maptiler/omt3_15-yml_sync_and_ja…
phanecak-maptiler Oct 10, 2023
cf9e850
Merge pull request #16 from phanecak-maptiler/omt3_15-update_doc
phanecak-maptiler Oct 10, 2023
22029f1
Merge branch 'omt_3_15_0' into omt3_15-aboriginal
phanecak-maptiler Oct 10, 2023
26680da
Merge pull request #13 from phanecak-maptiler/omt3_15-fix-dupe-route
phanecak-maptiler Oct 11, 2023
37c657d
Merge pull request #12 from phanecak-maptiler/omt3_15-aboriginal
phanecak-maptiler Oct 11, 2023
ac6bb21
minor clean-up: fixed unit test naming
phanecak-maptiler Oct 11, 2023
f6c4ace
Merge pull request #17 from phanecak-maptiler/omt3_15-housenumber-col…
phanecak-maptiler Oct 11, 2023
72abc21
partial fix for differences in transportation_name layer
phanecak-maptiler Oct 12, 2023
6125d70
Merge branch 'omt_3_15_0' into omt3_15-long-ferries
phanecak-maptiler Oct 12, 2023
b7e7f4c
further adjustments to better match what is done with ferries in OMT
phanecak-maptiler Oct 17, 2023
00560b3
ferry minLength tweak + clean-up
phanecak-maptiler Oct 17, 2023
5d08720
mvn spotless:apply
phanecak-maptiler Oct 17, 2023
397efef
fixed minor typo
phanecak-maptiler Oct 17, 2023
dca9671
minor reformatting
phanecak-maptiler Oct 17, 2023
8654d86
ferry line length filter replaced with min. zoom calculation
phanecak-maptiler Oct 18, 2023
8e1703b
testFerry() adjusted to match previous commit
phanecak-maptiler Oct 18, 2023
6c05d7d
clea-up of unused stuff + mvn spotless:apply
phanecak-maptiler Oct 18, 2023
b6cda03
mvn spotless:apply
phanecak-maptiler Oct 18, 2023
338329a
Merge branch 'omt3_15-long-ferries' into omt3_15-frag-fix
phanecak-maptiler Oct 18, 2023
9b59981
added TODO node for follow-up pull-request/simplification
phanecak-maptiler Oct 18, 2023
a7bcfa9
clean-up: common getMinZoom() code moved to Utils
phanecak-maptiler Oct 18, 2023
30dab9f
minzoom clipping for brunnel was adjusted do Z9-Z12 -> test adjusted too
phanecak-maptiler Oct 18, 2023
f50e2b7
Merge pull request #11 from phanecak-maptiler/omt3_15-long-ferries
phanecak-maptiler Oct 23, 2023
1ddfb9a
clean-up
phanecak-maptiler Oct 23, 2023
0a2565d
use same tolerance for all transportation items, like OSM does
phanecak-maptiler Oct 23, 2023
59b3078
clean-up, since ferry and non-ferry procesing is now same
phanecak-maptiler Oct 23, 2023
d3434f9
Merge pull request #18 from phanecak-maptiler/omt3_15-frag-fix
phanecak-maptiler Oct 26, 2023
50273b0
Merge branch 'omt_3_15_0' into omt3_15-fix_for_diff_in_transportation…
phanecak-maptiler Oct 27, 2023
124b1dc
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Oct 30, 2023
93bdca5
Merge pull request #19 from phanecak-maptiler/omt3_15-transportation_…
phanecak-maptiler Nov 2, 2023
8c200bd
Merge branch 'omt_3_15_0' into omt3_15-fix_for_diff_in_transportation…
phanecak-maptiler Nov 2, 2023
c9c5f01
Merge pull request #20 from phanecak-maptiler/omt3_15-fix_for_diff_in…
phanecak-maptiler Nov 2, 2023
43d16a9
we need regenerate to work with master branch for now
phanecak-maptiler Nov 3, 2023
269575b
first sub-class search for agg_stop simplified a little
phanecak-maptiler Nov 3, 2023
e58b60e
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Nov 6, 2023
45abdbe
contains() used instead of indexOf() for better readability
phanecak-maptiler Nov 16, 2023
124d000
numbers as list, not array, so that getFirst() and getLast() can be used
phanecak-maptiler Nov 16, 2023
91d5e82
better trimming and filtring of housenumbers
phanecak-maptiler Nov 16, 2023
d93ca1f
adjusted handling of large house numbers
phanecak-maptiler Nov 16, 2023
8380e2f
several unit tests collapsed to one with @ParameterizedTest + @CsvSource
phanecak-maptiler Nov 16, 2023
1a9a333
AGG_STOP_SUBCLASS_ORDER simplified from Map to List
phanecak-maptiler Nov 16, 2023
9886cb1
fixed major omission from previous commit
phanecak-maptiler Nov 16, 2023
654e08a
clamp() used to replace min()&max() combo
phanecak-maptiler Nov 16, 2023
1f64f5f
agg_stop now implemented
phanecak-maptiler Nov 16, 2023
0f8487e
fixed typo in the error message
phanecak-maptiler Nov 16, 2023
35442fa
prepare IE and GB boundary geometry outside of synchronized{}
phanecak-maptiler Nov 16, 2023
99704bf
fixed typo in the error message
phanecak-maptiler Nov 16, 2023
eb46f86
mvn spotless:apply
phanecak-maptiler Nov 16, 2023
bfaa676
switch statements for IE and GB route networks simplified
phanecak-maptiler Nov 16, 2023
4374adf
avoid RouteNetwork->String mapping, not needed for anyMatch()
phanecak-maptiler Nov 16, 2023
371206c
fix: attr. brunnel optional based on size on Z4-Z11, attr. layer opti…
phanecak-maptiler Nov 16, 2023
e21c74a
tolerance change in transportation reverted, added note to README as …
phanecak-maptiler Nov 16, 2023
f499467
fix: monzoom for sea&co. is Z0-Z14 based on area, for the rest it is …
phanecak-maptiler Nov 16, 2023
caa41e1
clean-up: avoid doing area->side->area, do just area
phanecak-maptiler Nov 16, 2023
a20d488
Merge pull request #21 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Nov 16, 2023
b9db64a
regenerate-openmaptiles.sh 6c31841f4674f15e15afde346a060cf7c22e6cdd (…
phanecak-maptiler Nov 16, 2023
9ab8f47
relevant process() functions adjusted to match changes in transportat…
phanecak-maptiler Nov 16, 2023
32982da
regenerate-openmaptiles.sh master, instead of 6c31841f4674f15e15afde3…
phanecak-maptiler Nov 16, 2023
3cbe8c8
Merge pull request #22 from phanecak-maptiler/omt3_15-zlw-oneway-rail
phanecak-maptiler Nov 16, 2023
912538b
introduce duplicate housenumber filtering (matching OMT PR 1391)
phanecak-maptiler Nov 20, 2023
a0569fd
(less related) clean-up: use isEmpty() instead if size check
phanecak-maptiler Nov 20, 2023
5bab4cf
testContainsHousenumber UT adjusted, since duplicate housenumber filt…
phanecak-maptiler Nov 20, 2023
a5eabee
Merge pull request #23 from phanecak-maptiler/omt3_15-housenumber_fil…
phanecak-maptiler Nov 20, 2023
dc8a179
use combination of uic_ref, name, network and operator as key for agg…
phanecak-maptiler Nov 20, 2023
7a09981
Merge pull request #24 from phanecak-maptiler/omt3_15-agg_stop_fix-2
phanecak-maptiler Nov 20, 2023
60ee412
agg_stop comparison made more explicit, since we want to match same e…
phanecak-maptiler Nov 20, 2023
6863915
mvn spotless:apply
phanecak-maptiler Nov 20, 2023
23d9ba7
name now important for agg_stop processing, hence name:es (ab)used fo…
phanecak-maptiler Nov 20, 2023
602036c
Merge pull request #25 from phanecak-maptiler/omt3_15-agg_stop_fix-2
phanecak-maptiler Nov 20, 2023
e11f9c6
agg_stop: simplified processing of nearest station
phanecak-maptiler Nov 21, 2023
f5fe5fe
agg_stop: forther code simplification
phanecak-maptiler Nov 21, 2023
27f57a3
Merge pull request #26 from phanecak-maptiler/omt3_15-agg_stop_cleanup
phanecak-maptiler Nov 21, 2023
ac14a04
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Nov 21, 2023
f390550
fixed major typo introduced in previous merge
phanecak-maptiler Nov 21, 2023
3b363cb
setMinPixelSize() + setMinZoom() used instead of areaToMinZoom()
phanecak-maptiler Nov 21, 2023
360751e
clean-up: unused stuff removed
phanecak-maptiler Nov 21, 2023
503eee8
mvn spotless:apply
phanecak-maptiler Nov 21, 2023
212c80c
setAttrWithMinSize() used instead of getBrunnelMinzoom()
phanecak-maptiler Nov 21, 2023
28b75a7
getMinZoomForLength() no longer used, hence removed
phanecak-maptiler Nov 21, 2023
6dcd29d
Merge pull request #27 from phanecak-maptiler/omt3_15-area_to_minzoom…
phanecak-maptiler Nov 21, 2023
8fb6707
MIN_LENGTH value halved, to partially counter the effect of Planetile…
phanecak-maptiler Nov 28, 2023
612f700
clean-up: LOG2 not used, hence removed
phanecak-maptiler Nov 28, 2023
c3239ad
Revert "MIN_LENGTH value halved, to partially counter the effect of P…
phanecak-maptiler Dec 11, 2023
8d26841
use 256px as buffer pixel override instead of MIN_LENGTH
phanecak-maptiler Dec 11, 2023
d756038
added BY_TEMP_HAS_NAME comparator to avoid its repeated construction …
phanecak-maptiler Dec 12, 2023
08ee4da
duplicate houcenumber processing simplified further
phanecak-maptiler Dec 12, 2023
c8c4b24
clean-up: get(0) replaced with getFirst()
phanecak-maptiler Dec 12, 2023
57c2547
clean-up: CPU-intensive prepare() moved out of synchronized block
phanecak-maptiler Dec 12, 2023
82bb68a
regenerate-openmaptiles.sh 3cf77e2a542d8a369bb08bf2538cdde0b3effb2b (…
phanecak-maptiler Dec 15, 2023
7eed2ac
unit test adjusted for POI office class changes
phanecak-maptiler Dec 15, 2023
59fa9ac
Merge pull request #29 from phanecak-maptiler/omt3_15-more-office-values
phanecak-maptiler Dec 15, 2023
60be59b
regenerate-openmaptiles.sh master (to match content of OMT PR 1544)
phanecak-maptiler Dec 18, 2023
a0b7443
added charging_station implementation matching OMT PR 1544
phanecak-maptiler Dec 18, 2023
3b0959b
Merge pull request #30 from phanecak-maptiler/omt3_15-charging_station
phanecak-maptiler Dec 18, 2023
69393d0
use setMinPixelSizeBelowZoom() instead of uniAreaToMinZoom()
phanecak-maptiler Dec 19, 2023
bdea325
use setMinPixelSizeBelowZoom() instead of getFerryMinzoom()
phanecak-maptiler Dec 20, 2023
6aa4e88
fixed unit test, to match recent tweaks
phanecak-maptiler Dec 22, 2023
c992cfb
Merge pull request #28 from phanecak-maptiler/omt3_15-transportation_…
phanecak-maptiler Dec 22, 2023
3108e5b
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Jan 8, 2024
ae2c25e
regenerate-openmaptiles.sh master (to match content of OMT PR 1605)
phanecak-maptiler Jan 8, 2024
ad06ec4
Merge pull request #32 from phanecak-maptiler/omt3_15-zlw-document-de…
phanecak-maptiler Jan 8, 2024
802046f
Fix university office/amenity collision (to match OSM PR 1607)
phanecak-maptiler Jan 10, 2024
00e9732
Merge pull request #33 from phanecak-maptiler/omt3_15-zlw-university-…
phanecak-maptiler Jan 10, 2024
0e9f9f9
Remove expressway from ramps
phanecak-maptiler Jan 10, 2024
fd68c18
Merge pull request #34 from phanecak-maptiler/omt3_15-zlw-expressway-…
phanecak-maptiler Jan 10, 2024
0a635f7
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Jan 15, 2024
4f0cf07
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Jan 16, 2024
7d28732
OsmMarinePoint+ne_10m_geography_marine_polys join via name limited to…
phanecak-maptiler Jan 23, 2024
da1b7ba
regenerate-openmaptiles.sh master (to match content of OMT PR 1604)
phanecak-maptiler Jan 25, 2024
2299a69
Revert "Add aboriginal lands (as per OMT PR 1489)"
phanecak-maptiler Jan 25, 2024
ab5d1b5
added handling of aboriginal_lands/OsmBoundaryPolygon into Boundary a…
phanecak-maptiler Jan 26, 2024
2cf1f7f
big islands can now get rank lower than 3
phanecak-maptiler Jan 26, 2024
fff48f7
Add e-road and a-road for transportation z4
phanecak-maptiler Jan 27, 2024
3ad70b0
testPolishHighwayIssue165() adjusted: e-road now takes precendence
phanecak-maptiler Jan 27, 2024
0282d93
Merge pull request #35 from phanecak-maptiler/omt3_15-water_name-bay_…
phanecak-maptiler Jan 29, 2024
f4a55b3
Merge pull request #36 from phanecak-maptiler/omt3_15-zlw-indigenous-…
phanecak-maptiler Jan 29, 2024
206ca85
Merge pull request #37 from phanecak-maptiler/omt3_15-international_r…
phanecak-maptiler Jan 29, 2024
cc3db05
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Jan 29, 2024
c673532
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Feb 12, 2024
bc12b25
regenerate-openmaptiles.sh master (to match content of OMT PR 1627)
phanecak-maptiler Feb 12, 2024
e0ebeea
Merge pull request #38 from phanecak-maptiler/omt3_15-michalgwo-patch-1
phanecak-maptiler Feb 12, 2024
197e87b
regenerate-openmaptiles.sh fff7110aeb61882abfafe22d1618fbe6181d96cb (…
phanecak-maptiler Feb 20, 2024
9de78fc
Expanded road route attributes (to match OMT PR 1620)
phanecak-maptiler Feb 20, 2024
27f6706
unrelated clean-up: use getFirst()
phanecak-maptiler Feb 20, 2024
088eaa6
adjusted handling or null and empty ref
phanecak-maptiler Feb 20, 2024
9299238
regenerate-openmaptiles.sh master (to match content of OMT PR 1620)
phanecak-maptiler Feb 20, 2024
1d500c2
Merge pull request #39 from phanecak-maptiler/omt3_15-zlw-route-name-…
phanecak-maptiler Feb 20, 2024
6634955
pointOnSurface() used instead of centroid() to make sure the point is…
phanecak-maptiler Feb 28, 2024
b7e3fb4
adjusted deduplication of route_<n>_<something> attributes
phanecak-maptiler Feb 28, 2024
e36cb3c
clean-up of some previous adjustments of importantMarinePoints
phanecak-maptiler Feb 28, 2024
1d8dbab
clean-up: removed unused imports
phanecak-maptiler Feb 28, 2024
d6c9873
Merge pull request #40 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Feb 28, 2024
8a97fd6
mvn spotless:apply
phanecak-maptiler Feb 28, 2024
6913641
Merge branch 'upstream-main' into omt_3_15_0
phanecak-maptiler Mar 8, 2024
21032b8
OsmWaterPolygon minzoom calculation reverted to v3.14 and then adjust…
phanecak-maptiler Mar 11, 2024
7fa8f06
part of process(Tables.OsmWaterPolygon, ...) moved to setupOsmWaterPo…
phanecak-maptiler Mar 11, 2024
d9c8684
if feature with centerline has minzoom bellow Z9, use also a label po…
phanecak-maptiler Mar 11, 2024
1f6deaf
bay point vs. centerline difference mentioned in the README
phanecak-maptiler Mar 11, 2024
8f00f2a
Merge pull request #41 from phanecak-maptiler/missing_gulfs
phanecak-maptiler Mar 11, 2024
6f849a2
testWaterNameBay for small bay adjusted, testWaterNameBay for big bay…
phanecak-maptiler Mar 11, 2024
90659fd
testWaterNameLakeline and testWaterNameMultipleLakelines tweaked to u…
phanecak-maptiler Mar 11, 2024
fdcbbaf
mvn spotless:apply
phanecak-maptiler Mar 11, 2024
f9c441a
Merge pull request #42 from phanecak-maptiler/missing_gulfs
phanecak-maptiler Mar 11, 2024
16d079f
added unit test which checks minzoom for admin_level=2 disputed borde…
phanecak-maptiler Mar 11, 2024
2cc7a73
fixed missing admin_level=2 disputed borders at Z3
phanecak-maptiler Mar 11, 2024
56af884
Merge pull request #43 from phanecak-maptiler/missing_disputed_borders
phanecak-maptiler Mar 11, 2024
f7140dc
landuse fix for Z5: include all features from ne_50m_urban_areas
phanecak-maptiler Mar 11, 2024
8543c8e
minDist and buffer tweaked for residential areas for Z6-Z8 to better …
phanecak-maptiler Mar 11, 2024
51f1343
landuse fix for Z5: unit test updated
phanecak-maptiler Mar 11, 2024
728c840
Merge pull request #44 from phanecak-maptiler/landuse_residential_fix
phanecak-maptiler Mar 12, 2024
b653969
bumped copyright statements
phanecak-maptiler Mar 12, 2024
69750d5
added/adjusted acknowledgments
phanecak-maptiler Mar 12, 2024
e1de528
Merge pull request #45 from phanecak-maptiler/omt3_15-doc_cleanup
phanecak-maptiler Mar 12, 2024
bc756f4
fixed handling of Baikonur border in Kazachstan
phanecak-maptiler Mar 12, 2024
dcf66f3
fixed handling of Baikonur border in Kazachstan (2)
phanecak-maptiler Mar 12, 2024
f7642fd
Merge pull request #46 from phanecak-maptiler/baikonur_border
phanecak-maptiler Mar 12, 2024
ed01364
OSM boundaries only for Z5+, non-disputed for Z4+
phanecak-maptiler Mar 21, 2024
a05c723
OSM boundaries only for Z5+, non-disputed for Z4+ - unit test adjusted
phanecak-maptiler Mar 21, 2024
c553a94
OSM Lake IDs at low zooms
phanecak-maptiler Mar 23, 2024
57828cc
testLakeZoomLevels(): NE lakes removed, checked now in testLakeNatura…
phanecak-maptiler Mar 23, 2024
8911cb8
Merge pull request #47 from phanecak-maptiler/fix_maritime_low_zooms
phanecak-maptiler Mar 23, 2024
30c1640
Use ne_10m_admin_0_boundary_lines_land_disputed to fix missing South …
phanecak-maptiler Mar 27, 2024
567c6c5
testNaturalEarthCountryBoundaries() extended to cover adjusted handli…
phanecak-maptiler Mar 27, 2024
c04b0aa
Merge pull request #49 from phanecak-maptiler/fix_sudan_border
phanecak-maptiler Mar 27, 2024
300bb8f
Merge branch 'omt_3_15_0' into ne_lake_with_osm_id
phanecak-maptiler Mar 27, 2024
58c86c6
OSM lake area limit increased 2x to match smallest NE lake
phanecak-maptiler Mar 27, 2024
acbaa22
OSM lake area limit increased 2x even further to match smallest obser…
phanecak-maptiler Mar 27, 2024
af13750
clean-up: SMALLEST_OSM_LAKE_AREA renamed to OSM_ID_MATCH_AREA_LIMIT t…
phanecak-maptiler Mar 27, 2024
ea95a6c
Merge pull request #48 from phanecak-maptiler/ne_lake_with_osm_id
phanecak-maptiler Mar 28, 2024
baeb879
mvn spotless:apply
phanecak-maptiler Mar 28, 2024
943287c
properly handle center line vs. point also for lakes
phanecak-maptiler Apr 2, 2024
806ae5b
clean-up: min() dropped since nothing sets minzoomCL to value higher …
phanecak-maptiler Apr 2, 2024
93eb756
Merge pull request #50 from phanecak-maptiler/fix_labels_in_water_layer
phanecak-maptiler Apr 2, 2024
c56b98f
Revert e-road and a-road.
phanecak-maptiler Apr 2, 2024
4d3936a
Revert e-road and a-road. (follow-up)
phanecak-maptiler Apr 2, 2024
bef562b
added unit test to cover: More roads for z4.
phanecak-maptiler Apr 2, 2024
ebf965d
Merge pull request #51 from phanecak-maptiler/fix_roads
phanecak-maptiler Apr 3, 2024
a932793
improved handling of disputed KE:SS border: will work even if left/ri…
phanecak-maptiler Apr 17, 2024
cc797f9
new PolygonIndex.getIntersecting() used for OSM lake ID matching + in…
phanecak-maptiler Apr 17, 2024
9767512
neLakeIndexes simplified into neLakeIndex
phanecak-maptiler Apr 17, 2024
f31efa6
test several NE lakes also in testLakeNaturalEarthByName()
phanecak-maptiler Apr 17, 2024
cde5685
clean-up: synchronized NOT needed for PolygonIndex.put()
phanecak-maptiler Apr 17, 2024
6f4759c
neLakeNameMaps will stay as is, otherwise same names from several NE …
phanecak-maptiler Apr 17, 2024
7c0d4aa
neAllLakeInfos stays, since neLakeNameMaps contains only some and har…
phanecak-maptiler Apr 17, 2024
34b6f78
added test for NE lake ame collision: bigger one gets to be matched
phanecak-maptiler Apr 17, 2024
9756cd6
simplified NE->OSM lake matching: ignore small OSM lakes right away
phanecak-maptiler Apr 17, 2024
63ac191
minor speed-up: compare intersection area instead of intersction area…
phanecak-maptiler Apr 18, 2024
6b75450
fixed minor typo
phanecak-maptiler Apr 18, 2024
94e868b
minor clean-up
phanecak-maptiler Apr 18, 2024
17714ea
Merge pull request #52 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 18, 2024
87b2bdd
minor clean-up after previous changes
phanecak-maptiler Apr 19, 2024
80bd1ac
adjusted handling of TopologyException to match previous tweaks
phanecak-maptiler Apr 19, 2024
f644cc7
Merge pull request #53 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 19, 2024
fc62c13
mvn spotless:apply
phanecak-maptiler Apr 19, 2024
5ec171a
tweaked error message, to better mach cases when TopologyException oc…
phanecak-maptiler Apr 19, 2024
251bf40
Merge pull request #54 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 19, 2024
ec1dc8e
adjusted trunks: Z6+ by default, some from Z5, some even from Z4
phanecak-maptiler Apr 24, 2024
ec0cdc1
adjusted motorways: only some at Z4
phanecak-maptiler Apr 24, 2024
bdab24e
adjusted transportation: clip also construction links to Z9+
phanecak-maptiler Apr 24, 2024
29deac3
unit tests adjusted to the recent changes
phanecak-maptiler Apr 24, 2024
1a71c15
Merge pull request #55 from phanecak-maptiler/omt3_15-fix_z7-z4_roads
phanecak-maptiler Apr 25, 2024
e23c085
use merge() to avoid problems with concurrent updates
phanecak-maptiler Apr 26, 2024
d58cbdb
synchronized mergeId() added to avoid problems with concurrent updates
phanecak-maptiler Apr 26, 2024
dd1c58f
clean-up after cc797f9a
phanecak-maptiler Apr 26, 2024
c39e862
mvn spotless:apply
phanecak-maptiler Apr 26, 2024
5893ac3
label point in water_name refactored using setMinPixelSizeBelowZoom()
phanecak-maptiler Apr 26, 2024
f55ddfc
Merge pull request #56 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 29, 2024
40217b3
clean-up: LOG2 removed since no longer used
phanecak-maptiler Apr 29, 2024
4f1fa23
refactored handling of TopologyException for easier troubleshooting o…
phanecak-maptiler Apr 29, 2024
0b5cda0
fix invalid NE lake geometries + further TopologyException handling t…
phanecak-maptiler Apr 29, 2024
d4fe59c
TopologyException handling removed, since no longer needed after addi…
phanecak-maptiler Apr 29, 2024
ee70382
clean-up after previous changes
phanecak-maptiler Apr 29, 2024
15ebc6b
Merge pull request #57 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 29, 2024
1a62218
OpenMapTiles 3.15 was released so we can use proper tag now
phanecak-maptiler Apr 29, 2024
9c79249
regenerate-openmaptiles.sh v3.15 to match official OpenMapTiles release
phanecak-maptiler Apr 29, 2024
2b19f47
Merge pull request #58 from phanecak-maptiler/omt_3_15_0-release
phanecak-maptiler Apr 29, 2024
c6594d1
Revert "clean-up after previous changes"
phanecak-maptiler Apr 29, 2024
989475c
Revert "TopologyException handling removed, since no longer needed af…
phanecak-maptiler Apr 29, 2024
619ce2f
minor clean-up
phanecak-maptiler Apr 29, 2024
b11846d
Merge pull request #59 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 29, 2024
d0e3dd8
handle TopologyException also from intersects()
phanecak-maptiler Apr 29, 2024
01b54a4
further tweaks for TopologyException handling
phanecak-maptiler Apr 30, 2024
0cb9350
warnings demoted to debugs since we're going to re-try
phanecak-maptiler Apr 30, 2024
7bdbd20
bumped copyright statements
phanecak-maptiler Apr 30, 2024
dece99f
bumped copyright statements
phanecak-maptiler Apr 30, 2024
7db0912
Merge pull request #60 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler Apr 30, 2024
7440973
print errors+stack-traces only after retries with fixed polygons
phanecak-maptiler May 2, 2024
4ed3d9d
message about fixing NE lake geometry demoted: warn -> debug
phanecak-maptiler May 2, 2024
aebb96b
omt_water message adjusted to make it more clear what it relates to
phanecak-maptiler May 2, 2024
d47a4f5
do NOT store fixed geom in separate variable to avoid 2nd fixing in f…
phanecak-maptiler May 2, 2024
b1ebf60
one more error message rephrased for clearer context
phanecak-maptiler May 2, 2024
22551cf
Revert "print errors+stack-traces only after retries with fixed polyg…
phanecak-maptiler May 2, 2024
eb56ed4
strip stack-trace from TopologyException debug messages
phanecak-maptiler May 2, 2024
cbbcfbf
fix OSM element geometry if not valid before trying to match NE lake
phanecak-maptiler May 2, 2024
7928731
clean-up
phanecak-maptiler May 2, 2024
fef4073
Merge pull request #61 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler May 2, 2024
98d3054
clean-up: mvn spotless:apply
phanecak-maptiler May 3, 2024
312e8a7
Merge branch 'upstream-main' into omt_3_15_0-updates_based_on_review-6
phanecak-maptiler May 3, 2024
dd99b2c
Merge pull request #62 from phanecak-maptiler/omt_3_15_0-updates_base…
phanecak-maptiler May 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ script with the
OpenMapTiles release tag:

```bash
./scripts/regenerate-openmaptiles.sh v3.14
./scripts/regenerate-openmaptiles.sh v3.15
```

Then follow the instructions it prints for reformatting generated code.

If you want to regenerate from a different repository than the default openmaptiles, you can specify the url like this:

```bash
./scripts/regenerate-openmaptiles.sh v3.14 https://raw.githubusercontent.com/openmaptiles/openmaptiles/
./scripts/regenerate-openmaptiles.sh v3.15 https://raw.githubusercontent.com/openmaptiles/openmaptiles/
```

## License
Expand Down
3 changes: 1 addition & 2 deletions scripts/regenerate-openmaptiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ set -o errexit
set -o pipefail
set -o nounset

# TODO: change to "v3.15" once that is released
TAG="${1:-"master"}"
TAG="${1:-"v3.15"}"
echo "tag=${TAG}"

BASE_URL="${2:-"https://raw.githubusercontent.com/openmaptiles/openmaptiles/"}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openmaptiles/Generate.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static JsonNode parseYaml(String string) {
public static void main(String[] args) throws IOException {
Arguments arguments = Arguments.fromArgsOrConfigFile(args);
PlanetilerConfig planetilerConfig = PlanetilerConfig.from(arguments);
String tag = arguments.getString("tag", "openmaptiles tag to use", "v3.14.0");
String tag = arguments.getString("tag", "openmaptiles tag to use", "v3.15.0");
String baseUrl = arguments.getString("base-url", "the url used to download the openmaptiles.yml",
"https://raw.githubusercontent.com/openmaptiles/openmaptiles/");
String base = baseUrl + tag + "/";
Expand Down
47 changes: 25 additions & 22 deletions src/main/java/org/openmaptiles/generated/OpenMapTilesSchema.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2021, MapTiler.com & OpenMapTiles contributors.
Copyright (c) 2024, MapTiler.com & OpenMapTiles contributors.
All rights reserved.

Code license: BSD 3-Clause License
Expand Down Expand Up @@ -49,14 +49,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

/**
* All vector tile layer definitions, attributes, and allowed values generated from the
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/openmaptiles.yaml">OpenMapTiles vector tile schema
* master</a>.
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/openmaptiles.yaml">OpenMapTiles vector tile schema
* v3.15</a>.
*/
@SuppressWarnings("unused")
public class OpenMapTilesSchema {
public static final String NAME = "OpenMapTiles";
public static final String DESCRIPTION = "A tileset showcasing all layers in OpenMapTiles. https://openmaptiles.org";
public static final String VERSION = "3.14.0";
public static final String VERSION = "3.15.0";
public static final String ATTRIBUTION =
"<a href=\"https://www.openmaptiles.org/\" target=\"_blank\">&copy; OpenMapTiles</a> <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">&copy; OpenStreetMap contributors</a>";
public static final List<String> LANGUAGES = List.of("am", "ar", "az", "be", "bg", "bn", "br", "bs", "ca", "co", "cs",
Expand Down Expand Up @@ -96,7 +96,7 @@ public static List<Layer> createInstances(Translations translations, PlanetilerC
* boundaries show up. So you might not be able to use border styling for ocean water features.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/water/water.yaml">water.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/water/water.yaml">water.yaml</a>
*/
public interface Water extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -182,7 +182,7 @@ final class FieldMappings {
public static final MultiExpression<String> Class =
MultiExpression.of(List.of(MultiExpression.entry("dock", matchAny("waterway", "dock")),
MultiExpression.entry("river", matchAny("water", "river", "stream", "canal", "ditch", "drain")),
MultiExpression.entry("pond", matchAny("water", "pond", "basin", "wastewater")),
MultiExpression.entry("pond", matchAny("water", "pond", "basin", "wastewater", "salt_pond")),
MultiExpression.entry("lake", FALSE), MultiExpression.entry("ocean", FALSE),
MultiExpression.entry("swimming_pool", matchAny("leisure", "swimming_pool"))));
}
Expand All @@ -195,7 +195,7 @@ final class FieldMappings {
* field applied. Waterways do not have a <code>subclass</code> field.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/waterway/waterway.yaml">waterway.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/waterway/waterway.yaml">waterway.yaml</a>
*/
public interface Waterway extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -287,7 +287,7 @@ final class FieldMappings {
* layer is to style wood (<code>class=wood</code>) and grass (<code>class=grass</code>) areas.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/landcover/landcover.yaml">landcover.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/landcover/landcover.yaml">landcover.yaml</a>
*/
public interface Landcover extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -444,7 +444,7 @@ final class FieldMappings {
* residential (urban) areas and at higher zoom levels mostly OSM <code>landuse</code> tags.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/landuse/landuse.yaml">landuse.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/landuse/landuse.yaml">landuse.yaml</a>
*/
public interface Landuse extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -540,7 +540,7 @@ final class FieldMappings {
* <a href="http://wiki.openstreetmap.org/wiki/Tag:natural%3Dpeak">Natural peaks</a>
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/mountain_peak/mountain_peak.yaml">mountain_peak.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/mountain_peak/mountain_peak.yaml">mountain_peak.yaml</a>
*/
public interface MountainPeak extends Layer {
double BUFFER_SIZE = 64.0;
Expand All @@ -563,7 +563,10 @@ final class Fields {
* removed in a future release in favor of <code>name:en</code>.
*/
public static final String NAME_EN = "name_en";
/** German name <code>name:de</code> if available, otherwise <code>name</code> or <code>name:en</code>. */
/**
* German name <code>name:de</code> if available, otherwise <code>name</code> or <code>name:en</code>. This is
* deprecated and will be removed in a future release in favor of <code>name:de</code>.
*/
public static final String NAME_DE = "name_de";

/**
Expand Down Expand Up @@ -621,7 +624,7 @@ final class FieldMappings {
* <a href="https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve"><code>leisure=nature_reserve</code></a>.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/park/park.yaml">park.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/park/park.yaml">park.yaml</a>
*/
public interface Park extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -684,7 +687,7 @@ final class FieldMappings {
* but for most styles it makes sense to just style <code>admin_level=2</code> and <code>admin_level=4</code>.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/boundary/boundary.yaml">boundary.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/boundary/boundary.yaml">boundary.yaml</a>
*/
public interface Boundary extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -794,7 +797,7 @@ final class FieldMappings {
* in the <strong>aeroway</strong> layer.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/aeroway/aeroway.yaml">aeroway.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/aeroway/aeroway.yaml">aeroway.yaml</a>
*/
public interface Aeroway extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -854,7 +857,7 @@ final class FieldMappings {
* features like plazas.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/transportation/transportation.yaml">transportation.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/transportation/transportation.yaml">transportation.yaml</a>
*/
public interface Transportation extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -1199,7 +1202,7 @@ final class FieldMappings {
* location:underground are excluded.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/building/building.yaml">building.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/building/building.yaml">building.yaml</a>
*/
public interface Building extends Layer {
double BUFFER_SIZE = 4.0;
Expand Down Expand Up @@ -1241,7 +1244,7 @@ final class FieldMappings {
* from OSM water bodies. Only the most important lakes contain labels.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/water_name/water_name.yaml">water_name.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/water_name/water_name.yaml">water_name.yaml</a>
*/
public interface WaterName extends Layer {
double BUFFER_SIZE = 256.0;
Expand Down Expand Up @@ -1318,7 +1321,7 @@ final class FieldMappings {
* while for other roads you should use <code>name</code>.
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/transportation_name/transportation_name.yaml">transportation_name.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/transportation_name/transportation_name.yaml">transportation_name.yaml</a>
*/
public interface TransportationName extends Layer {
double BUFFER_SIZE = 8.0;
Expand Down Expand Up @@ -1590,7 +1593,7 @@ final class FieldMappings {
* create a text hierarchy.
*
* Generated from
* <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/place/place.yaml">place.yaml</a>
* <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/place/place.yaml">place.yaml</a>
*/
public interface Place extends Layer {
double BUFFER_SIZE = 256.0;
Expand Down Expand Up @@ -1714,7 +1717,7 @@ final class FieldMappings {
* tag are prioritized for preservation).
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/housenumber/housenumber.yaml">housenumber.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/housenumber/housenumber.yaml">housenumber.yaml</a>
*/
public interface Housenumber extends Layer {
double BUFFER_SIZE = 8.0;
Expand Down Expand Up @@ -1746,7 +1749,7 @@ final class FieldMappings {
* <a href="http://wiki.openstreetmap.org/wiki/Points_of_interest">Points of interests</a> containing a of a variety
* of OpenStreetMap tags. Mostly contains amenities, sport, shop and tourist POIs.
*
* Generated from <a href="https://github.com/openmaptiles/openmaptiles/blob/master/layers/poi/poi.yaml">poi.yaml</a>
* Generated from <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/poi/poi.yaml">poi.yaml</a>
*/
public interface Poi extends Layer {
double BUFFER_SIZE = 64.0;
Expand Down Expand Up @@ -1990,7 +1993,7 @@ final class FieldMappings {
* <a href="http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome">Aerodrome labels</a>
*
* Generated from <a href=
* "https://github.com/openmaptiles/openmaptiles/blob/master/layers/aerodrome_label/aerodrome_label.yaml">aerodrome_label.yaml</a>
* "https://github.com/openmaptiles/openmaptiles/blob/v3.15/layers/aerodrome_label/aerodrome_label.yaml">aerodrome_label.yaml</a>
*/
public interface AerodromeLabel extends Layer {
double BUFFER_SIZE = 64.0;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/openmaptiles/generated/Tables.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2021, MapTiler.com & OpenMapTiles contributors.
Copyright (c) 2024, MapTiler.com & OpenMapTiles contributors.
All rights reserved.

Code license: BSD 3-Clause License
Expand Down Expand Up @@ -50,7 +50,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

/**
* OSM element parsers generated from the <a href="https://github.com/omniscale/imposm3">imposm3</a> table definitions
* in the <a href="https://github.com/openmaptiles/openmaptiles/blob/master/openmaptiles.yaml">OpenMapTiles vector tile
* in the <a href="https://github.com/openmaptiles/openmaptiles/blob/v3.15/openmaptiles.yaml">OpenMapTiles vector tile
* schema</a>.
*
* These filter and parse the raw OSM key/value attribute pairs on tags into records with fields that match the columns
Expand Down
Loading
Loading