Round 2 enhancements for Felt

tiles/Makefile

@@ -0,0 +1,61 @@
+# download dependencies and compile the JAR
+# generally do this after each code change
+clean:
+	mvn clean package
+
+# is a build only partially finishes, the PMTiles can be corrupted
+clean-pmtiles:
+	rm -rf *.pmtiles
+
+# This is optimized for local dev serving PMTiles out of directory local to this Makefile
+# Don't use this for production (instead set --cors=ORIGIN)
+# The default port is: 8080 (use --port to override)
+# Assumes go-pmtiles has been installed locally (eg prebuilt go binary download) & the path is added to your shell env
+# https://github.com/protomaps/go-pmtiles
+# Example tile coord to test with: http://localhost:8080/monaco/12/2133/1495.mvt
+serve:
+	~/Downloads/pmtiles serve --cors=* .
+
+#
+# Testing areas
+#
+
+# Smallest
+#
+#Download and generate monaco.pmtiles in the current directory:
+monaco:
+	java -jar target/*-with-deps.jar --download --force --area=monaco
+
+# Generate monaco.pmtiles in the current directory (using already downloaded asset)
+monaco-fast:
+	java -jar target/*-with-deps.jar --force --area=monaco
+
+# Medium
+#
+#Download and generate switzerland.pmtiles in the current directory:
+switzerland:
+	java -jar target/*-with-deps.jar --download --force --area=switzerland
+
+# Generate switzerland.pmtiles in the current directory (using already downloaded asset)
+switzerland-fast:
+	java -jar target/*-with-deps.jar --force --area=switzerland
+
+#Download and generate switzerland.pmtiles in the current directory:
+washington:
+	java -jar target/*-with-deps.jar --download --force --area=washington
+
+# Generate switzerland.pmtiles in the current directory (using already downloaded asset)
+washington-fast:
+	java -jar target/*-with-deps.jar --force --area=washington
+
+# Large
+#
+# Download and generate ca/california.pmtiles in the current directory:
+# Note: the slash confuses some downstream processes, try a symlink to california
+california:
+	java -jar target/*-with-deps.jar --download --force --area=us/california
+
+# Generate ca/california.pmtiles in the current directory (using already downloaded asset)
+# Note: the slash confuses some downstream processes, try a symlink to california
+california-fast:
+	java -jar target/*-with-deps.jar --force --area=us/california

tiles/src/main/java/com/protomaps/basemap/Basemap.java

@@ -50,6 +50,7 @@ public Basemap(Boolean useTilezen) {
       var physical_point = new PhysicalPoint();
       registerHandler(physical_point);
       registerSourceHandler("osm", physical_point);
+      registerSourceHandler("ne", physical_point::processNe);
 
       var place = new Places();
       registerHandler(place);

tiles/src/main/java/com/protomaps/basemap/layers/Boundaries.java

@@ -24,6 +24,8 @@ public String name() {
   @Override
   public void processFeature(SourceFeature sf, FeatureCollector features) {
     if (sf.canBeLine()) {
+      // Beware coastlines and coastal waters (eg with admin borders in large estuaries)
+      // like mouth of Columbia River between Oregon and Washington in USA
       if (sf.hasTag("natural", "coastline") || sf.hasTag("maritime", "yes")) {
         return;
       }
@@ -38,10 +40,27 @@ public void processFeature(SourceFeature sf, FeatureCollector features) {
           line.setMinZoom(0);
         } else if (minAdminLevel.getAsInt() <= 4) {
           line.setMinZoom(3);
+        } else if (minAdminLevel.getAsInt() <= 6) {
+          line.setMinZoom(8);
         } else {
           line.setMinZoom(10);
         }
 
+        switch (minAdminLevel.getAsInt()) {
+          case 2 -> {
+            line.setAttr("pmap:kind", "country");
+          }
+          case 4 -> {
+            line.setAttr("pmap:kind", "region");
+          }
+          case 6 -> {
+            line.setAttr("pmap:kind", "county");
+          }
+          case 8 -> {
+            line.setAttr("pmap:kind", "locality");
+          }
+        }
+
         if (disputed.getAsInt() == 1) {
           line.setAttr("disputed", 1);
         }

tiles/src/main/java/com/protomaps/basemap/layers/Buildings.java

@@ -8,6 +8,7 @@
 import com.onthegomap.planetiler.VectorTile;
 import com.onthegomap.planetiler.geo.GeometryException;
 import com.onthegomap.planetiler.reader.SourceFeature;
+import com.onthegomap.planetiler.util.Exceptions;
 import com.protomaps.basemap.feature.FeatureId;
 import com.protomaps.basemap.names.OsmNames;
 import com.protomaps.basemap.postprocess.Area;
@@ -20,10 +21,33 @@ public String name() {
     return "buildings";
   }
 
+  static int quantize_val(double val, int step) {
+    // special case: if val is very small, we don't want it rounding to zero, so
+    // round the smallest values up to the first step.
+    if( val < step ) {
+      return (int) step;
+    }
+
+    return (int) Math.round(val / step) * step;
+  }
+
   @Override
   public void processFeature(SourceFeature sf, FeatureCollector features) {
-    if (sf.canBePolygon() && (sf.hasTag("building") || sf.hasTag("building:part"))) {
+    if (sf.canBePolygon() && (
+            ( sf.hasTag("building") && !sf.hasTag("building", "no")) ||
+            ( sf.hasTag("building:part") && !sf.hasTag("building:part", "no"))))
+    {
       Double height = parseDoubleOrNull(sf.getString("height"));
+      Double min_height = parseDoubleOrNull(sf.getString("min_height"));
+      Integer min_zoom = 11;
+      String kind = "building";
+
+      // Limit building:part features to later zooms
+      // TODO: (nvkelso 20230621) this should be based on area and volume, too
+      if( sf.hasTag("building:part") ) {
+        kind = "building_part";
+        min_zoom = 14;
+      }
 
       if (height == null) {
         Double levels = parseDoubleOrNull(sf.getString("building:levels"));
@@ -34,12 +58,21 @@ public void processFeature(SourceFeature sf, FeatureCollector features) {
 
       var feature = features.polygon(this.name())
         .setId(FeatureId.create(sf))
-        .setAttrWithMinzoom("building:part", sf.getString("building:part"), 13)
+        .setAttr("pmap:kind", kind)
         .setAttrWithMinzoom("layer", sf.getString("layer"), 13)
-        .setAttrWithMinzoom("height", height, 13)
-        .setZoomRange(10, 15);
+        // NOTE: Height is quantized by zoom in a post-process step
+        .setAttr("height", height)
+        .setZoomRange(min_zoom, 15);
+
+      if( kind == "building_part") {
+        // We don't need to set WithMinzoom because that's implicate with the ZoomRange
+        feature.setAttr("pmap:kind_detail", sf.getString("building:part"));
+        feature.setAttr("min_height", sf.getString("min_height"));
+      }
 
-      OsmNames.setOsmNames(feature, sf, 13);
+      // Names should mostly just be for POIs
+      // Sometimes building name and address are useful items, but only at zoom 17+
+      //OsmNames.setOsmNames(feature, sf, 13);
     }
   }
 
@@ -50,8 +83,62 @@ public List<VectorTile.Feature> postProcess(int zoom, List<VectorTile.Feature> i
     }
     items = Area.filterArea(items, 0);
 
-    if (zoom >= 14)
+    // DEBUG
+    //items = Area.addAreaTag(items);
+
+    if (zoom >= 15)
       return items;
+
+    // quantize height by zoom when less than max_zoom 15 to facilitate better feature merging
+    for (var item : items) {
+      try {
+        if (item.attrs().containsKey("height")) {
+          var height = (double) item.attrs().get("height");
+
+          // Protected against NULL values
+          if( height > 0 ) {
+            // at zoom <= 12 round height to nearest 20 meters
+            if (zoom <= 12) {
+              height = quantize_val(height, 20);
+            } else
+            // at zoom 13 round height to nearest 10 meters
+            if (zoom == 13) {
+              height = quantize_val(height, 10);
+            } else
+            // at zoom 14 round height to nearest 5 meters
+            if (zoom == 14) {
+              height = quantize_val(height, 5);
+            }
+
+            item.attrs().put("height", height);
+          }
+        }
+      } catch( Exception e ) { }
+
+      try {
+        if (item.attrs().containsKey("min_height")) {
+          var min_height = (double) item.attrs().get("min_height");
+
+          // Protected against NULL values
+          if (min_height > 0) {
+            if (zoom <= 12) {
+              min_height = quantize_val(min_height, 20);
+            } else
+              // at zoom 13 round height to nearest 10 meters
+              if (zoom == 13) {
+                min_height = quantize_val(min_height, 10);
+              } else
+                // at zoom 14 round height to nearest 5 meters
+                if (zoom == 14) {
+                  min_height = quantize_val(min_height, 5);
+                }
+
+            item.attrs().put("min_height", min_height);
+          }
+        }
+      } catch( Exception e ) { }
+    }
+
     return FeatureMerge.mergeNearbyPolygons(items, 3.125, 3.125, 0.5, 0.5);
   }
 }

tiles/src/main/java/com/protomaps/basemap/layers/Earth.java

@@ -17,17 +17,18 @@ public String name() {
 
   public void processOsm(SourceFeature sf, FeatureCollector features) {
     features.polygon(this.name())
-      .setZoomRange(6, 15).setBufferPixels(8);
+        .setAttr("pmap:kind", "earth")
+        .setZoomRange(6, 15).setBufferPixels(8);
   }
 
   public void processNe(SourceFeature sf, FeatureCollector features) {
     var sourceLayer = sf.getSourceLayer();
     if (sourceLayer.equals("ne_110m_land")) {
-      features.polygon(this.name()).setZoomRange(0, 1);
+      features.polygon(this.name()).setZoomRange(0, 1).setBufferPixels(8).setAttr("pmap:kind", "earth");
     } else if (sourceLayer.equals("ne_50m_land")) {
-      features.polygon(this.name()).setZoomRange(2, 4);
+      features.polygon(this.name()).setZoomRange(2, 4).setBufferPixels(8).setAttr("pmap:kind", "earth");
     } else if (sourceLayer.equals("ne_10m_land")) {
-      features.polygon(this.name()).setZoomRange(5, 5);
+      features.polygon(this.name()).setZoomRange(5, 5).setBufferPixels(8).setAttr("pmap:kind", "earth");
     }
   }