More tests

Author: wipfli

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

@@ -239,60 +239,60 @@ public void processOsm(SourceFeature sf, FeatureCollector features) {
 
     // non-highway features
     // todo: exclude railway stations, levels
-    if (sf.canBeLine() && (sf.hasTag("railway") ||
-      sf.hasTag("aerialway", "cable_car") ||
-      sf.hasTag("man_made", "pier") ||
-      sf.hasTag("route", "ferry") ||
-      sf.hasTag("aeroway", "runway", "taxiway")) &&
+    if (sf.canBeLine() && (sf.hasTag("railway") || //
+      sf.hasTag("aerialway", "cable_car") || //
+      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"))) {
 
       int minZoom = 11;
 
       if (sf.hasTag("aeroway", "runway")) {
-        minZoom = 9;
+        minZoom = 9; //
       } else if (sf.hasTag("aeroway", "taxiway")) {
-        minZoom = 10;
+        minZoom = 10; //
       } else if (sf.hasTag("service", "yard", "siding", "crossover")) {
         minZoom = 13;
       } else if (sf.hasTag("man_made", "pier")) {
-        minZoom = 13;
+        minZoom = 13; //
       }
 
       String kind = "other";
       String kindDetail = "";
       if (sf.hasTag("aeroway")) {
-        kind = "aeroway";
-        kindDetail = sf.getString("aeroway");
+        kind = "aeroway"; //
+        kindDetail = sf.getString("aeroway"); //
       } else if (sf.hasTag("railway", "disused", "funicular", "light_rail", "miniature", "monorail", "narrow_gauge",
         "preserved", "subway", "tram")) {
-        kind = "rail";
-        kindDetail = sf.getString("railway");
-        minZoom = 14;
+        kind = "rail"; //
+        kindDetail = sf.getString("railway"); //
+        minZoom = 14; //
 
         if (sf.hasTag("railway", "disused")) {
-          minZoom = 15;
+          minZoom = 15; //
         }
       } else if (sf.hasTag("railway")) {
-        kind = "rail";
-        kindDetail = sf.getString("railway");
+        kind = "rail"; //
+        kindDetail = sf.getString("railway"); //
 
         if (kindDetail.equals("service")) {
-          minZoom = 13;
+          minZoom = 13; //
 
           // eg a rail yard
           if (sf.hasTag("service")) {
-            minZoom = 14;
+            minZoom = 14; //
           }
         }
       } else if (sf.hasTag("route", "ferry")) {
-        kind = "ferry";
+        kind = "ferry"; //
       } else if (sf.hasTag("man_made", "pier")) {
-        kind = "path";
-        kindDetail = "pier";
+        kind = "path"; //
+        kindDetail = "pier"; //
       } else if (sf.hasTag("aerialway")) {
-        kind = "aerialway";
-        kindDetail = sf.getString("aerialway");
+        kind = "aerialway"; //
+        kindDetail = sf.getString("aerialway"); //
       }
 
       var feature = features.line(this.name())

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

@@ -285,4 +285,148 @@ void testService() {
       )
     );
   }
+
+  @Test
+  void testRailway() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "rail",
+        "kind_detail", "a",
+        "_minzoom", 11
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", "a"
+      )
+    );
+
+    assertFeatures(12,
+      List.of(Map.of("kind", "rail",
+        "kind_detail", "service",
+        "_minzoom", 13
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", "service"
+      )
+    );
+
+    assertFeatures(12,
+      List.of(Map.of("kind", "rail",
+        "kind_detail", "service",
+        "_minzoom", 14
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", "service",
+        "service", "a"
+      )
+    );
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+    "funicular",
+    "light_rail",
+    "miniature",
+    "monorail",
+    "narrow_gauge",
+    "preserved",
+    "subway", 
+    "tram"
+  })
+  void testRailwaysSpecial(String railway) {
+    assertFeatures(12,
+      List.of(Map.of("kind", "rail",
+        "kind_detail", railway,
+        "_minzoom", 14
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", railway
+      )
+    );
+  }
+
+  @Test
+  void testRailwayDisused() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "rail",
+        "kind_detail", "disused",
+        "_minzoom", 15
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "railway", "disused"
+      )
+    );
+  }
+
+  @Test
+  void testAerialwayCableCar() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "aerialway",
+        "kind_detail", "cable_car",
+        "_minzoom", 11
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "aerialway", "cable_car"
+      )
+    );
+  }
+
+  @Test
+  void testManMadePier() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "path",
+        "kind_detail", "pier",
+        "_minzoom", 13
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "man_made", "pier"
+      )
+    );
+  }
+
+  @Test
+  void testRouteFerry() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "ferry",
+        "_minzoom", 11
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "route", "ferry"
+      )
+    );
+  }
+
+  @Test
+  void testAerowayTaxiway() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "aeroway",
+        "kind_detail", "taxiway",
+        "_minzoom", 10
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "aeroway", "taxiway"
+      )
+    );
+  }
+
+  @Test
+  void testAerowayRunway() {
+    assertFeatures(12,
+      List.of(Map.of("kind", "aeroway",
+        "kind_detail", "runway",
+        "_minzoom", 9
+      )),
+      processWithRelationAndCoords("",
+        0, 0, 1, 1,
+        "aeroway", "runway"
+      )
+    );
+  }
 }