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

add params & checks for alternative routes target count / max distance #655

Merged
merged 5 commits into from
Jan 23, 2020

Conversation

takb
Copy link
Contributor

@takb takb commented Jan 17, 2020

Pull Request Checklist

  • 1. I have rebased the latest version of the development 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 app.config file, I have added these to the app.config wiki page on github 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.

Fixes #651 .

Information about the changes

  • Key functionality added:
    app.config parameters in routing.profiles.default_params:
    maximum_distance_alternative_routes and maximum_alternative_routes
    and the respective checks

Required changes to app.config (if applicable)

  • both parameters are optional and enforced only if present

@takb takb requested review from rabidllama and nilsnolde and removed request for nilsnolde January 17, 2020 08:44
@takb takb requested a review from sfendrich January 21, 2020 07:55
params.setAlternativeRoutesCount(alternativeRoutes.getTargetCount());
String paramMaxAlternativeRoutesCount = AppConfig.getGlobal().getServiceParameter("routing", "profiles.default_params.maximum_alternative_routes");
Copy link
Contributor

@rabidllama rabidllama Jan 21, 2020

Choose a reason for hiding this comment

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

What happens if the default is set in the app.config, but then in the individual profile settings it is set to a larger value?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

only the distance can be set per profile currently, since the check would have to be at a much later point to have profile params available, and it didn't make much sense to me to have the max routes limit set per profile anyway. want me to fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

never mind, it wasn't complicated to fix, it works now.

@takb takb requested a review from rabidllama January 22, 2020 09:56
@takb takb merged commit 5764803 into development Jan 23, 2020
@takb takb deleted the fix-#651-alternative-routes-limit-params branch February 7, 2020 13:52
@takb takb restored the fix-#651-alternative-routes-limit-params branch February 7, 2020 13:52
@takb takb deleted the fix-#651-alternative-routes-limit-params branch February 7, 2020 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants