Skip to content

Commit

Permalink
remove old feed for israel, since it is available via http(s) by now
Browse files Browse the repository at this point in the history
  • Loading branch information
juliuste committed Nov 9, 2023
1 parent a9ef100 commit cd5ece3
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 21 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,6 @@ jobs:
echo 'file unchanged, skipping.'
fi;
- name: "Fetch and upload feed: IL_GTFS"
if: ${{ success() || failure() }} # this should allow the other steps to run, but should still mark the workflow as failing
env:
DO_SPACES_BUCKET_NAME: ${{ secrets.DO_SPACES_BUCKET_NAME }}
run: |
set -e;
npm run fetch-il-gtfs;
currentobj=$(aws s3api head-object --bucket $DO_SPACES_BUCKET_NAME --key il/gtfs.zip || echo 'not-yet-existing');
newhash=$(cat il-gtfs.zip | md5sum);
if [ $(echo $currentobj | grep $newhash | wc -l) -ne 1 ]
then
aws s3 cp --acl public-read il-gtfs.zip s3://"$DO_SPACES_BUCKET_NAME"/il/gtfs.zip
else
echo 'file unchanged, skipping.'
fi;
- name: "Fetch and upload feed: LU_GTFS"
if: ${{ success() || failure() }} # this should allow the other steps to run, but should still mark the workflow as failing
env:
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"fetch-de-netex": "DATASET=DE_NETEX FILE_NAME=de-netex.zip MINIMUM_SIZE_MB=500 ./src/run.sh",
"fetch-de-nrw-gtfs": "DATASET=DE_NRW_GTFS FILE_NAME=de-nrw-gtfs.zip MINIMUM_SIZE_MB=30 ./src/run.sh",
"fetch-de-zhv": "DATASET=DE_ZHV FILE_NAME=de-zhv.zip MINIMUM_SIZE_MB=10 ./src/run.sh",
"fetch-il-gtfs": "DATASET=IL_GTFS FILE_NAME=il-gtfs.zip MINIMUM_SIZE_MB=100 ./src/run.sh",
"fetch-lu-gtfs": "DATASET=LU_GTFS FILE_NAME=lu-gtfs.zip MINIMUM_SIZE_MB=3 ./src/run.sh",
"fetch-se-gtfs": "DATASET=SE_GTFS FILE_NAME=se-gtfs.zip MINIMUM_SIZE_MB=25 ./src/run.sh",
"test": "npm run lint && npm run check-deps"
Expand Down
1 change: 0 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Dataset | License | Attribution | Stable URL
[German public transport stop registry (ZHV)](https://www.opendata-oepnv.de/ht/de/organisation/delfi/startseite?tx_vrrkit_view%5Bdataset_name%5D=deutschlandweite-haltestellendaten&tx_vrrkit_view%5Baction%5D=details&tx_vrrkit_view%5Bcontroller%5D=View) (🇩🇪) | [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.de) | [opendata-oepnv.de](https://www.opendata-oepnv.de) | [latest](https://scraped.data.public-transport.earth/de/zhv.zip)
[North Rhine-Westphalia (NRW) GTFS feed](https://www.opendata-oepnv.de/ht/de/organisation/bundeslaender/nrw/startseite?tx_vrrkit_view[dataset_name]=soll-fahrplandaten-nrw&tx_vrrkit_view[action]=details&tx_vrrkit_view[controller]=View) (🇩🇪) | [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.de) | [opendata-oepnv.de](https://www.opendata-oepnv.de) | [latest](https://scraped.data.public-transport.earth/de/nrw-gtfs.zip)
[Hamburger Verkehrsverbund (HVV) GTFS feed](https://suche.transparenz.hamburg.de/dataset?q=hvv%20gtfs&sort=score+desc%2Ctitle_sort+asc&esq_not_all_versions=true) (🇩🇪) | [DL-DE BY 2.0](https://www.govdata.de/dl-de/by-2-0) | [Hamburger Verkehrsverbund GmbH](https://www.hvv.de/) | [latest](https://scraped.data.public-transport.earth/de/hvv-gtfs.zip)
[Israel-wide GTFS feed](https://www.gov.il/he/Departments/General/gtfs_general_transit_feed_specifications) [(docs)](https://www.gov.il/BlobFolder/generalpage/gtfs_general_transit_feed_specifications/he/GTFS_Developer_Information_2021.08.03.pdf) (🇮🇱) | _Unknown_ | [National Authority for Public Transport](https://www.gov.il/he/departments/public_transportion_authority/govil-landing-page) | [latest](https://scraped.data.public-transport.earth/il/gtfs.zip)
[Luxembourg-wide GTFS feed](https://data.public.lu/en/datasets/horaires-et-arrets-des-transport-publics-gtfs/) (🇱🇺) | [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.de) | [Administration des transports publics](https://mmtp.gouvernement.lu/de/annuaire.html?idMin=7854) | [latest](https://scraped.data.public-transport.earth/lu/gtfs.zip)
[Sweden-wide GTFS feed](https://www.trafiklab.se/api/trafiklab-apis/gtfs-sverige-2/) (🇸🇪) | [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/deed.en) | [Trafiklab](https://www.trafiklab.se/) | [latest](https://scraped.data.public-transport.earth/se/gtfs.zip)

Expand Down
4 changes: 1 addition & 3 deletions src/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ DIRECTORY=$(dirname "$0")
FILE_PATH="$DIRECTORY/../$FILE_NAME"
MINIMUM_SIZE_BYTES=$((1024 * 1024 * $MINIMUM_SIZE_MB))

if [[ $DATASET == "IL_GTFS" ]]; then
curl --output $FILE_PATH 'ftp://gtfs.mot.gov.il/israel-public-transportation.zip'
elif [[ $DATASET == "SE_GTFS" ]]; then
if [[ $DATASET == "SE_GTFS" ]]; then
curl --output $FILE_PATH -L "https://api.resrobot.se/gtfs/sweden.zip?key=$TRAFIKLAB_API_KEY"
else
node $DIRECTORY/fetch.js > $FILE_PATH;
Expand Down

0 comments on commit cd5ece3

Please sign in to comment.