From f322511701ea352e8fa349b25ec45bd1fb872c29 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Tue, 13 Jun 2023 13:05:53 +0300 Subject: [PATCH 1/3] Rename ConstansSpeedMapper to describe the new super class --- docs/BuildConfiguration.md | 4 ++-- .../openstreetmap/tagmapping/ConstantSpeedMapper.java | 6 +++--- .../openstreetmap/tagmapping/OsmTagMapperSource.java | 4 ++-- .../openstreetmap/tagmapping/OsmTagMapperTest.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 3efd5dd070a..7125eb55be2 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -965,7 +965,7 @@ 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` | `constantspeedfinland` The named set of mapping rules applied when parsing OSM tags. Overrides the value specified in `osmDefaults`. @@ -973,7 +973,7 @@ The named set of mapping rules applied when parsing OSM tags. Overrides the valu **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` | `constantspeedfinland` 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 index 1c55af2f749..58cff2e9a3d 100644 --- 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 index 8156fb74e12..ea8d84269e1 100644 --- 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; + CONSTANTSPEEDFINLAND; 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 CONSTANTSPEEDFINLAND -> new ConstantSpeedFinlandMapper(); }; } } diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperTest.java index 5219d088b67..d3a947b217c 100644 --- 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"); From d368cb49df55e81f820577975be8e931dac8dff1 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 14 Jun 2023 12:17:22 +0300 Subject: [PATCH 2/3] Separate words with underscore in osm tag mapper enum value --- .../openstreetmap/tagmapping/OsmTagMapperSource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java index ea8d84269e1..6ed4a701c30 100644 --- 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, - CONSTANTSPEEDFINLAND; + 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 CONSTANTSPEEDFINLAND -> new ConstantSpeedFinlandMapper(); + case CONSTANT_SPEED_FINLAND -> new ConstantSpeedFinlandMapper(); }; } } From 429dbddccef8770c50683e9c79b8fde8be27018a Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 14 Jun 2023 12:21:16 +0300 Subject: [PATCH 3/3] Update docs --- docs/BuildConfiguration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 7125eb55be2..fba7f888f39 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -965,7 +965,7 @@ 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` | `constantspeedfinland` +**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`. @@ -973,7 +973,7 @@ The named set of mapping rules applied when parsing OSM tags. Overrides the valu **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"` **Path:** /osmDefaults -**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constantspeedfinland` +**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constant-speed-finland` The named set of mapping rules applied when parsing OSM tags.