Format

Author: wipfli

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

@@ -244,8 +244,8 @@ public void processOsm(SourceFeature sf, FeatureCollector features) {
       sf.hasTag("man_made", "pier") || //
       sf.hasTag("route", "ferry") || //
       sf.hasTag("aeroway", "runway", "taxiway")) && //
-      (!sf.hasTag("building") /* see https://github.com/protomaps/basemaps/issues/249 */) &&
-      (!sf.hasTag("railway", "abandoned", "razed", "demolished", "removed", "construction", "platform", "proposed"))) {
+      (!sf.hasTag("building") /* see https://github.com/protomaps/basemaps/issues/249 */) && // 
+      (!sf.hasTag("railway", "abandoned", "razed", "demolished", "removed", "construction", "platform", "proposed"))) { //
 
       int minZoom = 11;
 
@@ -254,7 +254,7 @@ public void processOsm(SourceFeature sf, FeatureCollector features) {
       } else if (sf.hasTag("aeroway", "taxiway")) {
         minZoom = 10; //
       } else if (sf.hasTag("service", "yard", "siding", "crossover")) {
-        minZoom = 13;
+        minZoom = 13; //
       } else if (sf.hasTag("man_made", "pier")) {
         minZoom = 13; //
       }

tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java

@@ -11,7 +11,6 @@
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.provider.CsvSource;
 
 
@@ -331,7 +330,7 @@ void testRailway() {
     "monorail",
     "narrow_gauge",
     "preserved",
-    "subway", 
+    "subway",
     "tram"
   })
   void testRailwaysSpecial(String railway) {
@@ -429,4 +428,54 @@ void testAerowayRunway() {
       )
     );
   }
+
+  @Test
+  void testAvoidBuildings() {
+    assertFeatures(12,
+      List.of(),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "aeroway", "runway",
+        "building", "a"
+      )
+    );
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+    "abandoned",
+    "razed",
+    "demolished",
+    "removed",
+    "construction",
+    "platform",
+    "proposed"
+  })
+  void testRailwayExcluded(String railway) {
+    assertFeatures(12,
+      List.of(),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", railway
+      )
+    );
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+    "yard",
+    "siding",
+    "crossover"
+  })
+  void testRailwayService(String service) {
+    assertFeatures(13,
+      List.of(Map.of("_minzoom", 13)),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", "a",
+        "service", service
+      )
+    );
+  }
+
 }