Migrate POI kind and kindDetail assigment from plain Java to MultiExpression rules #537
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -119,7 +119,7 @@ public String description() { | |
|
|
||
| @Override | ||
| public String version() { | ||
| return "4.13.5"; | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,18 @@ | ||
| package com.protomaps.basemap.layers; | ||
|
|
||
| import static com.onthegomap.planetiler.util.Parse.parseDoubleOrNull; | ||
| import static com.protomaps.basemap.feature.Matcher.fromTag; | ||
| import static com.protomaps.basemap.feature.Matcher.getString; | ||
| import static com.protomaps.basemap.feature.Matcher.rule; | ||
| import static com.protomaps.basemap.feature.Matcher.use; | ||
| import static com.protomaps.basemap.feature.Matcher.with; | ||
| import static com.protomaps.basemap.feature.Matcher.without; | ||
|
|
||
| import com.onthegomap.planetiler.FeatureCollector; | ||
| import com.onthegomap.planetiler.ForwardingProfile; | ||
| import com.onthegomap.planetiler.VectorTile; | ||
| import com.onthegomap.planetiler.expression.Expression; | ||
| import com.onthegomap.planetiler.expression.MultiExpression; | ||
| import com.onthegomap.planetiler.geo.GeoUtils; | ||
| import com.onthegomap.planetiler.geo.GeometryException; | ||
| import com.onthegomap.planetiler.reader.SourceFeature; | ||
|
|
@@ -35,15 +43,125 @@ public Pois(QrankDb qrankDb) { | |
|
|
||
| public static final String LAYER_NAME = "pois"; | ||
|
|
||
| private static final Expression with_operator_usfs = with("operator", "United States Forest Service", | ||
migurski marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| "US Forest Service", "U.S. Forest Service", "USDA Forest Service", "United States Department of Agriculture", | ||
| "US National Forest Service", "United State Forest Service", "U.S. National Forest Service"); | ||
|
|
||
| private static final MultiExpression.Index<Map<String, Object>> index = MultiExpression.of(List.of( | ||
|
|
||
| // Everything is "other"/"" at first | ||
| rule(use("kind", "other"), use("kindDetail", "")), | ||
|
|
||
| // Boundary is most generic, so place early else we lose out | ||
| // on nature_reserve detail versus all the protected_area | ||
| rule(with("boundary"), use("kind", fromTag("boundary"))), | ||
|
|
||
| // More specific kinds | ||
|
|
||
| rule(with("historic"), without("historic", "yes"), use("kind", fromTag("historic"))), | ||
| rule(with("tourism"), use("kind", fromTag("tourism"))), | ||
| rule(with("shop"), use("kind", fromTag("shop"))), | ||
| rule(with("highway"), use("kind", fromTag("highway"))), | ||
| rule(with("railway"), use("kind", fromTag("railway"))), | ||
| rule(with("natural"), use("kind", fromTag("natural"))), | ||
| rule(with("leisure"), use("kind", fromTag("leisure"))), | ||
| rule(with("landuse"), use("kind", fromTag("landuse"))), | ||
| rule(with("aeroway"), use("kind", fromTag("aeroway"))), | ||
| rule(with("craft"), use("kind", fromTag("craft"))), | ||
| rule(with("attraction"), use("kind", fromTag("attraction"))), | ||
| rule(with("amenity"), use("kind", fromTag("amenity"))), | ||
|
|
||
| // National forests | ||
|
|
||
| rule( | ||
| Expression.or( | ||
| with("landuse", "forest"), | ||
| Expression.and(with("boundary", "national_park"), with_operator_usfs), | ||
| Expression.and( | ||
| with("boundary", "national_park"), | ||
| with("protect_class", "6"), | ||
| with("protection_title", "National Forest") | ||
| ), | ||
| Expression.and( | ||
| with("boundary", "protected_area"), | ||
| with("protect_class", "6"), | ||
| with_operator_usfs | ||
| ) | ||
| ), | ||
|
Comment on lines
77
to
90
Collaborator
There was a problem hiding this comment. I have not though about this use case for the |
||
| use("kind", "forest") | ||
| ), | ||
|
|
||
| // National parks | ||
|
|
||
| rule(with("boundary", "national_park"), use("kind", "park")), | ||
| rule( | ||
| with("boundary", "national_park"), | ||
| Expression.not(with_operator_usfs), | ||
| without("protection_title", "Conservation Area", "Conservation Park", "Environmental use", "Forest Reserve", | ||
| "National Forest", "National Wildlife Refuge", "Nature Refuge", "Nature Reserve", "Protected Site", | ||
| "Provincial Park", "Public Access Land", "Regional Reserve", "Resources Reserve", "State Forest", | ||
| "State Game Land", "State Park", "Watershed Recreation Unit", "Wild Forest", "Wilderness Area", | ||
| "Wilderness Study Area", "Wildlife Management", "Wildlife Management Area", "Wildlife Sanctuary"), | ||
| Expression.or( | ||
| with("protect_class", "2", "3"), | ||
| with("operator", "United States National Park Service", "National Park Service", "US National Park Service", | ||
| "U.S. National Park Service", "US National Park service"), | ||
| with("operator:en", "Parks Canada"), | ||
| with("designation", "national_park"), | ||
| with("protection_title", "National Park") | ||
| ), | ||
| use("kind", "national_park") | ||
| ), | ||
|
|
||
| // Remaining things | ||
|
|
||
| rule(with("natural", "peak"), use("kind", fromTag("natural"))), | ||
| rule(with("highway", "bus_stop"), use("kind", fromTag("highway"))), | ||
| rule(with("tourism", "attraction", "camp_site", "hotel"), use("kind", fromTag("tourism"))), | ||
| rule(with("shop", "grocery", "supermarket"), use("kind", fromTag("shop"))), | ||
| rule(with("leisure", "golf_course", "marina", "stadium", "park"), use("kind", fromTag("leisure"))), | ||
|
|
||
| rule(with("landuse", "military"), use("kind", "military")), | ||
| rule( | ||
| with("landuse", "military"), | ||
| with("military", "naval_base", "airfield"), | ||
| use("kind", fromTag("military")) | ||
| ), | ||
|
|
||
| rule(with("landuse", "cemetery"), use("kind", fromTag("landuse"))), | ||
|
|
||
| rule( | ||
| with("aeroway", "aerodrome"), | ||
| use("kind", "aerodrome"), | ||
| use("kindDetail", fromTag("aerodrome")) | ||
| ), | ||
|
|
||
| // Additional details for certain classes of POI | ||
|
|
||
| rule(with("sport"), use("kindDetail", fromTag("sport"))), | ||
| rule(with("religion"), use("kindDetail", fromTag("religion"))), | ||
| rule(with("cuisine"), use("kindDetail", fromTag("cuisine"))) | ||
|
|
||
| )).index(); | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return LAYER_NAME; | ||
| } | ||
|
|
||
| // ~= pow((sqrt(70k) / (40m / 256)) / 256, 2) ~= 4.4e-11 | ||
| private static final double WORLD_AREA_FOR_70K_SQUARE_METERS = | ||
| Math.pow(GeoUtils.metersToPixelAtEquator(0, Math.sqrt(70_000)) / 256d, 2); | ||
|
|
||
| public void processOsm(SourceFeature sf, FeatureCollector features) { | ||
| var matches = index.getMatches(sf); | ||
| if (matches.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| String kind = getString(sf, matches, "kind", "undefined"); | ||
| String kindDetail = getString(sf, matches, "kindDetail", "undefined"); | ||
|
|
||
| if ((sf.isPoint() || sf.canBePolygon()) && (sf.hasTag("aeroway", "aerodrome") || | ||
| sf.hasTag("amenity") || | ||
| sf.hasTag("attraction") || | ||
|
|
@@ -59,8 +177,6 @@ public void processOsm(SourceFeature sf, FeatureCollector features) { | |
| sf.hasTag("shop") || | ||
| sf.hasTag("tourism") && | ||
| (!sf.hasTag("historic", "district")))) { | ||
| Integer minZoom = 15; | ||
| long qrank = 0; | ||
|
|
||
|
|
@@ -70,123 +186,39 @@ public void processOsm(SourceFeature sf, FeatureCollector features) { | |
| } | ||
|
|
||
| if (sf.hasTag("aeroway", "aerodrome")) { | ||
| minZoom = 13; | ||
|
|
||
| // Emphasize large international airports earlier | ||
| if (kind.equals("aerodrome") && sf.hasTag("iata")) { | ||
| minZoom -= 2; | ||
| } | ||
| } else if (sf.hasTag("amenity", "university", "college")) { | ||
| // One would think University should be earlier, but there are lots of dinky node only places | ||
| // So if the university has a large area, it'll naturally improve it's zoom in the next section... | ||
| minZoom = 14; | ||
| } else if (sf.hasTag("amenity", "hospital")) { | ||
| minZoom = 12; | ||
| } else if (sf.hasTag("amenity", "library", "post_office", "townhall")) { | ||
| minZoom = 13; | ||
| } else if (sf.hasTag("amenity", "school")) { | ||
| minZoom = 15; | ||
| } else if (sf.hasTag("amenity", "cafe")) { | ||
| minZoom = 15; | ||
| } else if (sf.hasTag("landuse", "cemetery")) { | ||
| minZoom = 14; | ||
| } else if (sf.hasTag("leisure", "park")) { | ||
| // Lots of pocket parks and NODE parks, show those later than rest of leisure | ||
| minZoom = 14; | ||
| } else if (sf.hasTag("leisure", "golf_course", "marina", "stadium")) { | ||
| minZoom = 13; | ||
| } else if (sf.hasTag("shop", "grocery", "supermarket")) { | ||
| minZoom = 14; | ||
| } else if (sf.hasTag("tourism", "attraction", "camp_site", "hotel")) { | ||
| minZoom = 15; | ||
| } else if (sf.hasTag("highway", "bus_stop")) { | ||
| minZoom = 17; | ||
| } else if (sf.hasTag("natural", "peak")) { | ||
| minZoom = 13; | ||
| } | ||
|
|
||
| // National parks | ||
|
|
@@ -205,21 +237,10 @@ public void processOsm(SourceFeature sf, FeatureCollector features) { | |
| sf.hasTag("operator:en", "Parks Canada") || | ||
| sf.hasTag("designation", "national_park") || | ||
| sf.hasTag("protection_title", "National Park"))) { | ||
| minZoom = 11; | ||
| } | ||
| } | ||
|
|
||
| // try first for polygon -> point representations | ||
| if (sf.canBePolygon() && sf.hasTag("name") && sf.getString("name") != null) { | ||
| Double wayArea = 0.0; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.