-
Notifications
You must be signed in to change notification settings - Fork 400
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: values in user's profile_default are ignored #1778
Draft
jhaeu
wants to merge
23
commits into
main
Choose a base branch
from
fix/evaluate-profile-default-by-removing-applicationyml
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
fix: values in user's profile_default are ignored #1778
jhaeu
wants to merge
23
commits into
main
from
fix/evaluate-profile-default-by-removing-applicationyml
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
Moved to additional application-profiles.yml. When running the application with default spring profile, the profile definitions are not included. Run the application with spring profile "profiles" to include this file.
to not block local ors runs
these should not/cannot be changed anyway
by using the same scripts as in the workflow
…es.yml these hints will also be generated into ors-config.yml
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.
Quality Gate passedIssues Measures |
…yml and ors-config.env
sfendrich
reviewed
Apr 16, 2024
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.
Overall it makes sense to me. Maybe we could go over it in a group with @jhaeu explaining.
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.
Pull Request Checklist
have been resolved.
[Unreleased] heading.
using JDocs tags.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 ors.engine.profile_default in ors-config.yml is ignored #1762 . The reason for the bug was, 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.
Key functionality added: Profile properties were moved from application.yml to application-profiles.yml. The latter is only loaded when the application is started with spring profile "profiles", which is not the default, but can be used for local runs. Started with the default spring profile, the profiles have no default values. Only exception is "ors.engine.profiles.*.profile" (bad property name BTW), which is fix for our basic profiles and should not be overridden by the user. The workflow to generate ors-config.yml and ors-config.env was adapted to generate configs composed of both merged internal yaml files, where all properties are active and not commented out. Only car is enabled.
Examples and reasons for differences between live ORS routes, and those generated from this pull request
Required changes to ors config (if applicable)