From 462b43b80013534c6e852db7391bcd43645c6b34 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 1 Aug 2024 14:56:58 +0200
Subject: [PATCH 1/2] Upgrade to latest version of OTP

---
 .otp-version                         | 2 +-
 build-config.json                    | 1 +
 build-graph.sh                       | 2 +-
 infrastructure/docker/otp/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.otp-version b/.otp-version
index 5352d5d8..6b8df523 100644
--- a/.otp-version
+++ b/.otp-version
@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: NOI Techpark <digital@noi.bz.it>
 #
 # SPDX-License-Identifier: CC0-1.0
-export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-04-10T12-37"
\ No newline at end of file
+export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-01T06-53"
\ No newline at end of file
diff --git a/build-config.json b/build-config.json
index 13d2aae5..10983c8a 100644
--- a/build-config.json
+++ b/build-config.json
@@ -1,6 +1,7 @@
 {
   "embedRouterConfig": true,
   "areaVisibility": true,
+  "staticParkAndRide": false,
   "transitFeeds": [
     {
       "source": "https://gtfs.api.opendatahub.com/v1/dataset/sta-time-tables/raw",
diff --git a/build-graph.sh b/build-graph.sh
index 1b8cbe4f..9bdc6704 100755
--- a/build-graph.sh
+++ b/build-graph.sh
@@ -45,4 +45,4 @@ docker run \
   -v .:/var/opentripplanner/:z \
   --rm \
   -e JAVA_TOOL_OPTIONS="-Xmx6G" \
-  ${OTP_IMAGE} --build --save
+  "${OTP_IMAGE}" --abortOnUnknownConfig --build --save
diff --git a/infrastructure/docker/otp/Dockerfile b/infrastructure/docker/otp/Dockerfile
index 67f9420d..30f7de89 100644
--- a/infrastructure/docker/otp/Dockerfile
+++ b/infrastructure/docker/otp/Dockerfile
@@ -1,5 +1,5 @@
 # Simon, do you know how we could use the value from .otp-version here?
-FROM opentripplanner/opentripplanner:2.6.0_2024-04-10T12-37
+FROM opentripplanner/opentripplanner:2.6.0_2024-08-01T06-53
 
 WORKDIR /var/otp
 

From 6f2a827db82b0512f581646f3d75aae7f96d2f97 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 1 Aug 2024 16:53:35 +0200
Subject: [PATCH 2/2] Configure NeTEx parking data

---
 build-config.json  |  6 ++++++
 build-graph.sh     | 12 +++++++++++-
 router-config.json |  6 ------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build-config.json b/build-config.json
index 10983c8a..d0b1de36 100644
--- a/build-config.json
+++ b/build-config.json
@@ -17,6 +17,12 @@
       "source": "https://amarillo.otp.opendatahub.testingmachine.eu/gtfs/amarillo.altoadige.gtfs.zip",
       "type": "gtfs",
       "feedId": "amarillo"
+    },
+    {
+      "source": "data/parking-netex.zip",
+      "type": "netex",
+      "feedId": "parking",
+      "ignoreParking": false
     }
   ],
   "osm": [
diff --git a/build-graph.sh b/build-graph.sh
index 9bdc6704..600e2506 100755
--- a/build-graph.sh
+++ b/build-graph.sh
@@ -15,10 +15,14 @@ SOUTH_TYROL_PBF=data/south-tyrol.osm.pbf
 # elevation
 ELEVATION_URL=https://srtm.csi.cgiar.org/wp-content/uploads/files/srtm_5x5/TIFF/srtm_39_03.zip
 ELEVATION_ZIP=data/srtm_39_03.zip
+# parking
+PARKING_NETEX_URL=https://transmodel.api.opendatahub.com/netex/parking
+PARKING_NETEX_XML=data/shared-data.xml
+PARKING_NETEX_ZIP=data/parking-netex.zip
 
 # when on github actions then install the required tools
 if [ -n "${CI+isset}" ]; then
-  sudo apt-get -qq install osmium-tool pyosmium wget
+  sudo apt-get -qq install osmium-tool pyosmium wget zip
 fi
 
 mkdir -p data
@@ -39,6 +43,12 @@ if [ ! -f "${ELEVATION_ZIP}" ]; then
   unzip -o ${ELEVATION_ZIP} -d data
 fi
 
+# download parking data and put it into a zip
+rm -f ${PARKING_NETEX_XML} ${PARKING_NETEX_ZIP}
+wget ${PARKING_NETEX_URL} -O ${PARKING_NETEX_XML}
+
+zip --junk-paths ${PARKING_NETEX_ZIP} ${PARKING_NETEX_XML}
+
 
 # actually do graph build
 docker run \
diff --git a/router-config.json b/router-config.json
index ce185ab6..d299c4db 100644
--- a/router-config.json
+++ b/router-config.json
@@ -38,12 +38,6 @@
       "type": "stop-time-updater",
       "url": "https://amarillo.otp.opendatahub.testingmachine.eu/gtfs/amarillo.altoadige.gtfsrt.pbf",
       "feedId": "amarillo"
-    },
-    {
-      "type" : "vehicle-parking",
-      "feedId" : "noi",
-      "sourceType" : "noi-open-data-hub",
-      "url" : "https://parking.otp.opendatahub.com/parking/all.json"
     }
   ]
 }