OpenMapTiles 3.15.0 SNAPSHOT

README.md

@@ -26,11 +26,11 @@ available options.
 ## Differences from OpenMapTiles
 
 - Road name abbreviations are not implemented yet in the `transportation_name` layer
-- `agg_stop` tag not implemented yet in the `poi` layer
 - `brunnel` tag is excluded from `transportation_name` layer to avoid breaking apart long `transportation_name`
   lines, to revert this behavior set `--transportation-name-brunnel=true`
 - `rank` field on `mountain_peak` linestrings only has 3 levels (1: has wikipedia page and name, 2: has name, 3: no name
   or wikipedia page or name)
+- some line and polygon tolerances are different, can be tweaked with `--simplify-tolerance` parameter
 
 ## Customizing
 

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/layers/Housenumber.java

@@ -43,9 +43,18 @@ 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.Comparator;
 import java.util.List;
+import java.util.function.Predicate;
+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.openmaptiles.util.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines the logic for generating map elements in the {@code housenumber} layer from source features.
@@ -59,19 +68,96 @@ 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 String OSM_SEPARATOR = ";";
+  private static final String DISPLAY_SEPARATOR = "–";
+  private static final Pattern NO_CONVERSION_PATTERN = Pattern.compile("[^0-9;]");
+  private static final String TEMP_PARTITION = "_partition";
+  private static final String TEMP_HAS_NAME = "_has_name";
+  private static final Comparator<VectorTile.Feature> BY_TEMP_HAS_NAME = Comparator
+    .comparing(i -> (Boolean) i.attrs().get(TEMP_HAS_NAME), Boolean::compare);
+  private final Stats stats;
+
+  public Housenumber(Translations translations, PlanetilerConfig config, Stats stats) {
+    this.stats = stats;
+  }
+
+  private static String displayHousenumberNonumeric(List<String> numbers) {
+    return numbers.getFirst()
+      .concat(DISPLAY_SEPARATOR)
+      .concat(numbers.getLast());
+  }
+
+  protected static String displayHousenumber(String housenumber) {
+    if (!housenumber.contains(OSM_SEPARATOR)) {
+      return housenumber;
+    }
+
+    List<String> numbers = Arrays.stream(housenumber.split(OSM_SEPARATOR))
+      .map(String::trim)
+      .filter(Predicate.not(String::isEmpty))
+      .toList();
+    if (numbers.isEmpty()) {
+      // 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 = numbers.stream()
+      .collect(Collectors.summarizingLong(Long::parseUnsignedLong));
+    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();
+    }
+
+    String partition = Utils.coalesce(element.street(), "")
+      .concat(Utils.coalesce(element.blockNumber(), ""))
+      .concat(housenumber);
+    Boolean hasName = element.hasName() == null ? Boolean.FALSE : !element.hasName().isEmpty();
+
     features.centroidIfConvex(LAYER_NAME)
       .setBufferPixels(BUFFER_SIZE)
-      .setAttr(Fields.HOUSENUMBER, element.housenumber())
+      .setAttr(Fields.HOUSENUMBER, housenumber)
+      .setAttr(TEMP_PARTITION, partition)
+      .setAttr(TEMP_HAS_NAME, hasName)
       .setMinZoom(14);
   }
 
   @Override
   public List<VectorTile.Feature> postProcess(int zoom, List<VectorTile.Feature> list) throws GeometryException {
+    // remove duplicate house numbers, features without name tag are prioritized
+    var items = list.stream()
+      .collect(Collectors.groupingBy(f -> f.attrs().get(TEMP_PARTITION)))
+      .values().stream()
+      .flatMap(
+        g -> g.stream().min(BY_TEMP_HAS_NAME).stream()
+      )
+      .toList();
+
+    // remove temporary attributes
+    for (var item : items) {
+      item.attrs().remove(TEMP_HAS_NAME);
+      item.attrs().remove(TEMP_PARTITION);
+    }
+
     // reduces the size of some heavy z14 tiles with many repeated housenumber values by 60% or more
-    return FeatureMerge.mergeMultiPoint(list);
+    return FeatureMerge.mergeMultiPoint(items);
   }
 }

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

@@ -91,15 +91,20 @@ public Park(Translations translations, PlanetilerConfig config, Stats stats) {
 
   @Override
   public void process(Tables.OsmParkPolygon element, FeatureCollector features) {
-    String protectionTitle = element.protectionTitle();
-    if (protectionTitle != null) {
-      protectionTitle = protectionTitle.replace(' ', '_').toLowerCase(Locale.ROOT);
+    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 clazz = coalesce(
-      nullIfEmpty(protectionTitle),
-      nullIfEmpty(element.boundary()),
-      nullIfEmpty(element.leisure())
-    );
 
     // park shape
     var outline = features.polygon(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
@@ -138,7 +143,7 @@ private int getMinZoomForArea(double area) {
     // sql filter:    area > 70000*2^(20-zoom_level)
     // simplifies to: zoom_level > 20 - log(area / 70000) / log(2)
     int minzoom = (int) Math.floor(20 - Math.log(area / WORLD_AREA_FOR_70K_SQUARE_METERS) / LOG2);
-    minzoom = Math.min(14, Math.max(5, minzoom));
+    minzoom = Math.clamp(minzoom, 5, 14);
     return minzoom;
   }
 

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

@@ -235,7 +235,7 @@ public void process(Tables.OsmCountryPoint element, FeatureCollector features) {
         rank = country.rank;
       }
 
-      rank = Math.max(1, Math.min(6, rank));
+      rank = Math.clamp(rank, 1, 6);
 
       features.point(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
         .putAttrs(names)
@@ -261,7 +261,7 @@ public void process(Tables.OsmStatePoint element, FeatureCollector features) {
         if (nullOrEmpty(names.get(Fields.NAME_EN))) {
           names.put(Fields.NAME_EN, state.name);
         }
-        int rank = Math.min(6, Math.max(1, state.rank));
+        int rank = Math.clamp(state.rank, 1, 6);
 
         features.point(LAYER_NAME).setBufferPixels(BUFFER_SIZE)
           .putAttrs(names)