Merge pull request #6093 from HSLdevcom/slope-overrides

Don't use elevation data directly for ways with cutting=*, location=underground or indoor=yes tags in the default mapper
opentripplanner · Oct 3, 2024 · 02f6535 · 02f6535
2 parents d8d6f85 + 9da25b1
commit 02f6535
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
@@ -613,7 +613,10 @@ public void populateProperties(WayPropertySet props) {
     // slope overrides
     props.setSlopeOverride(new BestMatchSpecifier("bridge=*"), true);
     props.setSlopeOverride(new BestMatchSpecifier("embankment=*"), true);
+    props.setSlopeOverride(new BestMatchSpecifier("cutting=*"), true);
     props.setSlopeOverride(new BestMatchSpecifier("tunnel=*"), true);
+    props.setSlopeOverride(new BestMatchSpecifier("location=underground"), true);
+    props.setSlopeOverride(new BestMatchSpecifier("indoor=yes"), true);
   }
 
   public void populateNotesAndNames(WayPropertySet props) {

diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.openstreetmap.tagmapping;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opentripplanner.street.model.StreetTraversalPermission.ALL;
 import static org.opentripplanner.street.model.StreetTraversalPermission.PEDESTRIAN;
@@ -189,6 +190,15 @@ void bicycleUseSidepath() {
     assertEquals(4.9, useSidepathBackwardProps.bicycleSafety().back(), epsilon);
   }
 
+  @Test
+  void slopeOverrides() {
+    var regular = WayTestData.southeastLaBonitaWay();
+    assertFalse(wps.getSlopeOverride(regular));
+
+    var indoor = WayTestData.southeastLaBonitaWay().addTag("indoor", "yes");
+    assertTrue(wps.getSlopeOverride(indoor));
+  }
+
   /**
    * Test that two values are within epsilon of each other.
    */