chore: update to ORS 9.1.0 (#13)

mbta · Feb 7, 2025 · 34cd881 · 34cd881
1 parent ede8829
commit 34cd881
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 34 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG OPEN_ROUTE_SERVICE_VERSION=8.2.0
+ARG OPEN_ROUTE_SERVICE_VERSION=9.1.0
 
 FROM --platform=$BUILDPLATFORM openrouteservice/openrouteservice:v${OPEN_ROUTE_SERVICE_VERSION} AS builder
 

diff --git a/ors-config.yml b/ors-config.yml
@@ -4,7 +4,9 @@
 
 ors:
   engine:
-    source_file: /home/ors/files/data.osm.pbf
+    profile_default:
+      build:
+        source_file: /home/ors/files/data.osm.pbf
     elevation:
       # Disabling elevation for now because ORS tries to download
       # elevation data from URL's that are not always available,
@@ -15,42 +17,46 @@ ors:
       preprocessed: true
 
     profiles:
-      car:
-       enabled: true
-       elevation: false
+      driving-car:
+        enabled: true
+        encoder_name: driving-car
+        build:
+          elevation: false
 
-      hgv:
-       enabled: true
-       profile: driving-hgv
-       encoder_flags_size: 8
-       encoder_options:
-         turn_costs: true
-         block_fords: false
-         use_acceleration: true
+      driving-hgv:
+        enabled: true
+        encoder_name: driving-hgv
+        build:
+          encoder_flags_size: 8
+          encoder_options:
+            turn_costs: true
+            block_fords: false
+            use_acceleration: true
+          elevation: false
+          preparation:
+            min_network_size: 200
+            methods:
+              ch:
+                enabled: true
+                threads: 1
+                weightings: recommended
+              core:
+                enabled: true
+                threads: 1
+                weightings: recommended,shortest
+                landmarks: 64
+                lmsets: highways;allow_all
+          ext_storages:
+            WayCategory:
+            HeavyVehicle:
+              restrictions: true
+            WaySurfaceType:
+      service:
        maximum_distance: 100000
-       elevation: false
-       preparation:
-         min_network_size: 200
-         methods:
-           ch:
-             enabled: true
-             threads: 1
-             weightings: recommended
-           core:
-             enabled: true
-             threads: 1
-             weightings: recommended,shortest
-             landmarks: 64
-             lmsets: highways;allow_all
        execution:
          methods:
            core:
              active_landmarks: 6
-       ext_storages:
-         WayCategory:
-         HeavyVehicle:
-           restrictions: true
-         WaySurfaceType:
 
 logging:
   level:

diff --git a/preparation.sh b/preparation.sh
@@ -21,5 +21,5 @@ echo Built graph, stopping server...
 kill $entrypoint_pid || true
 
 echo Checking that graphs were built...
-test -d graphs/car || exit 1
-test -d graphs/hgv || exit 1
+test -f graphs/driving-car/stamp.txt || exit 1
+test -f graphs/driving-hgv/stamp.txt || exit 1