Merge branch 'fix-kelamapper' into dev-2.x

HSLdevcom · Jun 14, 2023 · 81b6663 · 81b6663
2 parents 6edeb98 + 429dbdd
commit 81b6663
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md
@@ -965,15 +965,15 @@ the local filesystem.
 
 **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"`   
 **Path:** /osm/[0]   
-**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constantspeed`
+**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constant-speed-finland`
 
 The named set of mapping rules applied when parsing OSM tags. Overrides the value specified in `osmDefaults`.
 
 <h3 id="od_osmTagMapping">osmTagMapping</h3>
 
 **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"`   
 **Path:** /osmDefaults   
-**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constantspeed`
+**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constant-speed-finland`
 
 The named set of mapping rules applied when parsing OSM tags.
 

diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java
@@ -14,16 +14,16 @@
 /**
  * OSM way properties for optimizing distance (not traveling time) in routing.
  */
-class ConstantSpeedMapper implements OsmTagMapper {
+class ConstantSpeedFinlandMapper implements OsmTagMapper {
 
   private float speed;
 
-  public ConstantSpeedMapper() {
+  public ConstantSpeedFinlandMapper() {
     super();
     this.speed = 22.22f; // 80 kmph by default
   }
 
-  public ConstantSpeedMapper(float speed) {
+  public ConstantSpeedFinlandMapper(float speed) {
     super();
     this.speed = speed;
   }

diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
@@ -13,7 +13,7 @@ public enum OsmTagMapperSource {
   ATLANTA,
   HOUSTON,
   PORTLAND,
-  CONSTANTSPEED;
+  CONSTANT_SPEED_FINLAND;
 
   public OsmTagMapper getInstance() {
     return switch (this) {
@@ -25,7 +25,7 @@ public OsmTagMapper getInstance() {
       case ATLANTA -> new AtlantaMapper();
       case HOUSTON -> new HoustonMapper();
       case PORTLAND -> new PortlandMapper();
-      case CONSTANTSPEED -> new ConstantSpeedMapper();
+      case CONSTANT_SPEED_FINLAND -> new ConstantSpeedFinlandMapper();
     };
   }
 }
diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperTest.java
@@ -38,7 +38,7 @@ public void isMotorThroughTrafficExplicitlyDisallowed() {
 
   @Test
   public void constantSpeedCarRouting() {
-    OsmTagMapper osmTagMapper = new ConstantSpeedMapper(20f);
+    OsmTagMapper osmTagMapper = new ConstantSpeedFinlandMapper(20f);
 
     var slowWay = new OSMWithTags();
     slowWay.addTag("highway", "residential");