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

refactor: cleanup routing profile management #1951

Merged
merged 5 commits into from
Jan 21, 2025

Conversation

sfendrich
Copy link
Contributor

Pull Request Checklist

  • 1. I have [rebased][rebase] the latest version of the main 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].

Information about the changes

  • Key functionality added: refactor routing profile management
  • Reason for change: clean up code base

Sascha Fendrich added 3 commits January 21, 2025 11:29
RoutingProfileManager contained several methods that are unrelated
to it. These are moved to RoutingRequest, which is more appropriate,
but maybe not the final destination.
This commit moves methods unrelated to RoutingProfile to more
appropriate classes.
This commit removes unused parameters and makes local methods private.
Copy link
Contributor

@takb takb left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Collaborator

@koebi koebi left a comment

Choose a reason for hiding this comment

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

LGTM :)

@koebi
Copy link
Collaborator

koebi commented Jan 21, 2025

The tests report:

2025-01-21 12:09:19 DEBUG  ORS-Init [ o.h.o.r.RoutingProfileManager]   java.util.concurrent.ExecutionException: java.lang.NullPointerException: Cannot invoke "java.lang.Boolean.booleanValue()" because the return value of "org.heigit.ors.config.profile.EncoderOptionsProperties.getEnableCustomModels()" is null

@takb
Copy link
Contributor

takb commented Jan 21, 2025

The tests report:

2025-01-21 12:09:19 DEBUG  ORS-Init [ o.h.o.r.RoutingProfileManager]   java.util.concurrent.ExecutionException: java.lang.NullPointerException: Cannot invoke "java.lang.Boolean.booleanValue()" because the return value of "org.heigit.ors.config.profile.EncoderOptionsProperties.getEnableCustomModels()" is null

My latest commit should avoid NPE with that, but all tests run though on my machine, you might want to delete old graphs and try again.

@sfendrich sfendrich merged commit 8639c7b into main Jan 21, 2025
27 checks passed
@sfendrich sfendrich deleted the refactor/cleanup-routing-profile-management branch January 21, 2025 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants