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.

Sign up for GitHub

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

Bugfix #394 srtm url fix #528

Merged
merged 2 commits into from
May 31, 2019
Merged

Bugfix #394 srtm url fix #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc55ac
api-test matrix service setting still had old maximum_locations*
May 29, 2019
241127d
upgrade GH to v0.10.1.15, fixes #394
May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Makes docker and docker-compose deployment of openrouteservice more customizable (Issue #434)
- Add the possibility to predefine standard maximum search radii in general and for each used profile in the config file (Issue #418)
### Fixed
- fix SRTM URL in GH fork (#394)
- fix classpath issues for resources, Windows builds now (#489)
- isochrone geojson bbox now format compliant (#493)
- v2 isochrones now respects max_locations in app.config (#482)
Expand Down
4 changes: 2 additions & 2 deletions ...api-tests/src/test/java/heigit/ors/v2/services/serviceSettings/MatrixServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ public class MatrixServiceSettings {
String value = AppConfig.Global().getServiceParameter("matrix", "enabled");
if (value != null)
enabled = Boolean.parseBoolean(value);
value = AppConfig.Global().getServiceParameter("matrix", "maximum_locations");
value = AppConfig.Global().getServiceParameter("matrix", "maximum_routes");
if (value != null)
maximumRoutes = Math.max(1, Integer.parseInt(value));
value = AppConfig.Global().getServiceParameter("matrix", "maximum_locations_flexible");
value = AppConfig.Global().getServiceParameter("matrix", "maximum_routes_flexible");
if (value != null)
maximumRoutesFlexible = Math.max(1, Integer.parseInt(value));
value = AppConfig.Global().getServiceParameter("matrix", "maximum_search_radius");
Expand Down
4 changes: 2 additions & 2 deletions openrouteservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,13 @@
<dependency>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-core</artifactId>
<version>v0.10.1.13</version>
<version>v0.10.1.15</version>
</dependency>

<dependency>
<groupId>com.github.GIScience.graphhopper</groupId>
<artifactId>graphhopper-reader-osm</artifactId>
<version>v0.10.1.13</version>
<version>v0.10.1.15</version>
</dependency>

<!-- remove the comment to enable debugging
Expand Down