Merge branch 'feature-#377-alternative-routes' of https://github.com/…

…GIScience/openrouteservice into feature-#377-alternative-routes

CHANGELOG.md

@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added support for ISO 3166-1 Alpha-2 / Alpha-3 codes for routing directions option avoid_countries (Issue #195)
 - Added check on matrix service to make sure that the requested locations are within the bounding area of the graph (Issue #408)
 - Added support for GH alternative_route algorithm (Issue #377)
-- Added check on matrix service to make sure that the requested locations are within the bounding area of the graph (Issue #408)
 ### Fixed
 - Fixed `geometry_simplify` parameter, which had no effect before. `geometry_simplify` is incompatible with `extra_info` (#381)
 ### Changed

openrouteservice-api-tests/src/test/java/heigit/ors/services/routing/ResultTest.java

@@ -1479,33 +1479,6 @@ public void testAccessRestrictionsWarnings() {
                 .statusCode(200);
     }
 
-    @Test
-    public void testSimplifyHasLessWayPoints() {
-
-        given()
-                .param("coordinates", getParameter("coordinatesShort"))
-                .param("profile", "driving-car")
-                .param("format", "geojson")
-                .when()
-                .get(getEndPointName())
-                .then()
-                .assertThat()
-                .body("features[0].geometry.coordinates.size()", is(75))
-                .statusCode(200);
-
-        given()
-                .param("coordinates", getParameter("coordinatesShort"))
-                .param("profile", "driving-car")
-                .param("format", "geojson")
-                .param("geometry_simplify", "true")
-                .when()
-                .get(getEndPointName())
-                .then()
-                .assertThat()
-                .body("features[0].geometry.coordinates.size()", is(34))
-                .statusCode(200);
-	}
-
     @Test
     public void testAlternativeRoutes() {
         given()

openrouteservice/pom.xml

@@ -172,8 +172,6 @@
 			<url>http://download.java.net/maven/2</url>
 		</repository>
 		<repository>
-<<<<<<< HEAD
-=======
 			<id>osgeo</id>
 			<name>Open Source Geospatial Foundation Repository</name>
 			<url>http://download.osgeo.org/webdav/geotools/</url>
@@ -188,7 +186,6 @@
 			<url>http://repo.opengeo.org</url>
 		</repository>
 		<repository>
->>>>>>> [feat] enable geometry_simplify API parameter
       		<id>bintray-nitram509-jbrotli</id>
       		<name>bintray</name>
       		<url>http://dl.bintray.com/nitram509/jbrotli</url>