Skip to content
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: default location for transitional JSON configuration file #1554

Conversation

takb
Copy link
Contributor

@takb takb commented Oct 4, 2023

Pull Request Checklist

  • 1. I have [rebased][rebase] the latest version of the master branch into my feature branch and all conflicts
    have been resolved.
  • 2. I have added information about the change/addition to functionality to the CHANGELOG.md file under the
    [Unreleased] heading.
  • 3. I have documented my code using JDocs tags.
  • 4. I have removed unnecessary commented out code, imports and System.out.println statements.
  • 5. I have written JUnit tests for any new methods/classes and ensured that they pass.
  • 6. I have created API tests for any new functionality exposed to the API.
  • 7. If changes/additions are made to the ors-config.json file, I have added these to the [ors config documentation][config]
    along with a short description of what it is for, and documented this in the Pull Request (below).
  • 8. I have built graphs with my code of the Heidelberg.osm.gz file and run the api-tests with all test passing
  • 9. I have referenced the Issue Number in the Pull Request (if the changes were from an issue).
  • 10. For new features or changes involving building of graphs, I have tested on a larger dataset
    (at least Germany), and the graphs build without problems (i.e. no out-of-memory errors).
  • 11. For new features or changes involving the graphbuilding process (i.e. changing encoders, updating the
    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.
  • 12. I have written in the Pull Request information about the changes made including their intended usage
    and why the change was needed.
  • 13. For changes touching the API documentation, I have tested that the API playground [renders correctly][api].

Fixes #1553 .

Information about the changes

  • Key functionality added:
    docker-compose.yml defines the volume-mounted conf folder as default location for ors-config.json that overrides settings in the .yml file.
    Also adjusted the documentation.

@takb takb linked an issue Oct 4, 2023 that may be closed by this pull request
1 task
@github-actions github-actions bot added the fix label Oct 4, 2023
@takb takb marked this pull request as ready for review October 4, 2023 12:38
@takb takb requested a review from redfrexx October 4, 2023 12:38
@github-actions github-actions bot added fix and removed fix labels Oct 4, 2023
@takb takb enabled auto-merge October 4, 2023 12:38
@github-actions github-actions bot added fix and removed fix labels Oct 4, 2023
@MichaelsJP MichaelsJP force-pushed the fix/#1553-enable-default-support-for-old-config-files-in-docker-setup branch from 7fa0024 to 28b29c5 Compare October 5, 2023 14:10
@MichaelsJP MichaelsJP force-pushed the fix/#1553-enable-default-support-for-old-config-files-in-docker-setup branch from 28b29c5 to 7c77ae5 Compare October 6, 2023 13:38
Copy link
Member

@MichaelsJP MichaelsJP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@MichaelsJP MichaelsJP removed the request for review from redfrexx October 6, 2023 13:40
@takb takb merged commit 1efc8db into master Oct 6, 2023
13 checks passed
@takb takb deleted the fix/#1553-enable-default-support-for-old-config-files-in-docker-setup branch October 6, 2023 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Awaiting release
Development

Successfully merging this pull request may close these issues.

Enable default support for old config files in docker setup
2 participants