-
Notifications
You must be signed in to change notification settings - Fork 411
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: evaluate profile_default #1767
Conversation
5019edb
to
f6cdacc
Compare
to not block local ors runs
There seem to be issues when a graph built with yml config is read by ors with json config. So either -C have to be set to clear graphs before each test, which slows down, or to separate the tests. Further investigation needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
8c9be1f
to
6fcd8c3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@takb Why did you re-introduce enabled properties in all profiles? This change was intended by me, and it was discussed with @MichaelsJP .
a4bbcac
to
13962c8
Compare
…yml and ors-config.env
…yml and ors-config.env
just trying out things because the config conversion script is broken, no worries they're gone |
…yml and ors-config.env
Quality Gate passedIssues Measures |
Pull Request Checklist
have been resolved.
[Unreleased] heading.
APIconfiguration tests for any new functionality exposed to the API.along with a short description of what it is for, and documented this in the Pull Request (below).
(at least Germany), and the graphs build without problems (i.e. no out-of-memory errors).
importer etc.), I have generated longer distance routes for the affected profiles with different options
(avoid features, max weight etc.) and compared these with the routes of the same parameters and start/end
points generated from the current live ORS.
If there are differences then the reasoning for these MUST be documented in the pull request.
and why the change was needed.
Fixes #1762 .
Information about the changes
Reason for change: See issue #1762 . The root cause for the bug is, that properties that are set in application.yml ors.engine.profiles.* cannot be "overridden" by defaults defined in a user's ors-config.yml ors.engine.profile_default: The method merging profile properties and profile default properties does not know, if a profile property was defined in application.yml or in ors-config.yml, these files are already merged by spring. So properties from profiles.* always win.
This PR does not really fix the issue. Properties were moved from the application.yml's profiles section to profile_default. This was done for all properties where the same values were used for all profiles. The goal is, to not change behavior in existing ORS configurations if possible.
A real fix would be PR #1778 - but with the disadvantage, that users would have to change their enabled profiles in their ors-config.yml/env (see PR).
Or another real fix could later be implemented, e.g. defining defaults only in spring annotations in the code and generate ors-config.yml based on this.
Examples and reasons for differences between live ORS routes, and those generated from this pull request
Required changes to ors config (if applicable)