Merge pull request #1217 from GIScience/gh-4.0-upgrade

🚀
GIScience · Mar 3, 2023 · b428001 · b428001
2 parents 4a406a2 + c379358
commit b428001
Show file tree

Hide file tree

Showing 497 changed files with 11,133 additions and 23,798 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)) 

diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,7 @@ FROM maven:3.8-jdk-11-slim as base
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+
 # hadolint ignore=DL3002
 USER root
 

diff --git a/openrouteservice-api-tests/conf/ors-config-test.json b/openrouteservice-api-tests/conf/ors-config-test.json
@@ -66,7 +66,7 @@
               "weightings": "recommended",
               "maxcellnodes": 5000
             },
-            "profile-hgv": {
+            "hgv": {
               "enabled": true,
               "threads": 12,
               "weightings": "recommended, shortest",
@@ -132,7 +132,6 @@
             "execution": {
               "methods": {
                 "lm": {
-                  "disabling_allowed": true,
                   "active_landmarks": 8
                 }
               }
@@ -169,11 +168,7 @@
               },
               "execution": {
                 "methods": {
-                  "ch": {
-                    "disabling_allowed": true
-                  },
                   "lm": {
-                    "disabling_allowed": true,
                     "active_landmarks": 8
                   },
                   "core": {
@@ -233,11 +228,7 @@
               },
               "execution": {
                 "methods": {
-                  "ch": {
-                    "disabling_allowed": true
-                  },
                   "lm": {
-                    "disabling_allowed": true,
                     "active_landmarks": 8
                   },
                   "core": {
@@ -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"

diff --git a/...uteservice-api-tests/src/test/java/org/heigit/ors/services/common/EndPointAnnotation.java b/...uteservice-api-tests/src/test/java/org/heigit/ors/services/common/EndPointAnnotation.java
diff --git a/openrouteservice-api-tests/src/test/java/org/heigit/ors/services/common/ServiceTest.java b/openrouteservice-api-tests/src/test/java/org/heigit/ors/services/common/ServiceTest.java
diff --git a/openrouteservice-api-tests/src/test/java/org/heigit/ors/services/common/Utils.java b/openrouteservice-api-tests/src/test/java/org/heigit/ors/services/common/Utils.java
diff --git a/...outeservice-api-tests/src/test/java/org/heigit/ors/services/helper/HealthServiceTest.java b/...outeservice-api-tests/src/test/java/org/heigit/ors/services/helper/HealthServiceTest.java
diff --git a/...outeservice-api-tests/src/test/java/org/heigit/ors/services/helper/StatusServiceTest.java b/...outeservice-api-tests/src/test/java/org/heigit/ors/services/helper/StatusServiceTest.java
diff --git a/...vice-api-tests/src/test/java/org/heigit/ors/services/isochrones/IsochronesErrorCodes.java b/...vice-api-tests/src/test/java/org/heigit/ors/services/isochrones/IsochronesErrorCodes.java
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