Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to NeTEx transit data #197

Merged
merged 3 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"embedRouterConfig": true,
"areaVisibility": true,
"staticParkAndRide": false,
"transitModelTimeZone": "Europe/Rome",
"transitFeeds": [
{
"source": "https://gtfs.api.opendatahub.com/v1/dataset/sta-time-tables/raw",
"type": "gtfs",
"feedId": "sta"
"source": "data/sta-netex.xml.zip",
"type": "netex",
"feedId": "sta",
"groupFilePattern": "(.*)\\.xml"
},
{
"source": "https://gtfs.api.opendatahub.com/v1/dataset/skyalps-flight-data/raw",
Expand All @@ -19,7 +21,7 @@
"feedId": "amarillo"
},
{
"source": "data/parking-netex.zip",
"source": "data/parking-netex.xml.zip",
"type": "netex",
"feedId": "parking",
"ignoreParking": false
Expand Down
17 changes: 12 additions & 5 deletions build-graph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

source .otp-version

WGET="wget --progress=bar:force:noscroll"
CURL="curl --location --fail --show-error -#"

# OSM
NORTH_EAST_URL=https://download.geofabrik.de/europe/italy/nord-est-latest.osm.pbf
Expand All @@ -15,10 +15,13 @@ 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
# transit data
TRANSIT_NETEX_URL="ftp://ftp01.sta.bz.it/netex/$(date +%Y)/plan/EU_Profil/NX-PI_01_it_apb_LINE_apb__$(date +%Y%m%d).xml.zip"
TRANSIT_NETEX_ZIP=data/sta-netex.xml.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
PARKING_NETEX_ZIP=data/parking-netex.xml.zip

# when on github actions then install the required tools
if [ -n "${CI+isset}" ]; then
Expand All @@ -28,7 +31,8 @@ fi
mkdir -p data

if [ ! -f "${NORTH_EAST_PBF}" ]; then
${WGET} ${NORTH_EAST_URL} -O ${NORTH_EAST_PBF}
echo "Downloading OSM data for NE Italy from ${NORTH_EAST_URL}"
${CURL} ${NORTH_EAST_URL} -o ${NORTH_EAST_PBF}
else
echo "Checking for updates for existing OSM file"
pyosmium-up-to-date ${NORTH_EAST_PBF}
Expand All @@ -39,13 +43,16 @@ echo "Extracting ${SOUTH_TYROL_PBF} from ${NORTH_EAST_PBF}"
osmium extract ${NORTH_EAST_PBF} --polygon south-tyrol.geojson -o ${SOUTH_TYROL_PBF} --overwrite

if [ ! -f "${ELEVATION_ZIP}" ]; then
${WGET} ${ELEVATION_URL} -O ${ELEVATION_ZIP}
${CURL} ${ELEVATION_URL} -o ${ELEVATION_ZIP}
unzip -o ${ELEVATION_ZIP} -d data
fi

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}
${WGET} ${PARKING_NETEX_URL} -O ${PARKING_NETEX_XML}
${CURL} ${PARKING_NETEX_URL} -o ${PARKING_NETEX_XML}

zip --junk-paths ${PARKING_NETEX_ZIP} ${PARKING_NETEX_XML}

Expand Down