merge natural layer into landuse layer [#282]

protomaps · Sep 20, 2024 · 6456824 · 6456824
1 parent c646c13
commit 6456824
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 95 deletions.
diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts
@@ -136,10 +136,10 @@ export function nolabels_layers(
       },
     },
     {
-      id: "natural_wood",
+      id: "landuse_wood",
       type: "fill",
       source: source,
-      "source-layer": "natural",
+      "source-layer": "landuse",
       filter: ["any", ["in", "kind", "wood", "nature_reserve", "forest"]],
       paint: {
         "fill-color": [
@@ -154,10 +154,10 @@ export function nolabels_layers(
       },
     },
     {
-      id: "natural_scrub",
+      id: "landuse_scrub",
       type: "fill",
       source: source,
-      "source-layer": "natural",
+      "source-layer": "landuse",
       filter: ["in", "kind", "scrub", "grassland", "grass"],
       paint: {
         "fill-color": [
@@ -172,20 +172,20 @@ export function nolabels_layers(
       },
     },
     {
-      id: "natural_glacier",
+      id: "landuse_glacier",
       type: "fill",
       source: source,
-      "source-layer": "natural",
+      "source-layer": "landuse",
       filter: ["==", "kind", "glacier"],
       paint: {
         "fill-color": t.glacier,
       },
     },
     {
-      id: "natural_sand",
+      id: "landuse_sand",
       type: "fill",
       source: source,
-      "source-layer": "natural",
+      "source-layer": "landuse",
       filter: ["==", "kind", "sand"],
       paint: {
         "fill-color": t.sand,

diff --git a/tiles/src/main/java/com/protomaps/basemap/Basemap.java b/tiles/src/main/java/com/protomaps/basemap/Basemap.java
@@ -11,7 +11,6 @@
 import com.protomaps.basemap.layers.Earth;
 import com.protomaps.basemap.layers.Landcover;
 import com.protomaps.basemap.layers.Landuse;
-import com.protomaps.basemap.layers.Natural;
 import com.protomaps.basemap.layers.PhysicalLine;
 import com.protomaps.basemap.layers.PhysicalPoint;
 import com.protomaps.basemap.layers.Places;
@@ -47,10 +46,6 @@ public Basemap(NaturalEarthDb naturalEarthDb, QrankDb qrankDb) {
     registerHandler(landcover);
     registerSourceHandler("landcover", landcover::processLandcover);
 
-    var natural = new Natural();
-    registerHandler(natural);
-    registerSourceHandler("osm", natural::processOsm);
-
     var physicalLine = new PhysicalLine();
     registerHandler(physicalLine);
     registerSourceHandler("osm", physicalLine::processOsm);
@@ -171,7 +166,7 @@ static void run(Arguments args) {
 
     fontRegistry.loadFontBundle("NotoSansDevanagari-Regular", "1", "Devanagari");
 
-    planetiler.setProfile(new Basemap(naturalEarthDb, qrankDb)).setOutput(Path.of(area + ".pmtiles"))
+    planetiler.setProfile(new Basemap(naturalEarthDb, qrankDb)).setOutput(Path.of(area + ".mbtiles"))
       .run();
   }
 }
diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java b/tiles/src/main/java/com/protomaps/basemap/layers/Landuse.java
@@ -18,10 +18,10 @@ public void processOsm(SourceFeature sf, FeatureCollector features) {
       sf.hasTag("amenity", "hospital", "school", "kindergarten", "university", "college") ||
       sf.hasTag("boundary", "national_park", "protected_area") ||
       sf.hasTag("landuse", "recreation_ground", "industrial", "brownfield", "railway", "cemetery", "commercial",
-        "grass", "orchard", "farmland", "farmyard", "residential", "military", "village_green", "allotments") ||
+        "grass", "orchard", "farmland", "farmyard", "residential", "military", "village_green", "allotments", "forest", "meadow", "grass") ||
       sf.hasTag("leisure", "park", "garden", "golf_course", "dog_park", "playground", "pitch", "nature_reserve") ||
       sf.hasTag("man_made", "pier", "bridge") ||
-      sf.hasTag("natural", "beach") ||
+      sf.hasTag("natural", "beach", "wood", "glacier", "grass", "scrub", "sand", "wetland", "bare_rock") ||
       // TODO: (nvkelso 20230622) This use of the place tag here is dubious, though paired with "residential"
       sf.hasTag("place", "neighbourhood") ||
       sf.hasTag("railway", "platform") ||

diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Natural.java b/tiles/src/main/java/com/protomaps/basemap/layers/Natural.java
diff --git a/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java b/tiles/src/test/java/com/protomaps/basemap/layers/LanduseTest.java
@@ -47,4 +47,17 @@ void landuseAllotments() {
         0
       )));
   }
+
+  @Test
+  void landuseGlacier() {
+    assertFeatures(15,
+      List.of(Map.of("kind", "glacier")),
+      process(SimpleFeature.create(
+        newPolygon(0, 0, 0, 1, 1, 1, 0, 0),
+        new HashMap<>(Map.of("natural", "glacier")),
+        "osm",
+        null,
+        0
+      )));
+  }
 }
diff --git a/tiles/src/test/java/com/protomaps/basemap/layers/NaturalTest.java b/tiles/src/test/java/com/protomaps/basemap/layers/NaturalTest.java