Merge pull request #177 from leonardehrenfried/otp2

Activate SkyAlps, fix graph build

.github/workflows/main.yml

@@ -30,7 +30,6 @@ jobs:
 
       - name: Build graph
         run: |
-          sudo apt install osmium-tool wget
           ./build-graph.sh
 
       - name: Build docker file

build-config.json

@@ -6,14 +6,12 @@
       "source": "https://gtfs.api.opendatahub.com/v1/dataset/sta-time-tables/raw",
       "type": "gtfs",
       "feedId": "sta"
-    }
-    /*
-     this feed is not GTFS-compliant yet: https://github.com/noi-techpark/odh-mentor-otp/issues/168#issuecomment-1904328702
-    ,{
+    },
+    {
       "source": "https://gtfs.api.opendatahub.com/v1/dataset/skyalps-flight-data/raw",
       "type": "gtfs",
       "feedId": "skyalps"
-    }*/
+    }
   ],
   "osm": [
     {

build-graph.sh

@@ -1,19 +1,32 @@
-#!/bin/sh
+#!/bin/bash -e
 
 # SPDX-FileCopyrightText: NOI Techpark <[email protected]>
 #
 # SPDX-License-Identifier: CC0-1.0
 
-mkdir -p data
-
-NORTH_EASTH_PBF=data/italy-nord-est.osm.pbf
+# OSM
+NORTH_EAST_URL=https://download.geofabrik.de/europe/italy/nord-est-latest.osm.pbf
+NORTH_EAST_PBF=data/italy-nord-est.osm.pbf
 SOUTH_TYROL_PBF=data/south-tyrol.osm.pbf
 
+# OTP
 OTP_IMAGE=docker.io/opentripplanner/opentripplanner:2.5.0_2024-01-19T14-50
 
-wget -q --show-progress --no-clobber https://download.geofabrik.de/europe/italy/nord-est-latest.osm.pbf -O ${NORTH_EASTH_PBF}
-osmium extract ${NORTH_EASTH_PBF} --polygon south-tyrol.geojson -o ${SOUTH_TYROL_PBF} --overwrite
+# when on github actions then install the required tools
+if [ -n "${CI+isset}" ]; then
+  sudo apt-get -qq install osmium-tool wget
+fi
+
+mkdir -p data
+
+if [ ! -f "${NORTH_EAST_PBF}" ]; then
+  wget --progress=bar:force:noscroll ${NORTH_EAST_URL} -O ${NORTH_EAST_PBF}
+fi
+
+# cut out South Tyrol from the large North East Italy extract
+osmium extract ${NORTH_EAST_PBF} --polygon south-tyrol.geojson -o ${SOUTH_TYROL_PBF} --overwrite
 
+# actually do graph build
 docker run \
   -v .:/var/opentripplanner/:z \
   --rm \