OpenMapTiles 3.15.0 SNAPSHOT

pom.xml

@@ -22,7 +22,7 @@
 
   <groupId>org.openmaptiles</groupId>
   <artifactId>planetiler-openmaptiles</artifactId>
-  <version>3.14.0</version>
+  <version>3.15.0-SNAPSHOT</version>
 
   <name>OpenMapTiles Vector Tile Schema implementation for Planetiler tool</name>
 

scripts/regenerate-openmaptiles.sh

@@ -4,7 +4,8 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-TAG="${1:-"v3.14"}"
+# TODO: change to "v3.15" once that is released
+TAG="${1:-"master"}"
 echo "tag=${TAG}"
 
 BASE_URL="${2:-"https://raw.githubusercontent.com/openmaptiles/openmaptiles/"}"

src/main/java/org/openmaptiles/OpenMapTilesProfile.java

@@ -220,12 +220,12 @@ public interface NaturalEarthProcessor {
 
   /**
    * Layers should implement this interface to subscribe to elements from
-   * <a href="https://github.com/lukasmartinelli/osm-lakelines">OSM lake centerlines source</a>.
+   * <a href="https://github.com/openmaptiles/osm-lakelines">OSM lake centerlines source</a>.
    */
   public interface LakeCenterlineProcessor {
 
     /**
-     * Process an element from the <a href="https://github.com/lukasmartinelli/osm-lakelines">OSM lake centerlines
+     * Process an element from the <a href="https://github.com/openmaptiles/osm-lakelines">OSM lake centerlines
      * source</a>
      *
      * @see Profile#processFeature(SourceFeature, FeatureCollector)

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

@@ -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/v3.14/openmaptiles.yaml">OpenMapTiles vector tile
+ * in the <a href="https://github.com/openmaptiles/openmaptiles/blob/master/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
@@ -94,21 +94,23 @@ public record RowHandlerAndClass<T extends Row> (
   ) {}
   /** An OSM element that would appear in the {@code osm_water_polygon} table generated by imposm3. */
   public record OsmWaterPolygon(@Override String name, @Override String nameEn, @Override String nameDe,
-    @Override String natural, @Override String landuse, @Override String waterway, @Override String leisure,
-    @Override String water, @Override boolean isIntermittent, @Override boolean isTunnel, @Override boolean isBridge,
-    @Override SourceFeature source) implements Row, WithName, WithNameEn, WithNameDe, WithNatural, WithLanduse,
-    WithWaterway, WithLeisure, WithWater, WithIsIntermittent, WithIsTunnel, WithIsBridge, WithSource {
+    @Override String place, @Override String natural, @Override String landuse, @Override String waterway,
+    @Override String leisure, @Override String water, @Override boolean isIntermittent, @Override boolean isTunnel,
+    @Override boolean isBridge, @Override SourceFeature source)
+    implements Row, WithName, WithNameEn, WithNameDe, WithPlace, WithNatural, WithLanduse, WithWaterway, WithLeisure,
+    WithWater, WithIsIntermittent, WithIsTunnel, WithIsBridge, WithSource {
     public OsmWaterPolygon(SourceFeature source, String mappingKey) {
       this(source.getString("name"), source.getString("name:en"), source.getString("name:de"),
-        source.getString("natural"), source.getString("landuse"), source.getString("waterway"),
-        source.getString("leisure"), source.getString("water"), source.getBoolean("intermittent"),
-        source.getBoolean("tunnel"), source.getBoolean("bridge"), source);
+        source.getString("place"), source.getString("natural"), source.getString("landuse"),
+        source.getString("waterway"), source.getString("leisure"), source.getString("water"),
+        source.getBoolean("intermittent"), source.getBoolean("tunnel"), source.getBoolean("bridge"), source);
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
     public static final Expression MAPPING = and(
       or(matchAny("landuse", "reservoir", "basin", "salt_pond"), matchAny("leisure", "swimming_pool"),
-        matchAny("natural", "water", "bay", "spring"), matchAny("waterway", "dock"), matchAny("water", "river")),
+        matchAny("natural", "water", "bay", "spring"), matchAny("waterway", "dock"),
+        matchAny("water", "river", "stream", "canal", "ditch", "drain", "pond", "basin", "wastewater")),
       not(matchAny("covered", "yes")), matchType("polygon"));
 
     /**
@@ -246,9 +248,8 @@ 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")),
-        matchType("polygon"));
+    public static final Expression MAPPING = and(or(matchAny("leisure", "nature_reserve"),
+      matchAny("boundary", "national_park", "protected_area", "aboriginal_lands")), matchType("polygon"));
 
     /**
      * Interface for layer implementations to extend to subscribe to OSM elements filtered and parsed as
@@ -316,25 +317,27 @@ public interface Handler {
     }
   }
   /** An OSM element that would appear in the {@code osm_highway_linestring} table generated by imposm3. */
-  public record OsmHighwayLinestring(@Override String highway, @Override String construction, @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) implements Row, WithHighway, WithConstruction, WithRef, WithNetwork, WithZOrder,
-    WithLayer, WithLevel, WithIndoor, WithName, WithNameEn, WithNameDe, WithShortName, WithIsTunnel, WithIsBridge,
-    WithIsRamp, WithIsFord, WithIsOneway, WithIsArea, WithService, WithAccess, WithToll, WithUsage, WithPublicTransport,
+  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)
+    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 {
     public OsmHighwayLinestring(SourceFeature source, String mappingKey) {
-      this(source.getString("highway"), source.getString("construction"), 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"),
+      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("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);
@@ -521,16 +524,19 @@ public interface Handler {
   }
   /** An OSM element that would appear in the {@code osm_marine_point} table generated by imposm3. */
   public record OsmMarinePoint(@Override String name, @Override String nameEn, @Override String nameDe,
-    @Override String place, @Override long rank, @Override boolean isIntermittent, @Override SourceFeature source)
-    implements Row, WithName, WithNameEn, WithNameDe, WithPlace, WithRank, WithIsIntermittent, WithSource {
+    @Override String place, @Override String natural, @Override long rank, @Override boolean isIntermittent,
+    @Override SourceFeature source)
+    implements Row, WithName, WithNameEn, WithNameDe, WithPlace, WithNatural, WithRank, WithIsIntermittent, WithSource {
     public OsmMarinePoint(SourceFeature source, String mappingKey) {
       this(source.getString("name"), source.getString("name:en"), source.getString("name:de"),
-        source.getString("place"), source.getLong("rank"), source.getBoolean("intermittent"), source);
+        source.getString("place"), source.getString("natural"), source.getLong("rank"),
+        source.getBoolean("intermittent"), source);
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
     public static final Expression MAPPING =
-      and(matchAny("place", "ocean", "sea"), matchField("name"), matchType("point"));
+      and(or(matchAny("place", "ocean", "sea"), matchAny("natural", "bay", "strait")), matchField("name"),
+        matchType("point"));
 
     /**
      * Interface for layer implementations to extend to subscribe to OSM elements filtered and parsed as
@@ -656,9 +662,8 @@ public OsmCityPoint(SourceFeature source, String mappingKey) {
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
-    public static final Expression MAPPING = and(
-      matchAny("place", "city", "town", "village", "hamlet", "suburb", "quarter", "neighbourhood", "isolated_dwelling"),
-      matchField("name"), matchType("point"));
+    public static final Expression MAPPING = and(matchAny("place", "city", "town", "village", "hamlet", "borough",
+      "suburb", "quarter", "neighbourhood", "isolated_dwelling"), matchField("name"), matchType("point"));
 
     /**
      * Interface for layer implementations to extend to subscribe to OSM elements filtered and parsed as
@@ -669,10 +674,12 @@ public interface Handler {
     }
   }
   /** An OSM element that would appear in the {@code osm_housenumber_point} table generated by imposm3. */
-  public record OsmHousenumberPoint(@Override String housenumber, @Override SourceFeature source)
-    implements Row, WithHousenumber, WithSource {
+  public record OsmHousenumberPoint(@Override String housenumber, @Override String street, @Override String blockNumber,
+    @Override String hasName, @Override SourceFeature source)
+    implements Row, WithHousenumber, WithStreet, WithBlockNumber, WithHasName, WithSource {
     public OsmHousenumberPoint(SourceFeature source, String mappingKey) {
-      this(source.getString("addr:housenumber"), source);
+      this(source.getString("addr:housenumber"), source.getString("addr:street"), source.getString("addr:block_number"),
+        source.getString("name"), source);
     }
 
     /** Imposm3 "mapping" to filter OSM elements that should appear in this "table". */
@@ -731,9 +738,9 @@ public OsmPoiPoint(SourceFeature source, String mappingKey) {
         "erotic", "fabric", "florist", "frozen_food", "furniture", "garden_centre", "general", "gift", "greengrocer",
         "hairdresser", "hardware", "hearing_aids", "hifi", "ice_cream", "interior_decoration", "jewelry", "kiosk",
         "lamps", "laundry", "locksmith", "mall", "massage", "mobile_phone", "motorcycle", "music", "musical_instrument",
-        "newsagent", "optician", "outdoor", "perfume", "perfumery", "pet", "photo", "second_hand", "shoes", "sports",
-        "stationery", "supermarket", "tailor", "tattoo", "ticket", "tobacco", "toys", "travel_agency", "video",
-        "video_games", "watches", "weapons", "wholesale", "wine"),
+        "newsagent", "optician", "outdoor", "paint", "perfume", "perfumery", "pet", "photo", "second_hand", "shoes",
+        "sports", "stationery", "supermarket", "tailor", "tattoo", "ticket", "tobacco", "toys", "travel_agency",
+        "video", "video_games", "watches", "weapons", "wholesale", "wine"),
       matchAny("sport", "american_football", "archery", "athletics", "australian_football", "badminton", "baseball",
         "basketball", "beachvolleyball", "billiards", "bmx", "boules", "bowls", "boxing", "canadian_football", "canoe",
         "chess", "climbing", "climbing_adventure", "cricket", "cricket_nets", "croquet", "curling", "cycling",
@@ -801,9 +808,9 @@ public OsmPoiPolygon(SourceFeature source, String mappingKey) {
         "erotic", "fabric", "florist", "frozen_food", "furniture", "garden_centre", "general", "gift", "greengrocer",
         "hairdresser", "hardware", "hearing_aids", "hifi", "ice_cream", "interior_decoration", "jewelry", "kiosk",
         "lamps", "laundry", "locksmith", "mall", "massage", "mobile_phone", "motorcycle", "music", "musical_instrument",
-        "newsagent", "optician", "outdoor", "perfume", "perfumery", "pet", "photo", "second_hand", "shoes", "sports",
-        "stationery", "supermarket", "tailor", "tattoo", "ticket", "tobacco", "toys", "travel_agency", "video",
-        "video_games", "watches", "weapons", "wholesale", "wine"),
+        "newsagent", "optician", "outdoor", "paint", "perfume", "perfumery", "pet", "photo", "second_hand", "shoes",
+        "sports", "stationery", "supermarket", "tailor", "tattoo", "ticket", "tobacco", "toys", "travel_agency",
+        "video", "video_games", "watches", "weapons", "wholesale", "wine"),
       matchAny("sport", "american_football", "archery", "athletics", "australian_football", "badminton", "baseball",
         "basketball", "beachvolleyball", "billiards", "bmx", "boules", "bowls", "boxing", "canadian_football", "canoe",
         "chess", "climbing", "climbing_adventure", "cricket", "cricket_nets", "croquet", "curling", "cycling",
@@ -885,6 +892,11 @@ public interface WithBicycle {
     String bicycle();
   }
 
+  /** Rows with a String blockNumber attribute. */
+  public interface WithBlockNumber {
+    String blockNumber();
+  }
+
   /** Rows with a String boundary attribute. */
   public interface WithBoundary {
     String boundary();
@@ -965,6 +977,11 @@ public interface WithFunicular {
     String funicular();
   }
 
+  /** Rows with a String hasName attribute. */
+  public interface WithHasName {
+    String hasName();
+  }
+
   /** Rows with a String height attribute. */
   public interface WithHeight {
     String height();
@@ -1225,6 +1242,11 @@ public interface WithStation {
     String station();
   }
 
+  /** Rows with a String street attribute. */
+  public interface WithStreet {
+    String street();
+  }
+
   /** Rows with a String subclass attribute. */
   public interface WithSubclass {
     String subclass();
@@ -1245,6 +1267,11 @@ public interface WithTourism {
     String tourism();
   }
 
+  /** Rows with a String tracktype attribute. */
+  public interface WithTracktype {
+    String tracktype();
+  }
+
   /** Rows with a String uicRef attribute. */
   public interface WithUicRef {
     String uicRef();

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

@@ -43,9 +43,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import com.onthegomap.planetiler.geo.GeometryException;
 import com.onthegomap.planetiler.stats.Stats;
 import com.onthegomap.planetiler.util.Translations;
+import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import org.openmaptiles.generated.OpenMapTilesSchema;
 import org.openmaptiles.generated.Tables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines the logic for generating map elements in the {@code housenumber} layer from source features.
@@ -59,13 +65,63 @@ public class Housenumber implements
   Tables.OsmHousenumberPoint.Handler,
   ForwardingProfile.FeaturePostProcessor {
 
-  public Housenumber(Translations translations, PlanetilerConfig config, Stats stats) {}
+  private static final Logger LOGGER = LoggerFactory.getLogger(Housenumber.class);
+  private static final Character OSM_SEPARATOR = ';';
+  private static final String DISPLAY_SEPARATOR = "–";
+  private static final Pattern NO_CONVERSION_PATTERN = Pattern.compile("[^0-9;]");
+  private final Stats stats;
+
+  public Housenumber(Translations translations, PlanetilerConfig config, Stats stats) {
+    this.stats = stats;
+  }
+
+  private static String displayHousenumberNonumeric(String[] numbers) {
+    return numbers[0]
+      .concat(DISPLAY_SEPARATOR)
+      .concat(numbers[numbers.length - 1]);
+  }
+
+  protected static String displayHousenumber(String housenumber) {
+    if (housenumber.indexOf(OSM_SEPARATOR) < 0) {
+      return housenumber;
+    }
+
+    String[] numbers = Arrays.stream(housenumber.split(OSM_SEPARATOR.toString()))
+      .filter(n -> !n.trim().isEmpty())
+      .toArray(String[]::new);
+    if (numbers.length <= 0) {
+      // not much to do with strange/invalid entries like "3;" or ";" etc.
+      return housenumber;
+    }
+
+    Matcher matcher = NO_CONVERSION_PATTERN.matcher(housenumber);
+    if (matcher.find()) {
+      return displayHousenumberNonumeric(numbers);
+    }
+
+    // numeric display house number
+    var statistics = Arrays.stream(numbers)
+      .collect(Collectors.summarizingInt(Integer::parseUnsignedInt));
+    return String.valueOf(statistics.getMin())
+      .concat(DISPLAY_SEPARATOR)
+      .concat(String.valueOf(statistics.getMax()));
+  }
 
   @Override
   public void process(Tables.OsmHousenumberPoint element, FeatureCollector features) {
+    String housenumber;
+    try {
+      housenumber = displayHousenumber(element.housenumber());
+    } catch (NumberFormatException e) {
+      // should not be happening (thanks to NO_CONVERSION_PATTERN) but ...
+      stats.dataError("housenumber_range");
+      LOGGER.warn("Failed to convert housenumber range: {}", element.housenumber());
+      housenumber = element.housenumber();
+    }
+
     features.centroidIfConvex(LAYER_NAME)
       .setBufferPixels(BUFFER_SIZE)
-      .setAttr(Fields.HOUSENUMBER, element.housenumber())
+      .setAttr(Fields.HOUSENUMBER, housenumber)
       .setMinZoom(14);
   }