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

Gh 4.0 upgrade #1217

Merged
merged 362 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
362 commits
Select commit Hold shift + click to select a range
d09f20e
Add four unit tests to RPHAST
Feb 3, 2022
0eac839
Fixes to bike encoder (WIP)
aoles Feb 11, 2022
fbb3c68
Re-enable ORSOSMReader
aoles Feb 15, 2022
425b684
Add method to generate profile name
Feb 21, 2022
1d2060e
Adapt LocationIndex query in centrality to GH4.0
koebi Feb 21, 2022
7fa4222
Add method to generate profile name
Feb 21, 2022
88fc375
RPHAST call in RoutingProfile
Feb 22, 2022
aca1e17
Merge pull request #1130 from GIScience/centrality-4.0
takb Feb 23, 2022
f721a29
Fix merge conflict from gh-4.0-upgrade-compiling
Feb 23, 2022
c838680
Refactor unit tests from CoreLMAlgoFactoryDecoratorTest into CoreLMPr…
aoles Feb 23, 2022
9e3a2bd
Initial fixes to PrepareCoreLandmarks unit tests
aoles Feb 25, 2022
93a1376
fix extended storages & extra info
takb Feb 28, 2022
758ceba
Comment on a reference value in PrepareCoreLandmarks unit tests
aoles Feb 28, 2022
ba5ce3e
Fix some bugs in RPHAST
Mar 1, 2022
6e41d15
Fix missing initialization of parameter maximum_speed
Mar 3, 2022
19ea25d
Merge pull request #1136 from GIScience/rphast_gh_update
HendrikLeuschner Mar 3, 2022
c353ef7
remove hints parameter 'weighting'
takb Mar 7, 2022
0f5b759
Integrate DijkstraMatrix into RoutingProfile matrix pipeline
Mar 7, 2022
eb03bbd
Remove weighting from hintsmap again
Mar 8, 2022
8a6fdce
fix passing profile_params to EdgeFilterFactory
takb Mar 9, 2022
ef2a38c
temporary deactivate fastisochrones at startup
takb Mar 10, 2022
81e1f22
Treat weighting and weightingmethod separately
Mar 10, 2022
fee5669
Format
Mar 10, 2022
d43335e
Merge branch 'gh-4.0-upgrade-compiling' into gh-update-dijkstramatrix
HendrikLeuschner Mar 10, 2022
7e66552
fix API tests failing due to minimal geometry mismatches
takb Mar 11, 2022
13e29a8
Merge pull request #1142 from GIScience/gh-update-dijkstramatrix
takb Mar 14, 2022
f01729e
merge error fix
takb Mar 14, 2022
c038b56
Enable calling of CH based routing algorithms if enabled
Mar 14, 2022
24fcfdb
Set CH and LM profiles based on config file entries
aoles Mar 15, 2022
cbecd7d
Fix hashing function problem in PathMetricsExtractor for DijkstraMatrix
Mar 17, 2022
263b9fa
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
Mar 17, 2022
1a19518
Update centrality to employ new Profiles
Mar 22, 2022
1e95fce
Separate Core profiles from CH ones
aoles Mar 22, 2022
11c20a6
Refactor methods checking for available preparations
aoles Mar 24, 2022
ef7e998
fix / add notes to API tests
takb Mar 28, 2022
2231a2c
fix ExtendedStorage loading issue
takb Mar 28, 2022
c3e8fb5
Fix resolving of virtual edges by core routing algorithms
aoles Mar 28, 2022
6e1a6e4
Add Comparison test for CH and RPHAST, but leave commented out
Mar 29, 2022
24d777e
Merge pull request #1147 from GIScience/prop_tests_CH_RPHAST
takb Mar 30, 2022
a5679ba
Add CoreDijkstra test for routing around restricted edges
aoles Apr 1, 2022
27ec97c
Move Profile setup to more appropriate place
Mar 31, 2022
dc5264e
Fix Profile creation to use turn costs from config
Apr 4, 2022
b06320c
Enable routing with CoreDijkstra
aoles Apr 4, 2022
23efd10
Fix XML serialization of GPX endpoint
Apr 5, 2022
5bebfdc
Replace exact floating point tests with delta-tests
Apr 5, 2022
f201951
Serve requests for car recommended with fastest
aoles Apr 5, 2022
d444bdb
Fix regular expression
Apr 5, 2022
8e5f6f2
Enable turn costs
Apr 5, 2022
cba6d32
Fix JsonIgnore for IsochronesRequest
Apr 5, 2022
7245215
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
Apr 5, 2022
99d7d0a
Replace exact float tests by delta-testing
Apr 6, 2022
e303a04
Enable further weightings
Apr 6, 2022
3e002cf
Minor cleanup
Apr 6, 2022
2d82950
Fix erroneous reference value
Apr 6, 2022
3841ded
Fix creation of LM profiles
aoles Apr 6, 2022
830f974
Fix core routing profiles and adjust turn restrictions API tests
aoles Apr 11, 2022
cfed008
Rename variable
Apr 12, 2022
6ad178f
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
Apr 12, 2022
d0a8ec4
Fix core routing with adjusted weightings
aoles Apr 20, 2022
967f135
Add unit test for u-turns
aoles Apr 22, 2022
4c362b1
Add graph export endpoint
koebi Apr 29, 2022
cfa02c9
Rename export response objects
koebi Apr 29, 2022
71fc8f9
refactor export request handler
koebi Apr 29, 2022
caba902
adapt export-endpoint to gh4.0
koebi Apr 29, 2022
ebc11d6
Fix u-turns with core routing algorithms
aoles May 2, 2022
9aa69e1
Fix profile name when API parameter optimized is set to false
aoles May 2, 2022
404c3e6
Merge pull request #1160 from GIScience/export4.0
takb May 3, 2022
817e6cf
API test configs in constant
takb May 3, 2022
0bfa34f
re-add centrality unit tests
koebi May 3, 2022
a44c35d
adapt CentralityTests to gh4.0
koebi May 4, 2022
0a307ae
Enable core LM preparation
aoles May 4, 2022
5ee52e9
Clean up imports; Delete comments; Remove surplus typecast
koebi May 5, 2022
1d857a4
Merge pull request #1161 from GIScience/centrality-unittests
takb May 5, 2022
eee9417
Fix compilation error
koebi May 5, 2022
a80e11d
Merge pull request #1162 from GIScience/centrality-unittests
takb May 6, 2022
102b8be
Modifications to accommodate A* routing in core
aoles May 6, 2022
922349a
WIP add fast isochrones profiles to pipeline
May 11, 2022
b90ccc1
Add jqwik to gitignore
May 11, 2022
bbaafcc
Fix merge conflicts
May 11, 2022
c05e042
Tweaks to the original fix to CoreDijkstra regarding u-turns
aoles May 11, 2022
ad1f816
Enable A* routing in core
aoles May 11, 2022
d32a33d
Properly initialize fast isochrone weighting in preprocessing and req…
May 12, 2022
baa6e7f
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
May 12, 2022
7baf2ba
Fix the creation of preparations for different core LM sets
aoles May 13, 2022
c71da3a
Remove weightingsString from FIA Factory, fix respective bug
May 16, 2022
a71b1af
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
May 16, 2022
56636de
Remove assert for weighting string as weighting strings are not used …
May 16, 2022
c8941cc
Use outedgeexplorer in fia and querygraph to separate disconnected cells
May 17, 2022
3e86b46
Make FIA ResultTests more flexible
May 18, 2022
196e0fb
Fix ParamsTests for FIA
May 18, 2022
3461148
Fix error occuring when attempting to load previously computed core LMs
aoles May 18, 2022
33d2bd9
Make everything compile
May 18, 2022
22e73d7
Enable routing with LMs in core
aoles May 19, 2022
5dbbf9b
Fix assignment of avoid_features in route search properties
aoles May 19, 2022
64b11f7
Fix debug info about visited nodes and skipped segments
aoles May 20, 2022
043c81d
Correct value of minimum subnetwork size for computing landmarks in core
aoles May 27, 2022
a9bfdfa
Correct value of core level in edge filter used for computing landmarks
aoles May 27, 2022
2fa96e8
Correct value of maximum node ID in LM approximator
aoles May 27, 2022
0d78f39
v1 corematrix initialization + use correct edgeexplorer
May 30, 2022
8511f5a
Merge branch 'gh-4.0-upgrade-compiling' of https://github.com/GIScien…
May 30, 2022
5f4ac32
Fix core LM config matching
aoles Jun 15, 2022
9673fa9
Fix core Dijkstra unit tests
aoles Jun 23, 2022
aedb257
Fix CoreLMPreparationHandler unit tests
aoles Jun 23, 2022
c0dd319
Fix PrepareCoreLandmarks unit tests
aoles Jun 23, 2022
dd79245
Fix FastIsochronesFactory initialization by defining profiles
Jun 27, 2022
545482e
add wheelchair extra info to export endpoint
takb May 12, 2022
e465415
Merge branch 'gh-4.0-upgrade-compiling' into gh-4.0-upgrade
takb Jul 22, 2022
61d02d1
TODOs
takb Jul 27, 2022
4dcd846
resolve some todos
takb Aug 9, 2022
f9a6224
fix toString() of MultiTreeSPEntry and AverageMSPTE
Aug 15, 2022
edc47f0
Add test for u turn problem with multiple nodes
Aug 16, 2022
f2e8f92
Remove TurnWeightingHelper as it is not necessary anymore
Aug 16, 2022
fa50e6d
fix memory usage calculation
takb Aug 16, 2022
6de69b4
more TODO cleanup
takb Aug 16, 2022
8f42c49
Fix several API tests checking for exact floats
Aug 22, 2022
d713c10
Fix API tests checking for exact floats
Aug 23, 2022
1e68cfd
Fix point out of bounds matrix API test
Aug 24, 2022
79fde88
export endpoint for debugging
takb Aug 30, 2022
1350dc0
use edgeFilter while snapping
takb Sep 6, 2022
86f070b
fix edgeFilter in CoreALT
takb Sep 6, 2022
1dce2ce
fix testTrailDifficultyExtraDetails
takb Sep 6, 2022
f7a2ab8
deprecated setSimplifyResolve() is now method of routerConfig
koebi Sep 6, 2022
6ab954c
fix testRouteMergeInstructionsWithoutGeometry
takb Sep 7, 2022
05094be
Use non turn weighting in CoreLM prep
Sep 7, 2022
f24df64
fix testGpxExport
takb Sep 7, 2022
a637a95
Ignore TD test for now, fix testGreenExtraInfo
koebi Sep 9, 2022
6b100fb
Fix snapping distance tests
Sep 12, 2022
4acc4ad
fix testNoiseExtraInfo
koebi Sep 12, 2022
c9cc5fb
fix testTollwaysExtraDetails
koebi Sep 12, 2022
0e6a318
Merge branch 'gh-4.0-upgrade' of https://github.com/GIScience/openrou…
Sep 13, 2022
48ae266
fix expectNoInterpolationOfBridgesAndTunnels and TD tests
takb Sep 14, 2022
8540299
fix testIdenticalCoordinatesIndexing
takb Sep 14, 2022
fbd3b19
fix linear part of testWaypointCount
takb Sep 14, 2022
78a2c6b
fix testRouteMergeIndexing
takb Sep 14, 2022
1d6550b
Fix snapping problem for matrices
Sep 14, 2022
c071c81
Adapt test for snapping filter changes
Sep 14, 2022
0bfcfb1
Adapt matrix api tests for changes in calculatiomns and snapping and …
Sep 14, 2022
6548684
Adapt some isochrones tests for size differences
Sep 15, 2022
dbe40e9
Update reference values in tests
aoles Sep 16, 2022
9413245
Set car profile to be used for normal isochrones tests and adapt values
Sep 19, 2022
8a86feb
Change fast isochrones profile name from profile-hgv to hgv
Sep 19, 2022
0b56b73
Modifications to make API test pass
aoles Sep 23, 2022
489c5ee
Fix u turn problem in core matrix algorithm
Sep 26, 2022
cb61af0
fix routing profile name string issue
takb Sep 27, 2022
006eb0a
Remove v1 API code
takb Jun 20, 2022
d7bcc9b
merge from master
takb Sep 27, 2022
30934a5
Switch to old priority values
aoles Sep 28, 2022
bcb62fa
fix a few weighting factory problems
takb Sep 28, 2022
700b9d5
Make reverse dir isochrone smaller due to one way
Sep 28, 2022
7b753a7
fix testSkipSegments for newer JVMs
takb Sep 28, 2022
16a1428
Fix testWheelchairSurfaceQualityKnown
aoles Sep 28, 2022
50f010b
Adjust values in expectElevationSmoothing
aoles Sep 28, 2022
f2f69fd
Merge branch 'gh-4.0-upgrade' of https://github.com/GIScience/openrou…
Sep 29, 2022
06e4809
Adapt matrix test values for elevation
Sep 29, 2022
b11d579
Remove commented out code
Sep 29, 2022
bf45628
Adapt fast iso api test values
Sep 29, 2022
cf5717b
Support access restrictions containing enumerations
aoles Oct 5, 2022
2f9fe4c
Fix core preparation for priority weightings
aoles Oct 10, 2022
35c6c76
Adjust reference test value
aoles Oct 10, 2022
28ebfbb
Yet another fix to priority weightings
aoles Oct 13, 2022
7019aa9
optional parameter force_turn_costs
takb Oct 5, 2022
986dc3f
move to profile params
takb Oct 7, 2022
522259a
version bump
takb Oct 10, 2022
920e918
Merge branch 'master' into gh-4.0-upgrade
takb Oct 17, 2022
719a67e
Re-enable calculation of priority from relations
aoles Oct 20, 2022
1c1460a
Adjust encoded polyline test reference value
aoles Oct 20, 2022
fd599f2
adjust test reference values for bike/coordsLong
takb Oct 21, 2022
ca2e151
Merge branch 'master' into gh-4.0-upgrade
takb Oct 21, 2022
60302e2
Handle route network priorities in foot flag encoder
aoles Oct 21, 2022
b4f8d42
Rename fileneme in order to fix the git capitalization issue
aoles Oct 24, 2022
26c46e3
Ingore round trip API tests
aoles Oct 25, 2022
8204bdd
Fix broken class name after file rename
Oct 25, 2022
2b8218f
Cleanup API test output
Oct 26, 2022
f6c044e
Cleanup overrides
Oct 26, 2022
177fd17
Remove commented out code related to turn cost
Oct 26, 2022
da32fec
Fix default weighting method assignment
aoles Oct 28, 2022
4c82e19
Address aoles TODOs in ORSGraphHopper
aoles Oct 28, 2022
bfc0b25
use released GH dependencies
takb Oct 31, 2022
7e109c2
Move `getCoreNodes` method to ORSGraphHopperStorage
aoles Oct 31, 2022
58eb7eb
WheelchairFlagEncoder fix & elevation reading from PBF fix
takb Oct 31, 2022
815850c
Clean up commented out code
aoles Oct 31, 2022
052f519
Address TODOs in flag encoders
aoles Oct 31, 2022
935b9e6
RC5: fix elevation parsing
takb Oct 31, 2022
706e994
RC6: fix handling of bad formatting in elevation parsing
takb Nov 2, 2022
02e2111
TODOs ORSWeightingFactory
takb Nov 2, 2022
34c70b3
Address some of the remaining TODOs
aoles Nov 2, 2022
6c6d519
fix distance calculation in PathMetricsExtractor
takb Nov 4, 2022
80fca56
address sonar issues
takb Nov 4, 2022
6790fb1
Address some previously overseen issues
aoles Nov 4, 2022
397a477
Enable multithreaded core LM preparation
aoles Nov 4, 2022
ecf6040
some last comments cleanup
takb Nov 7, 2022
fe3c7ec
Enable slf4j logging
aoles Nov 14, 2022
c019383
Tweaks to core landmarks preparation
aoles Nov 14, 2022
33ecd3a
fix slf4j dependency declaration
takb Nov 14, 2022
3276754
use newer versions of kafka & slf4j
takb Nov 14, 2022
48330f3
Log progress during core landmark preparation
aoles Nov 14, 2022
967c772
Make graph storages used for core preparation thread-safe
aoles Nov 16, 2022
714f644
reintroduce checking subnetworks with CoreAndRequireBothDirections fi…
takb Nov 18, 2022
07ec3ba
Fix graph initialization in `CoreLandmarkStorageTest`
aoles Nov 24, 2022
2b2ec62
Fix failing unit tests for pedestrian flag encoders
aoles Nov 24, 2022
8c27135
Adapt unit tests to changes introduced in da32fec
aoles Nov 24, 2022
fe969b6
fix log config for docker/tomcat
takb Nov 24, 2022
9669ff6
Merge branch 'master' into gh-4.0-upgrade
takb Nov 28, 2022
c61e520
Merge branch 'master' into gh-4.0-upgrade
takb Nov 28, 2022
e33706b
fix merge error & debug loggin in CoreLandmarkStorage
takb Nov 28, 2022
1cadfef
Revert "reintroduce checking subnetworks with CoreAndRequireBothDirec…
aoles Nov 30, 2022
fb35d10
Add edge filter preventing core landmark explorer from leaving the su…
aoles Nov 30, 2022
29575b3
Revert to accessing values in hgv storage as bytes rather than shorts
aoles Nov 30, 2022
404f3a8
Fix checking for u-turns in core matrix algorithm
aoles Dec 2, 2022
34429fd
Rearrange edge filters in `CoreLandmarkExplorer`
aoles Dec 6, 2022
970d6c9
Fine-grained threading config for core preparations
aoles Dec 9, 2022
15899bc
Use whatever core profile is available for a given vehicle weighting …
aoles Dec 20, 2022
de58134
Do not store the mapping of prepare edges to shortcuts for core nodes
aoles Dec 28, 2022
b7a485c
Merge branch 'master' into gh-4.0-upgrade
takb Jan 16, 2023
15c9687
Merge changes to concave balls isochrones algorithm
Jan 17, 2023
8d7e2a0
Fix flipped comparator in concave hull algorithm
Jan 18, 2023
d18c13c
Fix: re-enable ORS soft weightings
Feb 8, 2023
87b8a7d
build: use ors-GH v4.0-RC7
takb Feb 8, 2023
9857291
Re-enable unit tests in maven
Feb 15, 2023
4fcc611
Test: fix erroneous error range
Feb 15, 2023
6931f4b
Tests: add error ranges to imprecise geometry tests
Feb 15, 2023
1262138
Merge branch 'master' into gh-4.0-upgrade
MichaelsJP Feb 16, 2023
0a80474
fix: Fix merge error
MichaelsJP Feb 16, 2023
d0ec692
fix: Bump curl version
MichaelsJP Feb 16, 2023
6065fc3
GH fork RC8
takb Feb 21, 2023
545b471
fix: use `HgvAccessWeighting` for CH preparation
aoles Feb 12, 2023
4a6ac02
Merge branch 'master' into gh-4.0-upgrade
MichaelsJP Feb 21, 2023
bca30e7
fix: restore processing of hgv destination flag
aoles Feb 13, 2023
a09ce84
fix: re-introduce the ability to block all barriers by default
aoles Feb 21, 2023
a075efa
fix handling return value of AbstractFlagEncoder.getMaxSpeed() being NaN
takb Feb 22, 2023
2cc17e3
fix APi test
takb Feb 22, 2023
69f2371
fix: Fix the failing dockerfile
MichaelsJP Feb 22, 2023
7856721
fix: for core edges do not rely on weights stored in CH graph
aoles Feb 22, 2023
b604cd8
use GH fork RC9
takb Feb 22, 2023
96cba9f
Merge branch 'master' into gh-4.0-upgrade
MichaelsJP Feb 23, 2023
7f6c6bc
use GH fork RC10
takb Feb 23, 2023
7fcdf37
build: Fix the graphhopper jts bug for tomcat7
MichaelsJP Feb 23, 2023
d1b8068
chore: Dissolve dependency discrepancy for the locationtech package
rtroilo Feb 24, 2023
d8fedde
Merge pull request #1294 from GIScience/gh-4.0-upgrade-locationtech-fix
MichaelsJP Feb 24, 2023
999c838
Fix: replace old parseSpeed by new OSMValueExtractor
Feb 27, 2023
38a7392
fix: add EdgeFilter to DefaultSnapFilter in CoreSolver
koebi Feb 27, 2023
a7b107d
Merge branch 'master' into gh-4.0-upgrade
takb Feb 28, 2023
b82b3e4
Re-introduce the actual distance calculation for ferry ways
rabidllama Mar 1, 2023
324a112
Merge pull request #1299 from GIScience/upgrade-reintroduce-distance-…
takb Mar 1, 2023
cb6e887
bike/foot/wheelchair relationsTags fix
takb Mar 1, 2023
bbe7ae5
handle route:mtb correctly
takb Mar 1, 2023
b2ca361
fix MountainBikeFlagEncoder
takb Mar 2, 2023
86b3ec8
Merge branch 'master' into gh-4.0-upgrade
MichaelsJP Mar 3, 2023
63b4b92
use release version v4.0 of GH fork
takb Mar 3, 2023
c379358
Merge branch 'master' into gh-4.0-upgrade
takb Mar 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ RELEASING:
- link to YouTube docker setup guide to docs (thanks to SyntaxByte)
- prototype of generic CSV-based routing to be used for heat stress
- Shadow Routing
### Removed
- old v1 API code and related classes
### Fixed
- allow bridleways with bicycle=yes for bike profiles ([#1167](https://github.com/GIScience/openrouteservice/issues/1167))
- improved log file settings error message ([#1110](https://github.com/GIScience/openrouteservice/issues/1110))
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM maven:3.8-jdk-11-slim as base

ARG DEBIAN_FRONTEND=noninteractive


# hadolint ignore=DL3002
USER root

Expand Down
13 changes: 2 additions & 11 deletions openrouteservice-api-tests/conf/ors-config-test.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"weightings": "recommended",
"maxcellnodes": 5000
},
"profile-hgv": {
"hgv": {
"enabled": true,
"threads": 12,
"weightings": "recommended, shortest",
Expand Down Expand Up @@ -132,7 +132,6 @@
"execution": {
"methods": {
"lm": {
"disabling_allowed": true,
"active_landmarks": 8
}
}
Expand Down Expand Up @@ -169,11 +168,7 @@
},
"execution": {
"methods": {
"ch": {
"disabling_allowed": true
},
"lm": {
"disabling_allowed": true,
"active_landmarks": 8
},
"core": {
Expand Down Expand Up @@ -233,11 +228,7 @@
},
"execution": {
"methods": {
"ch": {
"disabling_allowed": true
},
"lm": {
"disabling_allowed": true,
"active_landmarks": 8
},
"core": {
Expand Down Expand Up @@ -349,7 +340,7 @@
"filepath": "openrouteservice-api-tests/data/noise_data_hd.csv"
},
"csv": {
"filepath": "openrouteservice-api-tests/data/csv_data_hd.csv"
"filepath": "openrouteservice-api-tests/data/csv_data_hd.csv"
},
"ShadowIndex": {
"filepath": "openrouteservice-api-tests/data/shadow_index_hd.csv"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading