Merge pull request #642 from GIScience/release_6.0

Release 6.0
GIScience · Jan 8, 2020 · d1e158a · d1e158a
2 parents e3a0921 + 2ad07fb
commit d1e158a
Show file tree

Hide file tree

Showing 674 changed files with 17,601 additions and 30,041 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
 # Openrouteservice
 
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[master](https://github.com/GIScience/openrouteservice)&nbsp;&nbsp;&nbsp;&nbsp; [development](https://github.com/GIScience/openrouteservice/tree/development)
-
-[![Build Status](https://travis-ci.org/GIScience/openrouteservice.svg?branch=master)](https://travis-ci.org/GIScience/openrouteservice) [![Build Status](https://travis-ci.org/GIScience/openrouteservice.svg?branch=development)](https://travis-ci.org/GIScience/openrouteservice)
+| | [master](https://github.com/GIScience/openrouteservice) | [development](https://github.com/GIScience/openrouteservice/tree/development) |
+| --- | --- | --- |
+| build status | [![Build Status](https://travis-ci.org/GIScience/openrouteservice.svg?branch=master)](https://travis-ci.org/GIScience/openrouteservice) | [![Build Status](https://travis-ci.org/GIScience/openrouteservice.svg?branch=development)](https://travis-ci.org/GIScience/openrouteservice) |
+| quality gate | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=heigit.ors%3Aopenrouteservice&metric=alert_status&branch=master)](https://sonarcloud.io/dashboard?id=heigit.ors%3Aopenrouteservice) | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=heigit.ors%3Aopenrouteservice&metric=alert_status&branch=development)](https://sonarcloud.io/dashboard?id=heigit.ors%3Aopenrouteservice) |
 
 The **openrouteservice API** provides global spatial services by consuming user-generated and collaboratively collected free geographic data directly from [OpenStreetMap](http://www.openstreetmap.org). It is highly customizable, performant and written in Java.
 
@@ -13,7 +14,7 @@ The following services are available via a HTTP interface served by Tomcat.
 
 To play around with openrouteservice you may use our [demonstration server](https://maps.openrouteservice.org) which comes with both the backend and a [frontend](https://github.com/GIScience/openrouteservice-app). Or simply sign up for an [API key](https://openrouteservice.org) and fire your requests against the API directly.
 
-Please note that openrouteservice uses a forked and edited version of [graphhopper 0.10](https://github.com/GIScience/graphhopper) which can be found [here](https://github.com/GIScience/graphhopper).
+Please note that openrouteservice uses a forked and edited version of [graphhopper 0.12](https://github.com/GIScience/graphhopper) which can be found [here](https://github.com/GIScience/graphhopper).
 
 [![ors client accessibility](https://user-images.githubusercontent.com/23240110/30385487-9eac96b8-98a7-11e7-9357-afd4df8fccdf.png)](https://openrouteservice.org/reach)
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -9,12 +9,11 @@ services:
             args:
                 APP_CONFIG: ./docker/conf/app.config.sample
                 OSM_FILE: ./docker/data/heidelberg.osm.gz
+                JAVA_OPTS: -Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g
+                CATALINA_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9001 -Dcom.sun.management.jmxremote.rmi.port=9001 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost
         volumes:
             - ./graphs:/ors-core/data/graphs
             - ./elevation_cache:/ors-core/data/elevation_cache
             - ./logs/ors/:/var/log/ors/
             - ./logs/tomcat/:/usr/local/tomcat/logs
-        environment:
-            - JAVA_OPTS=-Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g
-            - CATALINA_OPTS= -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9001 -Dcom.sun.management.jmxremote.rmi.port=9001 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost
 
diff --git a/openrouteservice-api-tests/pom.xml b/openrouteservice-api-tests/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>heigit.ors</groupId>
+    <groupId>org.heigit.ors</groupId>
     <artifactId>openrouteservice-api-tests</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>

diff --git a/...s/services/common/EndPointAnnotation.java → ...s/services/common/EndPointAnnotation.java b/...s/services/common/EndPointAnnotation.java → ...s/services/common/EndPointAnnotation.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.common;
+package org.heigit.ors.services.common;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

diff --git a/...igit/ors/services/common/ServiceTest.java → ...igit/ors/services/common/ServiceTest.java b/...igit/ors/services/common/ServiceTest.java → ...igit/ors/services/common/ServiceTest.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.common;
+package org.heigit.ors.services.common;
 
 import io.restassured.RestAssured;
 

diff --git a/...ava/heigit/ors/services/common/Utils.java → ...org/heigit/ors/services/common/Utils.java b/...ava/heigit/ors/services/common/Utils.java → ...org/heigit/ors/services/common/Utils.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.common;
+package org.heigit.ors.services.common;
 
 import java.io.InputStream;
 import java.nio.file.Files;

diff --git a/...rs/services/helper/HealthServiceTest.java → ...rs/services/helper/HealthServiceTest.java b/...rs/services/helper/HealthServiceTest.java → ...rs/services/helper/HealthServiceTest.java
@@ -18,14 +18,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.helper;
+package org.heigit.ors.services.helper;
 
 import static io.restassured.RestAssured.*;
 
 import org.junit.Test;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name="health")
 public class HealthServiceTest extends ServiceTest {

diff --git a/...rs/services/helper/StatusServiceTest.java → ...rs/services/helper/StatusServiceTest.java b/...rs/services/helper/StatusServiceTest.java → ...rs/services/helper/StatusServiceTest.java
@@ -18,15 +18,15 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.helper;
+package org.heigit.ors.services.helper;
 
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.is;
 
 import org.junit.Test;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name="status")
 public class StatusServiceTest extends ServiceTest {

diff --git a/...ices/isochrones/IsochronesErrorCodes.java → ...ices/isochrones/IsochronesErrorCodes.java b/...ices/isochrones/IsochronesErrorCodes.java → ...ices/isochrones/IsochronesErrorCodes.java
@@ -20,7 +20,7 @@
  *  *  limitations under the License.
  *
  */
-package heigit.ors.services.isochrones;
+package org.heigit.ors.services.isochrones;
 
 /**
  * This Class handles the error Codes as described in the error_codes.md

diff --git a/...t/ors/services/isochrones/ParamsTest.java → ...t/ors/services/isochrones/ParamsTest.java b/...t/ors/services/isochrones/ParamsTest.java → ...t/ors/services/isochrones/ParamsTest.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.isochrones;
+package org.heigit.ors.services.isochrones;
 
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
@@ -27,8 +27,8 @@
 import org.json.JSONObject;
 import org.junit.Test;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name = "isochrones")
 public class ParamsTest extends ServiceTest {
@@ -51,7 +51,7 @@ public void testObligatoryParams() {
 				.param("range", "1800")
 				.when()
 				.get(getEndPointName())
-				.then()
+				.then().log().all()
 				.body("any { it.key == 'type' }", is(true))
 				.body("any { it.key == 'features' }", is(true))
 				.statusCode(200);
@@ -215,7 +215,7 @@ public void testRangetypeUnitsKm() {
 				.all()
 				.when()
 				.get(getEndPointName())
-				.then()
+				.then().log().all()
 				.statusCode(200);
 	}
 

diff --git a/...t/ors/services/isochrones/ResultTest.java → ...t/ors/services/isochrones/ResultTest.java b/...t/ors/services/isochrones/ResultTest.java → ...t/ors/services/isochrones/ResultTest.java
@@ -20,10 +20,10 @@
  *  *  limitations under the License.
  *
  */
-package heigit.ors.services.isochrones;
+package org.heigit.ors.services.isochrones;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -258,6 +258,9 @@ public void testTwoDifferentTravellers_POST() {
         json.put("attributes", "area|reachfactor");
         json.put("intersections", true);
 
+        // Updated in the GH 0.12 update from size = 22 as there is a difference in the order that edges are returned and
+        // so neighbourhood search results in slightly different results
+
         given()
                 .body(json.toString())
                 .when().log().ifValidationFails()
@@ -268,7 +271,7 @@ public void testTwoDifferentTravellers_POST() {
                 .body("features.size()", is(5))
                 .body("features[0].type", is("Feature"))
                 .body("features[0].geometry.type", is("Polygon"))
-                .body("features[0].geometry.coordinates[0].size", is(22))
+                .body("features[0].geometry.coordinates[0].size", is(23))
                 .body("features[0].properties.containsKey('area')", is(true))
                 .body("features[1].type", is("Feature"))
                 .body("features[1].geometry.type", is("Polygon"))
@@ -288,18 +291,20 @@ public void testTwoDifferentTravellers_POST() {
 
     @Test
     public void testSmoothingFactor() {
+        // Updated in the GH 0.12 update from size = 52 as there is a difference in the order that edges are returned and
+        // so neighbourhood search results in slightly different results
         given()
                 .param("locations", getParameter("location"))
                 .param("profile", getParameter("profile"))
                 .param("range", "2000")
                 .param("range_type", "distance")
                 .param("smoothing", "10")
-                .when()
+                .when().log().ifValidationFails()
                 .get(getEndPointName())
                 .then()
                 .body("any { it.key == 'type' }", is(true))
                 .body("any { it.key == 'features' }", is(true))
-                .body("features[0].geometry.coordinates[0].size", is(52))
+                .body("features[0].geometry.coordinates[0].size", is(51))
                 .statusCode(200);
 
         given()
@@ -308,7 +313,7 @@ public void testSmoothingFactor() {
                 .param("range", "2000")
                 .param("range_type", "distance")
                 .param("smoothing", "100")
-                .when()
+                .when().log().ifValidationFails()
                 .get(getEndPointName())
                 .then()
                 .body("any { it.key == 'type' }", is(true))

diff --git a/...mapmatching/ParametersValidationTest.java → ...mapmatching/ParametersValidationTest.java b/...mapmatching/ParametersValidationTest.java → ...mapmatching/ParametersValidationTest.java
@@ -18,16 +18,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.mapmatching;
+package org.heigit.ors.services.mapmatching;
 
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import org.junit.Test;
 import org.json.JSONObject;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name = "matching")
 public class ParametersValidationTest extends ServiceTest {

diff --git a/...es/mapmatching/ResultsValidationTest.java → ...es/mapmatching/ResultsValidationTest.java b/...es/mapmatching/ResultsValidationTest.java → ...es/mapmatching/ResultsValidationTest.java
@@ -18,16 +18,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.mapmatching;
+package org.heigit.ors.services.mapmatching;
 
 import static io.restassured.RestAssured.*;
 
 import org.junit.Test;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 import io.restassured.response.Response;
 import junit.framework.Assert;
 

diff --git a/...ors/services/matrix/MatrixErrorCodes.java → ...ors/services/matrix/MatrixErrorCodes.java b/...ors/services/matrix/MatrixErrorCodes.java → ...ors/services/matrix/MatrixErrorCodes.java
@@ -20,7 +20,7 @@
  *  *  limitations under the License.
  *
  */
-package heigit.ors.services.matrix;
+package org.heigit.ors.services.matrix;
 
 /**
  * This Class handles the error Codes as described in the error_codes.md

diff --git a/...ices/matrix/ParametersValidationTest.java → ...ices/matrix/ParametersValidationTest.java b/...ices/matrix/ParametersValidationTest.java → ...ices/matrix/ParametersValidationTest.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.matrix;
+package org.heigit.ors.services.matrix;
 
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
@@ -27,8 +27,8 @@
 import org.json.JSONObject;
 import org.junit.Test;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name="matrix")
 public class ParametersValidationTest extends ServiceTest {

diff --git a/...ervices/matrix/ResultsValidationTest.java → ...ervices/matrix/ResultsValidationTest.java b/...ervices/matrix/ResultsValidationTest.java → ...ervices/matrix/ResultsValidationTest.java
@@ -18,7 +18,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package heigit.ors.services.matrix;
+package org.heigit.ors.services.matrix;
 
 import static io.restassured.RestAssured.*;
 
@@ -27,8 +27,8 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 import io.restassured.response.Response;
 import junit.framework.Assert;
 

diff --git a/...igit/ors/services/routing/ParamsTest.java → ...igit/ors/services/routing/ParamsTest.java b/...igit/ors/services/routing/ParamsTest.java → ...igit/ors/services/routing/ParamsTest.java
@@ -11,16 +11,16 @@
  *  You should have received a copy of the GNU Lesser General Public License along with this library;
  *  if not, see <https://www.gnu.org/licenses/>.
  */
-package heigit.ors.services.routing;
+package org.heigit.ors.services.routing;
 
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.Matchers.*;
 
 import org.junit.Test;
 import org.json.JSONObject;
 
-import heigit.ors.services.common.EndPointAnnotation;
-import heigit.ors.services.common.ServiceTest;
+import org.heigit.ors.services.common.EndPointAnnotation;
+import org.heigit.ors.services.common.ServiceTest;
 
 @EndPointAnnotation(name = "routes")
 public class ParamsTest extends ServiceTest {
@@ -728,7 +728,7 @@ public void expectSimplifyGeometry() {
 				.param("geometry_simplify", "true")
 				.when()
 				.get(getEndPointName())
-				.then()
+				.then().log().all()
 				.assertThat()
 				.body("any { it.key == 'routes' }", is(true))
 				.statusCode(200);