Move way name parsing from EncodingManager to OSMReader #2537
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
easbar
commented
Mar 12, 2022
|
|
||
| req.putHint("instructions", false); | ||
| instance.route(req); | ||
| assertEquals(old, instance.getEncodingManager().isEnableInstructions(), "route method should not change instance field"); |
There was a problem hiding this comment.
Definitely not :) But testing this here does not seem necessary and now the flag is gone anyway...
Comment on lines
-627
to
-628
| if (Double.isInfinite(edge.getDistance())) | ||
| throw new IllegalStateException("Infinite distance should not happen due to #435. way ID=" + way.getId()); |
There was a problem hiding this comment.
We do this check else where
Comment on lines
+53
to
+55
| private final EncodedValue.InitializerConfig turnCostConfig; | ||
| private final EncodedValue.InitializerConfig relationConfig; | ||
| private final EncodedValue.InitializerConfig edgeConfig; |
There was a problem hiding this comment.
These can be final so I made them final
# Conflicts: # CHANGELOG.md
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.
I moved the code that parses the
name/refOSM tag of the OSM ways fromEncodingManager#applyWayTagstoOSMReader. I also added a new setting to disable instructions on the server side calledrouting.instructions, which is now separated fromdatareader.instructions. The latter now only controls whether the way names shall be parsed or not. It is probably debatable whether we even needdatareader.instructionsand it should probably be better renamed todatareader.parse_namesor evenosmreader.parse_names. However renamingdatareadertoosmreaderis for another issue.