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

[RSPS-1174] : Upgrade gh7 #35

Merged
merged 476 commits into from
Jun 21, 2023
Merged

[RSPS-1174] : Upgrade gh7 #35

merged 476 commits into from
Jun 21, 2023

Conversation

jp-lopez
Copy link

@jp-lopez jp-lopez commented Jun 20, 2023

Jira Ticket

RSPS-1174

Implementation details

Merge GH 7. and some GH 8 changes until commit 3527752766daef864610d413532309c0519f5ceb

Now is mandatory to define on the profiles the ignored highways section:

GraphHopperConfig config = new GraphHopperConfig();
        config.setProfiles(profiles);
        config.setCHProfiles(chProfiles);
        config.putObject("import.osm.ignored_highways","footway,cycleway,path,pedestrian,steps");

Adjust matrix profiles to follow the new GH format.

karussell and others added 30 commits November 1, 2022 11:08
One example is vehicle = agricultural;forestry

Now we block also such combinations for bikes.
* removed legacy parameters

* fixed error message
karussell and others added 18 commits May 31, 2023 15:36
* previously we got an error when we tried to call getEdgeIteratorState with edge IDs running up to QueryGraph#getEdges()
* initial version to include subdivision in Country enum

* minor fix

* use correct PR

* GHUtility cleanup

* allow country comparison via getAlpha3 method

* minor fixes

* clarify iso codes with the help of wikipedia

* use alpha2 for custom model to make it more consistent

* minor fixes

* try separate state instead of country extension

* minor enhancement

* use complete use for getStateCode

* fix

* use getter instead of create

* remove TODO

* for now this method is used only once, so avoid overhead

* shorter
* Fix interchanged parameter names in bit util

* removed BitUtilBig

* cleanup

---------

Co-authored-by: Peter <[email protected]>
* initial version

* less output

* maxspeed tag vs max_speed name

* less logging

* use urbanDensity in replaceFunction and explicitly set maxspeed only if UNSET_SPEED

* added tests

* replace CountryRule.getMaxSpeed with LegalDefaultSpeeds lib

* tricky. thinking...

* lane support

* surface support

* residential roads have the same limits in Germany

* do not forget the reverse speed

* use same version as osm-legal-default-speeds-jvm

* something is strange with dropwizard tests as they require an explicit dependency on kotlin-stdlib (not kotlin-stdlib-jdk8)

* force okhttp and osm-legal-default-speeds-jvm to use both more recent but same kotlin 1.8.0

* use more recent okio with recommended kotlin 1.6.20; seems to work for osm-legal-default-speeds-jvm too

* make createWeightingParameters public

* separate storage and parser for default max speed and only combine this after import with the maxspeed tag from OSM

* separate close

* default speed library does not support maxspeed:forward and :backward tags

* test regarding living_street is now useless at that level

* comment

* fix problematic forward/backward case

* store osm max_speed and temporarily the default urban+rural from library to improve max_speed afterwards

* reduce overhead a bit and force type

* grow array on get too

* storage: we need a tiny offset

* okhttp 4.11.0 has cleaner deps

* reduce tag count and cache speeds to reduce overhead, see westnordost/osm-legal-default-speeds#7

* configure preliminary GHDirectory

* added maxweight

* avoid default-maxspeed library while OSM parsing

* Revert "avoid default-maxspeed library while OSM parsing"

This reverts commit 8b07594.

* fix setup to use the same GHDirectory instance to avoid problems with missing directory etc

* consider walk as 6kmh

* don't interpret country-dependent speeds in stringToKmh

* call computeIfAbsent for cache; convert maxspeed into kmh before import; fix test for stringToKmh

* fix comment

* added description to config

* add max_speed_estimated boolean encoded value

* use speedlib v1.3

* use statecode to feed speedlib

* updated legal_default_speeds.json

* residential should not be ignored but treated as tertiary, graphhopper#2832

* comment
@jp-lopez jp-lopez changed the title Feature/rsps 1174 upgrade gh7 [RSPS-1174] : Upgrade gh7 Jun 20, 2023
@jp-lopez jp-lopez marked this pull request as ready for review June 21, 2023 12:11
Copy link

@HDBandit HDBandit left a comment

Choose a reason for hiding this comment

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

God bless the tests 🚀

Copy link

@tyoras tyoras left a comment

Choose a reason for hiding this comment

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

I found one conflict that is not solved, luckily it was in the first files of the PR 😄

.github/workflows/publish-github-packages.yml Outdated Show resolved Hide resolved
Copy link

@tyoras tyoras left a comment

Choose a reason for hiding this comment

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

🚀

@sonarcloud
Copy link

sonarcloud bot commented Jun 21, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug E 21 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot E 1 Security Hotspot
Code Smell A 622 Code Smells

No Coverage information No Coverage information
2.9% 2.9% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@jp-lopez jp-lopez merged commit b3825b7 into develop Jun 21, 2023
@jp-lopez jp-lopez deleted the feature/RSPS-1174_upgrade_gh7 branch June 21, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.