Merge pull request #9 from remix/feature/enable-miniature-narrow-gauge

feat: enable narrow gauge and miniature routes

Author: sgoel

src/main/java/de/geofabrik/railway_routing/ev/RailwayClass.java

@@ -7,7 +7,7 @@
  * This enum defines the railway class of an edge. It maps the railway=* key of OSM to an enum. All edges that do not fit get OTHER as value.
  */
 public enum RailwayClass {
-    OTHER, RAIL, SUBWAY, TRAM, LIGHT_RAIL, FUNICULAR, CONSTRUCTION, MONORAIL, PROPOSED;
+    OTHER, RAIL, SUBWAY, TRAM, LIGHT_RAIL, FUNICULAR, CONSTRUCTION, MONORAIL, PROPOSED, NARROW_GAUGE, MINIATURE;
 
     public static final String KEY = "railway_class";
 

src/main/java/de/geofabrik/railway_routing/parsers/RailAccessParser.java

@@ -16,7 +16,7 @@ public class RailAccessParser extends AbstractAccessParser {
 
     public static final String DEFAULT_NAME = "rail";
     private static final Set<String> ALLOWED_RAIL_TYPES = Set.of(
-        "rail", "light_rail", "tram", "subway", "construction", "proposed", "funicular", "monorail"
+        "rail", "light_rail", "tram", "subway", "construction", "proposed", "funicular", "monorail", "narrow_gauge", "miniature"
     );
 
     public RailAccessParser(BooleanEncodedValue accessEnc) {

src/test/java/de/geofabrik/railway_routing/parsers/OSMRailwayClassParserTest.java

@@ -57,7 +57,7 @@ void railwayClass() {
         way = new ReaderWay(29L);
         way.setTag("railway", "narrow_gauge");
         parser.handleWayTags(edgeId, edgeIntAccess, way, relFlags);
-        assertEquals(RailwayClass.OTHER, classEnc.getEnum(false, edgeId, edgeIntAccess));
+        assertEquals(RailwayClass.NARROW_GAUGE, classEnc.getEnum(false, edgeId, edgeIntAccess));
 
         edgeIntAccess = new ArrayEdgeIntAccess(1);
         way = new ReaderWay(29L);
@@ -88,6 +88,12 @@ void railwayClass() {
         way.setTag("railway", "monorail");
         parser.handleWayTags(edgeId, edgeIntAccess, way, relFlags);
         assertEquals(RailwayClass.MONORAIL, classEnc.getEnum(false, edgeId, edgeIntAccess));
+
+        edgeIntAccess = new ArrayEdgeIntAccess(1);
+        way = new ReaderWay(29L);
+        way.setTag("railway", "miniature");
+        parser.handleWayTags(edgeId, edgeIntAccess, way, relFlags);
+        assertEquals(RailwayClass.MINIATURE, classEnc.getEnum(false, edgeId, edgeIntAccess));
     }
 
 }

src/test/java/de/geofabrik/railway_routing/parsers/RailAccessParserTest.java

@@ -66,11 +66,29 @@ public void testRejectRoad() {
     }
 
     @Test
-    public void testRejectsNarrowGauge() {
+    public void testAcceptsNarrowGauge() {
         PMap properties = new PMap();
         RailAccessParser e = createAccessParser(createEncodingManager(), properties);
         ReaderWay way = new ReaderWay(1);
         way.setTag("railway", "narrow_gauge");
+        assertEquals(e.getAccess(way), WayAccess.WAY);
+    }
+
+    @Test
+    public void testAcceptsMiniature() {
+        PMap properties = new PMap();
+        RailAccessParser e = createAccessParser(createEncodingManager(), properties);
+        ReaderWay way = new ReaderWay(1);
+        way.setTag("railway", "miniature");
+        assertEquals(e.getAccess(way), WayAccess.WAY);
+    }
+
+    @Test
+    public void testRejectsAbandoned() {
+        PMap properties = new PMap();
+        RailAccessParser e = createAccessParser(createEncodingManager(), properties);
+        ReaderWay way = new ReaderWay(1);
+        way.setTag("railway", "abandoned");
         assertEquals(WayAccess.CAN_SKIP, e.getAccess(way));
     }
 }