From 7d12d56e51dc6f9e78b456033d8e45c99da47d92 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 30 Aug 2024 14:31:06 +0200 Subject: [PATCH 1/4] Use rehosted NeTEx files --- build-config.json | 3 ++- build-graph.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build-config.json b/build-config.json index a516f5e5..39ffec28 100644 --- a/build-config.json +++ b/build-config.json @@ -5,7 +5,8 @@ "transitModelTimeZone": "Europe/Rome", "transitFeeds": [ { - "source": "data/sta-netex.xml.zip", + // we rehost the NeTEx file because the original FTP server has issues + "source": "https://leonard.io/otp/alto-adige-netex-epip.xml.zip", "type": "netex", "feedId": "sta", "groupFilePattern": "(.*)\\.xml" diff --git a/build-graph.sh b/build-graph.sh index 574c14dd..36d1ffdd 100755 --- a/build-graph.sh +++ b/build-graph.sh @@ -47,8 +47,8 @@ if [ ! -f "${ELEVATION_ZIP}" ]; then unzip -o ${ELEVATION_ZIP} -d data fi -echo "Downloading NeTEx transit data from ${TRANSIT_NETEX_URL}" -${CURL} "${TRANSIT_NETEX_URL}" -o ${TRANSIT_NETEX_ZIP} +#echo "Downloading NeTEx transit data from ${TRANSIT_NETEX_URL}" +#${CURL} "${TRANSIT_NETEX_URL}" -o ${TRANSIT_NETEX_ZIP} # download parking data and put it into a zip rm -f ${PARKING_NETEX_XML} ${PARKING_NETEX_ZIP} From b0e0d4351714075017d24e5058d3d5ae863b125e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 30 Aug 2024 14:33:00 +0200 Subject: [PATCH 2/4] Update OTP version --- .otp-version | 2 +- infrastructure/docker/otp/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.otp-version b/.otp-version index 6b8df523..1a2488d8 100644 --- a/.otp-version +++ b/.otp-version @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: NOI Techpark # # SPDX-License-Identifier: CC0-1.0 -export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-01T06-53" \ No newline at end of file +export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-28T18-30 \ No newline at end of file diff --git a/infrastructure/docker/otp/Dockerfile b/infrastructure/docker/otp/Dockerfile index 5de080a8..b91536ac 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-08-01T06-53 +FROM opentripplanner/opentripplanner:2.6.0_2024-08-28T18-30 WORKDIR /var/otp From 2beb4906456ee4306b3773291d69160dca76c500 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 30 Aug 2024 14:35:16 +0200 Subject: [PATCH 3/4] Configure SIRI-FM parking updater --- .otp-version | 2 +- router-config.json | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.otp-version b/.otp-version index 1a2488d8..794268c0 100644 --- a/.otp-version +++ b/.otp-version @@ -1,4 +1,4 @@ # SPDX-FileCopyrightText: NOI Techpark # # SPDX-License-Identifier: CC0-1.0 -export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-28T18-30 \ No newline at end of file +export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-28T18-30" \ No newline at end of file diff --git a/router-config.json b/router-config.json index ec67ab64..e0c188b4 100644 --- a/router-config.json +++ b/router-config.json @@ -106,6 +106,12 @@ "type": "stop-time-updater", "url": "https://amarillo.otp.opendatahub.testingmachine.eu/gtfs/amarillo.altoadige.gtfsrt.pbf", "feedId": "amarillo" + }, + { + "type": "vehicle-parking", + "feedId": "parking", + "sourceType": "siri-fm", + "url": "https://transmodel.api.opendatahub.com/siri-lite/fm/parking" } ] } From cf4cd262a4afb6575e1748890988fdbb2285adfb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 30 Aug 2024 14:47:31 +0200 Subject: [PATCH 4/4] Use new URL for SIRI-FM --- router-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router-config.json b/router-config.json index e0c188b4..0aafa0b0 100644 --- a/router-config.json +++ b/router-config.json @@ -111,7 +111,7 @@ "type": "vehicle-parking", "feedId": "parking", "sourceType": "siri-fm", - "url": "https://transmodel.api.opendatahub.com/siri-lite/fm/parking" + "url": "https://transmodel.api.opendatahub.com/siri-lite/facility-monitoring/parking" } ] }