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

feat: Read country tags from an enriched PBF file #1753

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from

Conversation

aoles
Copy link
Member

@aoles aoles commented Mar 20, 2024

Pull Request Checklist

  • 1. I have rebased 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
    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.

Fixes # .

Information about the changes

  • Key functionality added:
  • Reason for change:

Examples and reasons for differences between live ORS routes, and those generated from this pull request

Changes to testCountryExclusion api test

  • yellow are the test country polygons
  • blue the original shortest path
  • red the corrected one.
    image

Changes to testCountryExclusion api test

image

Required changes to ors config (if applicable)

  • In order to use enable the new workflow set
    ors.engine.profiles.<profile_name>.ext_storages.Borders.preprocessed = true.

@takb takb added this to To do in ors general Mar 20, 2024
@aoles aoles force-pushed the feat/read_countries_from_pbf branch 4 times, most recently from 1d2702e to a69c908 Compare March 26, 2024 00:15
@aoles aoles force-pushed the feat/read_countries_from_pbf branch 2 times, most recently from 5769eb0 to 07806d6 Compare April 5, 2024 10:01
@aoles aoles force-pushed the feat/read_countries_from_pbf branch from 07806d6 to 9be5ad3 Compare April 5, 2024 10:56
The reduced travel time in the API test is because now the whole way rather than just its fragment is tagged with `footpath=crossing`. The crossing is necessary to pick up kerb height. Closes #1761
@aoles aoles force-pushed the feat/read_countries_from_pbf branch from 341dcd2 to dc279a2 Compare April 9, 2024 11:45
@github-actions github-actions bot added feature and removed feature labels Apr 9, 2024
@aoles aoles force-pushed the feat/read_countries_from_pbf branch from c72f45a to f237a65 Compare April 12, 2024 12:01
@aoles aoles force-pushed the feat/read_countries_from_pbf branch from 16087ed to 5e14e96 Compare April 12, 2024 12:39
@aoles aoles force-pushed the feat/read_countries_from_pbf branch from 5e14e96 to a76f643 Compare April 12, 2024 12:46
The test routes got shorter because now when individual nodes rather than whole ways are labeled the accuracy of resolving countries increased.
The test doesn't pass with the car profile because now the profile relies on country data attached to nodes in the PBF file. The original border geometries are no longer processed by ORS so countries for virtual nodes/edges cannot be resolved anymore.
Copy link

sonarcloud bot commented Apr 15, 2024

Circumvent issues with using the generic `nodeTags` hash map resulting in error: "Maximum array size exceeded for this load factor (elements: 536870912, load factor: 0.500000)".
Copy link

sonarcloud bot commented Jun 18, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
ors general
  
To do
Development

Successfully merging this pull request may close these issues.

None yet

1 participant