Merge pull request #203 from leonardehrenfried/fix-deployment

Use rehosted NeTEx files

.otp-version

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: NOI Techpark <[email protected]>
 #
 # SPDX-License-Identifier: CC0-1.0
-export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-01T06-53"
+export OTP_IMAGE="opentripplanner/opentripplanner:2.6.0_2024-08-28T18-30"

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"

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}

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
 

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/facility-monitoring/parking"
     }
   ]
 }