Skip to content

Commit 3782dc9

Browse files
committed
fix: tweak road bike flag encoder in order to restore its desired behavior
1 parent 2210a86 commit 3782dc9

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/flagencoders/bike/RoadBikeFlagEncoder.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,17 @@ public RoadBikeFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts,
8989
setTrackTypeSpeed("grade4", PUSHING_SECTION_SPEED);
9090
setTrackTypeSpeed("grade5", PUSHING_SECTION_SPEED);
9191

92-
setSurfaceSpeed("paved", 26, UpdateType.DOWNGRADE_ONLY);
93-
setSurfaceSpeed("asphalt", 26, UpdateType.DOWNGRADE_ONLY);
92+
setSurfaceSpeed("paved", 20, UpdateType.UPGRADE_ONLY);
93+
setSurfaceSpeed("asphalt", 20, UpdateType.UPGRADE_ONLY);
94+
setSurfaceSpeed("concrete", 20, UpdateType.UPGRADE_ONLY);
95+
9496
setSurfaceSpeed("cobblestone", 10, UpdateType.DOWNGRADE_ONLY);
9597
setSurfaceSpeed("cobblestone:flattened", 10, UpdateType.DOWNGRADE_ONLY);
9698
setSurfaceSpeed("sett", 10, UpdateType.DOWNGRADE_ONLY);
97-
setSurfaceSpeed("concrete", 26, UpdateType.DOWNGRADE_ONLY);
9899
setSurfaceSpeed("concrete:lanes", 16, UpdateType.DOWNGRADE_ONLY);
99100
setSurfaceSpeed("concrete:plates", 16, UpdateType.DOWNGRADE_ONLY);
100-
setSurfaceSpeed("paving_stones", 10, UpdateType.DOWNGRADE_ONLY);
101-
setSurfaceSpeed("paving_stones:30", 10, UpdateType.DOWNGRADE_ONLY);
101+
setSurfaceSpeed("paving_stones", 12, UpdateType.DOWNGRADE_ONLY);
102+
setSurfaceSpeed("paving_stones:30", 12, UpdateType.DOWNGRADE_ONLY);
102103
setSurfaceSpeed("unpaved", PUSHING_SECTION_SPEED / 2);
103104
setSurfaceSpeed("compacted", PUSHING_SECTION_SPEED / 2);
104105
setSurfaceSpeed("dirt", PUSHING_SECTION_SPEED / 2);
@@ -116,7 +117,7 @@ public RoadBikeFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts,
116117
setSurfaceSpeed("sand", PUSHING_SECTION_SPEED / 2);
117118
setSurfaceSpeed("wood", PUSHING_SECTION_SPEED / 2);
118119

119-
setHighwaySpeed(KEY_CYCLEWAY, 18);
120+
setHighwaySpeed(KEY_CYCLEWAY, new SpeedValue(18, UpdateType.DOWNGRADE_ONLY));
120121
setHighwaySpeed("living_street", 10);
121122
setHighwaySpeed("path", 8);
122123
setHighwaySpeed("footway", 6);
@@ -125,7 +126,7 @@ public RoadBikeFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts,
125126
setHighwaySpeed(VAL_TRACK, PUSHING_SECTION_SPEED / 2); // assume unpaved
126127
setHighwaySpeed(VAL_SERVICE, 12);
127128
setHighwaySpeed(VAL_UNCLASSIFIED, 20);
128-
setHighwaySpeed(VAL_RESIDENTIAL, 18);
129+
setHighwaySpeed(VAL_RESIDENTIAL, new SpeedValue(18, UpdateType.DOWNGRADE_ONLY));
129130

130131
setHighwaySpeed("trunk", 20);
131132
setHighwaySpeed("trunk_link", 20);
@@ -142,8 +143,6 @@ public RoadBikeFlagEncoder(int speedBits, double speedFactor, int maxTurnCosts,
142143
addPushingSection("steps");
143144
addPushingSection(KEY_BRIDLEWAY);
144145

145-
routeMap.put(LOCAL, UNCHANGED.getValue());
146-
147146
blockByDefaultBarriers.add("kissing_gate");
148147

149148
setAvoidSpeedLimit(81);

0 commit comments

Comments
 (0)