From ebc55acde9e15df4dc005726bf9949150e6a9130 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Wed, 29 May 2019 16:51:45 +0300 Subject: [PATCH 1/2] api-test matrix service setting still had old maximum_locations* --- .../v2/services/serviceSettings/MatrixServiceSettings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openrouteservice-api-tests/src/test/java/heigit/ors/v2/services/serviceSettings/MatrixServiceSettings.java b/openrouteservice-api-tests/src/test/java/heigit/ors/v2/services/serviceSettings/MatrixServiceSettings.java index b7571bbb19..d70e6055be 100644 --- a/openrouteservice-api-tests/src/test/java/heigit/ors/v2/services/serviceSettings/MatrixServiceSettings.java +++ b/openrouteservice-api-tests/src/test/java/heigit/ors/v2/services/serviceSettings/MatrixServiceSettings.java @@ -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"); From 241127dfe654e17a0099a5154e6990148becfa84 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Wed, 29 May 2019 16:51:59 +0300 Subject: [PATCH 2/2] upgrade GH to v0.10.1.15, fixes #394 --- CHANGELOG.md | 1 + openrouteservice/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b1b1e5668..a67888437f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/openrouteservice/pom.xml b/openrouteservice/pom.xml index 402aa3111a..c82cf2c83a 100644 --- a/openrouteservice/pom.xml +++ b/openrouteservice/pom.xml @@ -275,13 +275,13 @@ com.github.GIScience.graphhopper graphhopper-core - v0.10.1.13 + v0.10.1.15 com.github.GIScience.graphhopper graphhopper-reader-osm - v0.10.1.13 + v0.10.1.15