OpenMapTiles 3.15.0 SNAPSHOT (2)

src/main/java/org/openmaptiles/generated/Tables.java

@@ -248,8 +248,9 @@ public OsmParkPolygon(SourceFeature source, String mappingKey) {
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
-    public static final Expression MAPPING = and(or(matchAny("leisure", "nature_reserve"),
-      matchAny("boundary", "national_park", "protected_area", "aboriginal_lands")), matchType("polygon"));
+    public static final Expression MAPPING =
+      and(or(matchAny("leisure", "nature_reserve"), matchAny("boundary", "national_park", "protected_area")),
+        matchType("polygon"));
 
     /**
      * Interface for layer implementations to extend to subscribe to OSM elements filtered and parsed as
@@ -259,6 +260,25 @@ public interface Handler {
       void process(OsmParkPolygon element, FeatureCollector features);
     }
   }
+  /** An OSM element that would appear in the {@code osm_boundary_polygon} table generated by imposm3. */
+  public record OsmBoundaryPolygon(@Override String name, @Override String boundary, @Override SourceFeature source)
+    implements Row, WithName, WithBoundary, WithSource {
+    public OsmBoundaryPolygon(SourceFeature source, String mappingKey) {
+      this(source.getString("name"), source.getString("boundary"), source);
+    }
+
+    /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
+    public static final Expression MAPPING =
+      and(matchAny("boundary", "aboriginal_lands"), matchAny("type", "boundary"), matchType("polygon"));
+
+    /**
+     * Interface for layer implementations to extend to subscribe to OSM elements filtered and parsed as
+     * {@link OsmBoundaryPolygon}.
+     */
+    public interface Handler {
+      void process(OsmBoundaryPolygon element, FeatureCollector features);
+    }
+  }
   /** An OSM element that would appear in the {@code osm_aeroway_polygon} table generated by imposm3. */
   public record OsmAerowayPolygon(@Override String ref, @Override String aeroway, @Override SourceFeature source)
     implements Row, WithRef, WithAeroway, WithSource {
@@ -320,24 +340,23 @@ public interface Handler {
   public record OsmHighwayLinestring(@Override String highway, @Override String construction,
     @Override String tracktype, @Override String ref, @Override String network, @Override int zOrder,
     @Override long layer, @Override long level, @Override boolean indoor, @Override String name,
-    @Override String nameEn, @Override String nameDe, @Override String shortName, @Override boolean isTunnel,
-    @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord, @Override int isOneway,
-    @Override boolean isArea, @Override String service, @Override String access, @Override boolean toll,
-    @Override String usage, @Override String publicTransport, @Override String manMade, @Override String bicycle,
-    @Override String foot, @Override String horse, @Override String mtbScale, @Override String sacScale,
-    @Override String surface, @Override boolean expressway, @Override SourceFeature source)
+    @Override String nameEn, @Override String nameDe, @Override boolean isTunnel, @Override boolean isBridge,
+    @Override boolean isRamp, @Override boolean isFord, @Override int isOneway, @Override boolean isArea,
+    @Override String service, @Override String access, @Override boolean toll, @Override String usage,
+    @Override String publicTransport, @Override String manMade, @Override String bicycle, @Override String foot,
+    @Override String horse, @Override String mtbScale, @Override String sacScale, @Override String surface,
+    @Override boolean expressway, @Override SourceFeature source)
     implements Row, WithHighway, WithConstruction, WithTracktype, WithRef, WithNetwork, WithZOrder, WithLayer,
-    WithLevel, WithIndoor, WithName, WithNameEn, WithNameDe, WithShortName, WithIsTunnel, WithIsBridge, WithIsRamp,
-    WithIsFord, WithIsOneway, WithIsArea, WithService, WithAccess, WithToll, WithUsage, WithPublicTransport,
-    WithManMade, WithBicycle, WithFoot, WithHorse, WithMtbScale, WithSacScale, WithSurface, WithExpressway, WithSource {
+    WithLevel, WithIndoor, WithName, WithNameEn, WithNameDe, WithIsTunnel, WithIsBridge, WithIsRamp, WithIsFord,
+    WithIsOneway, WithIsArea, WithService, WithAccess, WithToll, WithUsage, WithPublicTransport, WithManMade,
+    WithBicycle, WithFoot, WithHorse, WithMtbScale, WithSacScale, WithSurface, WithExpressway, WithSource {
     public OsmHighwayLinestring(SourceFeature source, String mappingKey) {
       this(source.getString("highway"), source.getString("construction"), source.getString("tracktype"),
         source.getString("ref"), source.getString("network"), source.getWayZorder(), source.getLong("layer"),
         source.getLong("level"), source.getBoolean("indoor"), source.getString("name"), source.getString("name:en"),
-        source.getString("name:de"), source.getString("short_name"), source.getBoolean("tunnel"),
-        source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"),
-        source.getDirection("oneway"), source.getBoolean("area"), source.getString("service"),
-        source.getString("access"), source.getBoolean("toll"), source.getString("usage"),
+        source.getString("name:de"), source.getBoolean("tunnel"), source.getBoolean("bridge"),
+        source.getBoolean("ramp"), source.getBoolean("ford"), source.getDirection("oneway"), source.getBoolean("area"),
+        source.getString("service"), source.getString("access"), source.getBoolean("toll"), source.getString("usage"),
         source.getString("public_transport"), source.getString("man_made"), source.getString("bicycle"),
         source.getString("foot"), source.getString("horse"), source.getString("mtb:scale"),
         source.getString("sac_scale"), source.getString("surface"), source.getBoolean("expressway"), source);
@@ -363,17 +382,17 @@ public interface Handler {
   /** An OSM element that would appear in the {@code osm_railway_linestring} table generated by imposm3. */
   public record OsmRailwayLinestring(@Override String railway, @Override String ref, @Override String network,
     @Override int zOrder, @Override long layer, @Override long level, @Override boolean indoor, @Override String name,
-    @Override String nameEn, @Override String nameDe, @Override String shortName, @Override boolean isTunnel,
-    @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord, @Override boolean isArea,
-    @Override String service, @Override String usage, @Override SourceFeature source) implements Row, WithRailway,
-    WithRef, WithNetwork, WithZOrder, WithLayer, WithLevel, WithIndoor, WithName, WithNameEn, WithNameDe, WithShortName,
-    WithIsTunnel, WithIsBridge, WithIsRamp, WithIsFord, WithIsArea, WithService, WithUsage, WithSource {
+    @Override String nameEn, @Override String nameDe, @Override boolean isTunnel, @Override boolean isBridge,
+    @Override boolean isRamp, @Override boolean isFord, @Override boolean isArea, @Override String service,
+    @Override String usage, @Override SourceFeature source) implements Row, WithRailway, WithRef, WithNetwork,
+    WithZOrder, WithLayer, WithLevel, WithIndoor, WithName, WithNameEn, WithNameDe, WithIsTunnel, WithIsBridge,
+    WithIsRamp, WithIsFord, WithIsArea, WithService, WithUsage, WithSource {
     public OsmRailwayLinestring(SourceFeature source, String mappingKey) {
       this(source.getString("railway"), source.getString("ref"), source.getString("network"), source.getWayZorder(),
         source.getLong("layer"), source.getLong("level"), source.getBoolean("indoor"), source.getString("name"),
-        source.getString("name:en"), source.getString("name:de"), source.getString("short_name"),
-        source.getBoolean("tunnel"), source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"),
-        source.getBoolean("area"), source.getString("service"), source.getString("usage"), source);
+        source.getString("name:en"), source.getString("name:de"), source.getBoolean("tunnel"),
+        source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"), source.getBoolean("area"),
+        source.getString("service"), source.getString("usage"), source);
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
@@ -391,16 +410,15 @@ public interface Handler {
   }
   /** An OSM element that would appear in the {@code osm_aerialway_linestring} table generated by imposm3. */
   public record OsmAerialwayLinestring(@Override String aerialway, @Override int zOrder, @Override long layer,
-    @Override String name, @Override String nameEn, @Override String nameDe, @Override String shortName,
-    @Override boolean isTunnel, @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord,
-    @Override int isOneway, @Override boolean isArea, @Override String service, @Override String usage,
-    @Override SourceFeature source)
-    implements Row, WithAerialway, WithZOrder, WithLayer, WithName, WithNameEn, WithNameDe, WithShortName, WithIsTunnel,
-    WithIsBridge, WithIsRamp, WithIsFord, WithIsOneway, WithIsArea, WithService, WithUsage, WithSource {
+    @Override String name, @Override String nameEn, @Override String nameDe, @Override boolean isTunnel,
+    @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord, @Override int isOneway,
+    @Override boolean isArea, @Override String service, @Override String usage, @Override SourceFeature source)
+    implements Row, WithAerialway, WithZOrder, WithLayer, WithName, WithNameEn, WithNameDe, WithIsTunnel, WithIsBridge,
+    WithIsRamp, WithIsFord, WithIsOneway, WithIsArea, WithService, WithUsage, WithSource {
     public OsmAerialwayLinestring(SourceFeature source, String mappingKey) {
       this(source.getString("aerialway"), source.getWayZorder(), source.getLong("layer"), source.getString("name"),
-        source.getString("name:en"), source.getString("name:de"), source.getString("short_name"),
-        source.getBoolean("tunnel"), source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"),
+        source.getString("name:en"), source.getString("name:de"), source.getBoolean("tunnel"),
+        source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"),
         source.getDirection("oneway"), source.getBoolean("area"), source.getString("service"),
         source.getString("usage"), source);
     }
@@ -419,16 +437,16 @@ public interface Handler {
   }
   /** An OSM element that would appear in the {@code osm_shipway_linestring} table generated by imposm3. */
   public record OsmShipwayLinestring(@Override String shipway, @Override int zOrder, @Override long layer,
-    @Override String name, @Override String nameEn, @Override String nameDe, @Override String shortName,
-    @Override boolean isTunnel, @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord,
-    @Override boolean isArea, @Override String service, @Override String usage, @Override SourceFeature source)
-    implements Row, WithShipway, WithZOrder, WithLayer, WithName, WithNameEn, WithNameDe, WithShortName, WithIsTunnel,
-    WithIsBridge, WithIsRamp, WithIsFord, WithIsArea, WithService, WithUsage, WithSource {
+    @Override String name, @Override String nameEn, @Override String nameDe, @Override boolean isTunnel,
+    @Override boolean isBridge, @Override boolean isRamp, @Override boolean isFord, @Override boolean isArea,
+    @Override String service, @Override String usage, @Override SourceFeature source)
+    implements Row, WithShipway, WithZOrder, WithLayer, WithName, WithNameEn, WithNameDe, WithIsTunnel, WithIsBridge,
+    WithIsRamp, WithIsFord, WithIsArea, WithService, WithUsage, WithSource {
     public OsmShipwayLinestring(SourceFeature source, String mappingKey) {
       this(source.getString("route"), source.getWayZorder(), source.getLong("layer"), source.getString("name"),
-        source.getString("name:en"), source.getString("name:de"), source.getString("short_name"),
-        source.getBoolean("tunnel"), source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"),
-        source.getBoolean("area"), source.getString("service"), source.getString("usage"), source);
+        source.getString("name:en"), source.getString("name:de"), source.getBoolean("tunnel"),
+        source.getBoolean("bridge"), source.getBoolean("ramp"), source.getBoolean("ford"), source.getBoolean("area"),
+        source.getString("service"), source.getString("usage"), source);
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
@@ -1236,11 +1254,6 @@ public interface WithShipway {
     String shipway();
   }
 
-  /** Rows with a String shortName attribute. */
-  public interface WithShortName {
-    String shortName();
-  }
-
   /** Rows with a SourceFeature source attribute. */
   public interface WithSource {
     SourceFeature source();
@@ -1331,6 +1344,8 @@ public interface WithZOrder {
       OsmMountainLinestring.MAPPING),
     MultiExpression.entry(new RowClassAndConstructor(OsmParkPolygon.class, OsmParkPolygon::new),
       OsmParkPolygon.MAPPING),
+    MultiExpression.entry(new RowClassAndConstructor(OsmBoundaryPolygon.class, OsmBoundaryPolygon::new),
+      OsmBoundaryPolygon.MAPPING),
     MultiExpression.entry(new RowClassAndConstructor(OsmAerowayPolygon.class, OsmAerowayPolygon::new),
       OsmAerowayPolygon.MAPPING),
     MultiExpression.entry(new RowClassAndConstructor(OsmAerowayLinestring.class, OsmAerowayLinestring::new),
@@ -1406,6 +1421,10 @@ public static Map<Class<? extends Row>, List<RowHandlerAndClass<?>>> generateDis
         result.computeIfAbsent(OsmParkPolygon.class, cls -> new ArrayList<>())
           .add(new RowHandlerAndClass<>(typedHandler.getClass(), typedHandler::process));
       }
+      if (handler instanceof OsmBoundaryPolygon.Handler typedHandler) {
+        result.computeIfAbsent(OsmBoundaryPolygon.class, cls -> new ArrayList<>())
+          .add(new RowHandlerAndClass<>(typedHandler.getClass(), typedHandler::process));
+      }
       if (handler instanceof OsmAerowayPolygon.Handler typedHandler) {
         result.computeIfAbsent(OsmAerowayPolygon.class, cls -> new ArrayList<>())
           .add(new RowHandlerAndClass<>(typedHandler.getClass(), typedHandler::process));

src/main/java/org/openmaptiles/layers/Boundary.java

@@ -79,6 +79,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import org.locationtech.jts.operation.polygonize.Polygonizer;
 import org.openmaptiles.OpenMapTilesProfile;
 import org.openmaptiles.generated.OpenMapTilesSchema;
+import org.openmaptiles.generated.Tables;
+import org.openmaptiles.util.OmtLanguageUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,6 +97,7 @@ public class Boundary implements
   OpenMapTilesProfile.NaturalEarthProcessor,
   OpenMapTilesProfile.OsmRelationPreprocessor,
   OpenMapTilesProfile.OsmAllProcessor,
+  Tables.OsmBoundaryPolygon.Handler,
   OpenMapTilesProfile.FeaturePostProcessor,
   OpenMapTilesProfile.FinishHandler {
 
@@ -127,6 +130,7 @@ public class Boundary implements
   private final Map<Long, List<Geometry>> regionGeometries = new HashMap<>();
   private final Map<CountryBoundaryComponent, List<Geometry>> boundariesToMerge = new HashMap<>();
   private final PlanetilerConfig config;
+  private final Translations translations;
 
   public Boundary(Translations translations, PlanetilerConfig config, Stats stats) {
     this.config = config;
@@ -141,6 +145,7 @@ public Boundary(Translations translations, PlanetilerConfig config, Stats stats)
       false
     );
     this.stats = stats;
+    this.translations = translations;
   }
 
   private static boolean isDisputed(Map<String, Object> tags) {
@@ -306,6 +311,15 @@ public void processAllOsm(SourceFeature feature, FeatureCollector features) {
     }
   }
 
+  @Override
+  public void process(Tables.OsmBoundaryPolygon element, FeatureCollector features) {
+    features.polygon(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
+      .putAttrs(OmtLanguageUtils.getNames(element.source().tags(), translations))
+      .setAttr(OpenMapTilesSchema.Boundary.Fields.CLASS, element.boundary())
+      .setMinPixelSizeBelowZoom(13, 4) // for Z4: `sql_filter: area>power(ZRES3,2)`, etc.
+      .setMinZoom(4);
+  }
+
   @Override
   public void finish(String sourceName, FeatureCollector.Factory featureCollectors,
     Consumer<FeatureCollector.Feature> emit) {

src/main/java/org/openmaptiles/layers/Park.java

@@ -91,20 +91,15 @@ public Park(Translations translations, PlanetilerConfig config, Stats stats) {
 
   @Override
   public void process(Tables.OsmParkPolygon element, FeatureCollector features) {
-    String clazz;
-    if ("aboriginal_lands".equals(element.boundary())) {
-      clazz = "aboriginal_lands";
-    } else {
-      String protectionTitle = element.protectionTitle();
-      if (protectionTitle != null) {
-        protectionTitle = protectionTitle.replace(' ', '_').toLowerCase(Locale.ROOT);
-      }
-      clazz = coalesce(
-        nullIfEmpty(protectionTitle),
-        nullIfEmpty(element.boundary()),
-        nullIfEmpty(element.leisure())
-      );
+    String protectionTitle = element.protectionTitle();
+    if (protectionTitle != null) {
+      protectionTitle = protectionTitle.replace(' ', '_').toLowerCase(Locale.ROOT);
     }
+    String clazz = coalesce(
+      nullIfEmpty(protectionTitle),
+      nullIfEmpty(element.boundary()),
+      nullIfEmpty(element.leisure())
+    );
 
     // park shape
     var outline = features.polygon(LAYER_NAME).setBufferPixels(BUFFER_SIZE)

src/main/java/org/openmaptiles/layers/Place.java

@@ -88,6 +88,7 @@ public class Place implements
   Tables.OsmIslandPoint.Handler,
   Tables.OsmIslandPolygon.Handler,
   Tables.OsmCityPoint.Handler,
+  Tables.OsmBoundaryPolygon.Handler,
   OpenMapTilesProfile.FeaturePostProcessor {
 
   /*
@@ -96,8 +97,10 @@ public class Place implements
    * and minimum zoom level to use for those points.
    */
 
-  private static final TreeMap<Double, Integer> ISLAND_AREA_RANKS = new TreeMap<>(Map.of(
-    Double.MAX_VALUE, 3,
+  private static final TreeMap<Double, Integer> AREA_RANKS = new TreeMap<>(Map.of(
+    Double.MAX_VALUE, 1,
+    squareMetersToWorldArea(640_000_000), 2,
+    squareMetersToWorldArea(160_000_000), 3,
     squareMetersToWorldArea(40_000_000), 4,
     squareMetersToWorldArea(15_000_000), 5,
     squareMetersToWorldArea(1_000_000), 6
@@ -282,7 +285,7 @@ public void process(Tables.OsmStatePoint element, FeatureCollector features) {
   public void process(Tables.OsmIslandPolygon element, FeatureCollector features) {
     try {
       double area = element.source().area();
-      int rank = ISLAND_AREA_RANKS.ceilingEntry(area).getValue();
+      int rank = AREA_RANKS.ceilingEntry(area).getValue();
       int minzoom = rank <= 3 ? 8 : rank <= 4 ? 9 : 10;
 
       features.pointOnSurface(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
@@ -369,6 +372,23 @@ public void process(Tables.OsmCityPoint element, FeatureCollector features) {
     }
   }
 
+  @Override
+  public void process(Tables.OsmBoundaryPolygon element, FeatureCollector features) {
+    try {
+      int rank = AREA_RANKS.ceilingEntry(element.source().area()).getValue();
+      int minzoom = rank <= 4 ? rank + 5 : 10;
+
+      features.pointOnSurface(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
+        .putAttrs(OmtLanguageUtils.getNames(element.source().tags(), translations))
+        .setAttr(OpenMapTilesSchema.Boundary.Fields.CLASS, element.boundary())
+        .setAttr(Fields.RANK, rank)
+        .setMinZoom(minzoom);
+    } catch (GeometryException e) {
+      e.log(stats, "omt_boundary_poly",
+        "Unable to get point for OSM boundary polygon " + element.source().id());
+    }
+  }
+
   @Override
   public List<VectorTile.Feature> postProcess(int zoom, List<VectorTile.Feature> items) {
     // infer the rank field from ordering of the place labels with each label grid square