Apply correct traversal permissions to barrier vertex #5369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Osm contains nodes tagged as access=no and which represent an end point of a way. For example, a doorway leading to a locked gate is sometimes modeled like that. If routing request snaps to such end point, routing fails. Barrier end vertices do not add any kind of useful functionality but just cause trouble.
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #5369 +/- ##
=============================================
+ Coverage 66.50% 66.53% +0.02%
- Complexity 15235 15255 +20
=============================================
Files 1785 1787 +2
Lines 69271 69303 +32
Branches 7291 7301 +10
=============================================
+ Hits 46069 46110 +41
+ Misses 20733 20719 -14
- Partials 2469 2474 +5
☔ View full report in Codecov by Sentry. |
src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java
Outdated
Show resolved
Hide resolved
leonardehrenfried
requested changes
Sep 22, 2023
leonardehrenfried
previously approved these changes
Sep 22, 2023
optionsome
reviewed
Sep 25, 2023
src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java
Outdated
Show resolved
Hide resolved
optionsome
reviewed
Sep 25, 2023
| @@ -35,13 +36,15 @@ public boolean hasCrossingTrafficLight() { | |||
| return hasTag("crossing") && "traffic_signals".equals(getTag("crossing")); | |||
| } | |||
|
|
|||
| /** | |||
| * Checks if this node is bollard | |||
| static final Set<String> motorVehicleBarriers = Set.of("bollard", "bar", "chain"); | |||
There was a problem hiding this comment.
I think static variables belong to the top of the class and should be named like MOTOR_VEHICLE_BARRIERS
leonardehrenfried
approved these changes
Sep 26, 2023
optionsome
approved these changes
Sep 26, 2023
| public boolean isBollard() { | ||
| return isTag("barrier", "bollard"); | ||
| public boolean isMotorVehicleBarrier() { | ||
| var barrier = this.getTag("barrier"); |
There was a problem hiding this comment.
It's too late now because I don't want to hold up the merge of this PR but whenever we touch this code again, there is the following new helper method for checking if it's one of a set of tag values:
There was a problem hiding this comment.
Oh yes, I forgot that new method. Let's fix this in some upcoming OSM related PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Two bug fixes in barrier vertex:
Issue
Closes #5353
Unit tests
Tests updated to reflect correct barrier permissions. One new unit test which tests barrier pruning added.
Documentation
Javadoc updated