From 2acf19ca033d3320af674efd66e4b79bdf178c17 Mon Sep 17 00:00:00 2001 From: Fabien Richard-Allouard Date: Mon, 22 Jan 2024 14:04:35 +0100 Subject: [PATCH 1/4] Syncs systems.csv with transport.data.gouv --- systems.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systems.csv b/systems.csv index 9e6301f8..fb93de2b 100644 --- a/systems.csv +++ b/systems.csv @@ -325,7 +325,6 @@ FR,Bird Epron,Epron,bird-epron,https://bird.co,https://mds.bird.co/gbfs/v2/publi FR,Bird Herouvillesaintclair,Herouville-Saint-Clair,bird-herouvillesaintclair,https://bird.co,https://mds.bird.co/gbfs/v2/public/herouvillesaintclair/gbfs.json, FR,Bird Larochesuryon,Roche-sur-Yon,bird-larochesuryon,https://bird.co,https://mds.bird.co/gbfs/v2/public/larochesuryon/gbfs.json, FR,Bird Laval,Laval,bird-laval,https://bird.co,https://mds.bird.co/gbfs/v2/public/laval/gbfs.json, -FR,Bird Marseille,Marseille,bird-marseille,https://bird.co,https://mds.bird.co/gbfs/v2/public/marseille/gbfs.json, FR,Bird Millau,Millau,bird-millau,https://bird.co,https://mds.bird.co/gbfs/v2/public/millau/gbfs.json, FR,Bird Montlucon,Montluçon,bird-montlucon,https://bird.co,https://mds.bird.co/gbfs/v2/public/montlucon/gbfs.json, FR,Bird Ouistreham,Ouistreham,bird-ouistreham,https://bird.co,https://mds.bird.co/gbfs/v2/public/ouistreham/gbfs.json, @@ -345,13 +344,14 @@ FR,Dott Paris,Paris,dott-paris,https://ridedott.com,https://gbfs.api.ridedott.co FR,Dott Tignes,Tignes,dott-tignes,https://ridedott.com,https://gbfs.api.ridedott.com/public/v2/tignes/gbfs.json, FR,Dott Val-d’isere,Val-d’isere,dott-val-d’iser,https://ridedott.com/,https://gbfs.api.ridedott.com/public/v2/val-d%E2%80%99isere/gbfs.json, FR,LE vélo STAR,Rennes,le_velo_star,https://www.star.fr/le-velo/nos-offres/vls/,https://eu.ftp.opendatasoft.com/star/gbfs/gbfs.json, +FR,Levélo,Marseille,levelo_inurba_marseille,https://levelo.ampmetropole.fr,https://api.omega.fifteen.eu/gbfs/2.2/marseille/en/gbfs.json?&key=MjE0ZDNmMGEtNGFkZS00M2FlLWFmMWItZGNhOTZhMWQyYzM2, FR,Libélo,Valence,libelo,https://www.vrd-mobilites.fr/velo/,https://valence.publicbikesystem.net/customer/gbfs/v2/gbfs.json, FR,Lime Marseille,Marseille,lime_marseille,https://www.li.me,https://data.lime.bike/api/partners/v2/gbfs/marseille/gbfs.json, FR,Lime Paris,Paris,lime_paris,https://li.me/,https://data.lime.bike/api/partners/v2/gbfs/paris/gbfs.json, FR,Link Cagnes-sur-Mer,Cagnes-sur-Mer,Link_Cagnes-sur-Mer,https://www.superpedestrian.com,https://mds.linkyour.city/gbfs/fr_cagnessurmer/gbfs.json, FR,Link Perpignan,Perpignan,Link_Perpignan,https://www.superpedestrian.com,https://mds.linkyour.city/gbfs/fr_perpignan/gbfs.json, FR,Leo and Go,Lyon,84b174c4-eb74-5d07-bdeb-27f4215d2aa9,https://www.leoandgo.com/,https://download.data.grandlyon.com/files/rdata/lag_leoandgo.disponibilite/gbfs.json, -FR,LOVELO Libre-service,Rouen,inurba-rouen,https://lovelolibreservice.fr/,https://gbfs.urbansharing.com/lovelolibreservice.fr/system_information.json, +FR,LOVELO Libre-service,Rouen,inurba-rouen,https://lovelolibreservice.fr/,https://gbfs.urbansharing.com/lovelolibreservice.fr/gbfs.json, FR,Optymo Belfort,Belfort,Optymo_FR_Belfort,https://www.optymo.fr/,https://belfort-gbfs.klervi.net/gbfs/gbfs.json, FR,Pony Angers,Angers,pony_Angers,https://getapony.com/,https://gbfs.getapony.com/v1/angers/en/gbfs.json, FR,Pony Basque Country,Basque Country,pony_Basque_Country,https://getapony.com/,https://gbfs.getapony.com/v1/basque_country/en/gbfs.json, @@ -374,8 +374,8 @@ FR,Tier GRENOBLE,Grenoble,tier_GRENOBLE,https://www.tier.app,https://data.mobili FR,VCub Bordeaux,Bordeaux,vcub,https://www.vcub.fr/,https://transport.data.gouv.fr/gbfs/vcub/gbfs.json, FR,Vélam,Amiens,amiens,http://www.velam.amiens.fr/,https://transport.data.gouv.fr/gbfs/amiens/gbfs.json, FR,Vélib' Metropole,Paris,Paris,https://www.velib-metropole.fr/,https://velib-metropole-opendata.smovengo.cloud/opendata/Velib_Metropole/gbfs.json, -FR,Vélivert,Saint-Etienne,Velivert_FR_Saint-Etienne,https://www.velivert.fr/,https://saint-etienne-gbfs.klervi.net/gbfs/gbfs.json, FR,VélO2,Cergy-Pontoise,cergy-pontoise,http://www.velo2.cergypontoise.fr/,https://transport.data.gouv.fr/gbfs/cergy-pontoise/gbfs.json, +FR,Vélo'Baie,Saint-Brieuc,saintbrieuc,https://www.saintbrieuc-armor-agglo.bzh/velobaie,https://gateway.prod.partners-fs37hd8.zoov.site/gbfs/2.2/saintbrieuc/en/gbfs.json?key=YmE1ZDVlNDYtMGIwNy00MGEyLWIxZWYtNGEwOGQ4NTYxNTYz, FR,Vélocéo,Vannes,Veloceo_FR_Vannes,https://veloceo.kiceo.fr/,https://vannes-gbfs.klervi.net/gbfs/gbfs.json, FR,VéloCité,Besançon,besançon,https://www.velocite.besancon.fr/,https://transport.data.gouv.fr/gbfs/besancon/gbfs.json, FR,VéloCité,Mulhouse,mulhouse,https://www.compte-mobilite.fr/services/velos-en-libre-service/,https://transport.data.gouv.fr/gbfs/mulhouse/gbfs.json, @@ -385,7 +385,7 @@ FR,VélOstan'lib,Nancy,nancy,http://www.velostanlib.fr/,https://transport.data.g FR,VélÔToulouse,Toulouse,toulouse,http://www.velo.toulouse.fr/,https://transport.data.gouv.fr/gbfs/toulouse/gbfs.json, FR,VéloZef,Brest,velozef,https://www.bibus.fr/services/velozef-le-velo-assistance-electrique-en-libre-service,https://api.prod.partners-fs37hd8.zoov.eu/gbfs/2.2/brest/en/gbfs.json?&key=OGNhZDNjMDQtYTA0Yi00NzU2LWE0MTItOGJlYzE1Y2E4NGEx, FR,Vélo'v,Lyon,lyon,https://velov.grandlyon.com/en/home,https://transport.data.gouv.fr/gbfs/lyon/gbfs.json, -FR,Vélivert (Saint-Étienne),Saint-Étienne,velivert_saint_etienne,https://api.sigma.fifteen.eu,https://api.saint-etienne-metropole.fr/velivert/api/gbfs/gbfs.json, +FR,Vélivert,Saint-Étienne,velivert_saint_etienne,https://www.velivert.fr/,https://api.saint-etienne-metropole.fr/velivert/api/gbfs/gbfs.json, FR,VélYcéo,Saint-Nazaire,velyceo,https://www.velyceo.com,https://api.gbfs.v1.ecovelo.mobi/gbfs/velyceo, FR,V'lille,Lille,vlille,https://www.ilevia.fr/cms/vlille/,https://transport.data.gouv.fr/gbfs/vlille/gbfs.json, FR,Voi Marseille,Marseille,voiscooters.com,https://www.voiscooters.com/,https://api.voiapp.io/gbfs/fr/6bb6b5dc-1cda-4da7-9216-d3023a0bc54a/gbfs.json, From ac809140fa6ff835e00822a1ccba3cc22c41d20e Mon Sep 17 00:00:00 2001 From: Fabien Richard-Allouard Date: Wed, 24 Jan 2024 10:30:17 +0100 Subject: [PATCH 2/4] Move public keys to Authentication Info column --- systems.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systems.csv b/systems.csv index fb93de2b..da764ec7 100644 --- a/systems.csv +++ b/systems.csv @@ -1,4 +1,4 @@ -Country Code,Name,Location,System ID,URL,Auto-Discovery URL,Authentication Info URL +Country Code,Name,Location,System ID,URL,Auto-Discovery URL,Authentication Info AE,Careem BIKE,Dubai,careem_bike,https://www.careem.com/en-ae/careem-bike/,https://dubai.publicbikesystem.net/customer/gbfs/v2/gbfs.json, AR,Bike Nordelta,Buenos Aires,bike_nordelta,https://bikeitau.com.br/nordelta/,https://nordelta.publicbikesystem.net/ube/gbfs/v1/, AR,Ecobici,Buenos Aires,bike_buenosaires,https://www.buenosaires.gob.ar/ecobici,https://buenosaires.publicbikesystem.net/ube/gbfs/v1/, @@ -344,7 +344,7 @@ FR,Dott Paris,Paris,dott-paris,https://ridedott.com,https://gbfs.api.ridedott.co FR,Dott Tignes,Tignes,dott-tignes,https://ridedott.com,https://gbfs.api.ridedott.com/public/v2/tignes/gbfs.json, FR,Dott Val-d’isere,Val-d’isere,dott-val-d’iser,https://ridedott.com/,https://gbfs.api.ridedott.com/public/v2/val-d%E2%80%99isere/gbfs.json, FR,LE vélo STAR,Rennes,le_velo_star,https://www.star.fr/le-velo/nos-offres/vls/,https://eu.ftp.opendatasoft.com/star/gbfs/gbfs.json, -FR,Levélo,Marseille,levelo_inurba_marseille,https://levelo.ampmetropole.fr,https://api.omega.fifteen.eu/gbfs/2.2/marseille/en/gbfs.json?&key=MjE0ZDNmMGEtNGFkZS00M2FlLWFmMWItZGNhOTZhMWQyYzM2, +FR,Levélo,Marseille,levelo_inurba_marseille,https://levelo.ampmetropole.fr,https://api.omega.fifteen.eu/gbfs/2.2/marseille/en/gbfs.json,key=MjE0ZDNmMGEtNGFkZS00M2FlLWFmMWItZGNhOTZhMWQyYzM2 FR,Libélo,Valence,libelo,https://www.vrd-mobilites.fr/velo/,https://valence.publicbikesystem.net/customer/gbfs/v2/gbfs.json, FR,Lime Marseille,Marseille,lime_marseille,https://www.li.me,https://data.lime.bike/api/partners/v2/gbfs/marseille/gbfs.json, FR,Lime Paris,Paris,lime_paris,https://li.me/,https://data.lime.bike/api/partners/v2/gbfs/paris/gbfs.json, @@ -375,7 +375,7 @@ FR,VCub Bordeaux,Bordeaux,vcub,https://www.vcub.fr/,https://transport.data.gouv. FR,Vélam,Amiens,amiens,http://www.velam.amiens.fr/,https://transport.data.gouv.fr/gbfs/amiens/gbfs.json, FR,Vélib' Metropole,Paris,Paris,https://www.velib-metropole.fr/,https://velib-metropole-opendata.smovengo.cloud/opendata/Velib_Metropole/gbfs.json, FR,VélO2,Cergy-Pontoise,cergy-pontoise,http://www.velo2.cergypontoise.fr/,https://transport.data.gouv.fr/gbfs/cergy-pontoise/gbfs.json, -FR,Vélo'Baie,Saint-Brieuc,saintbrieuc,https://www.saintbrieuc-armor-agglo.bzh/velobaie,https://gateway.prod.partners-fs37hd8.zoov.site/gbfs/2.2/saintbrieuc/en/gbfs.json?key=YmE1ZDVlNDYtMGIwNy00MGEyLWIxZWYtNGEwOGQ4NTYxNTYz, +FR,Vélo'Baie,Saint-Brieuc,saintbrieuc,https://www.saintbrieuc-armor-agglo.bzh/velobaie,https://gateway.prod.partners-fs37hd8.zoov.site/gbfs/2.2/saintbrieuc/en/gbfs.json,key=YmE1ZDVlNDYtMGIwNy00MGEyLWIxZWYtNGEwOGQ4NTYxNTYz FR,Vélocéo,Vannes,Veloceo_FR_Vannes,https://veloceo.kiceo.fr/,https://vannes-gbfs.klervi.net/gbfs/gbfs.json, FR,VéloCité,Besançon,besançon,https://www.velocite.besancon.fr/,https://transport.data.gouv.fr/gbfs/besancon/gbfs.json, FR,VéloCité,Mulhouse,mulhouse,https://www.compte-mobilite.fr/services/velos-en-libre-service/,https://transport.data.gouv.fr/gbfs/mulhouse/gbfs.json, @@ -383,7 +383,7 @@ FR,Vélomagg',Montpellier,montpellier,https://www.tam-voyages.com/presentation/? FR,Vélopop,Avignon,Vélopop_FR_Avignon,https://www.velopop.fr/,https://avignon-gbfs.klervi.net/gbfs/gbfs.json, FR,VélOstan'lib,Nancy,nancy,http://www.velostanlib.fr/,https://transport.data.gouv.fr/gbfs/nancy/gbfs.json, FR,VélÔToulouse,Toulouse,toulouse,http://www.velo.toulouse.fr/,https://transport.data.gouv.fr/gbfs/toulouse/gbfs.json, -FR,VéloZef,Brest,velozef,https://www.bibus.fr/services/velozef-le-velo-assistance-electrique-en-libre-service,https://api.prod.partners-fs37hd8.zoov.eu/gbfs/2.2/brest/en/gbfs.json?&key=OGNhZDNjMDQtYTA0Yi00NzU2LWE0MTItOGJlYzE1Y2E4NGEx, +FR,VéloZef,Brest,velozef,https://www.bibus.fr/services/velozef-le-velo-assistance-electrique-en-libre-service,https://api.prod.partners-fs37hd8.zoov.eu/gbfs/2.2/brest/en/gbfs.json,key=OGNhZDNjMDQtYTA0Yi00NzU2LWE0MTItOGJlYzE1Y2E4NGEx FR,Vélo'v,Lyon,lyon,https://velov.grandlyon.com/en/home,https://transport.data.gouv.fr/gbfs/lyon/gbfs.json, FR,Vélivert,Saint-Étienne,velivert_saint_etienne,https://www.velivert.fr/,https://api.saint-etienne-metropole.fr/velivert/api/gbfs/gbfs.json, FR,VélYcéo,Saint-Nazaire,velyceo,https://www.velyceo.com,https://api.gbfs.v1.ecovelo.mobi/gbfs/velyceo, From 569efb60534efeb3dc7c48e1d32b55cf73ed72ec Mon Sep 17 00:00:00 2001 From: Fabien Richard-Allouard Date: Wed, 24 Jan 2024 10:35:03 +0100 Subject: [PATCH 3/4] Update Authentication Info description in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3afa36c8..4cac4247 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Location | Yes| Primary city in which the system is located, followed by the 2-l System ID | Yes | ID for the system. This MUST match the `system_id` field in `system_information.json`. URL | Yes | URL for the system from the `url` field in `system_information.json`. If the `url` field is not included in `system_information.json` this SHOULD be the primary URL for the system operator. Auto-Discovery URL | Yes | URL for the system's `gbfs.json` auto-discovery file. -Authentication Info URL | Conditionally REQUIRED | If authentication is required, this MUST contain a URL to a human-readable page describing how the authentication should be performed and how credentials can be created. +Authentication Info | Conditionally REQUIRED | If authentication is required, this MUST contain a URL to a human-readable page describing how the authentication should be performed and how credentials can be created, or directly contain the public key-value pair to be added to the URL. ## GBFS JSON Schemas Complete JSON schemas for each version of GBFS can be found [here](https://github.com/MobilityData/gbfs-json-schema). From ad39f8e62245ff2cb030dbb0105c7eea304d3532 Mon Sep 17 00:00:00 2001 From: Fabien Richard-Allouard Date: Wed, 24 Jan 2024 10:42:09 +0100 Subject: [PATCH 4/4] Rephrase Authentication Info description in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cac4247..ff8fbcf9 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Location | Yes| Primary city in which the system is located, followed by the 2-l System ID | Yes | ID for the system. This MUST match the `system_id` field in `system_information.json`. URL | Yes | URL for the system from the `url` field in `system_information.json`. If the `url` field is not included in `system_information.json` this SHOULD be the primary URL for the system operator. Auto-Discovery URL | Yes | URL for the system's `gbfs.json` auto-discovery file. -Authentication Info | Conditionally REQUIRED | If authentication is required, this MUST contain a URL to a human-readable page describing how the authentication should be performed and how credentials can be created, or directly contain the public key-value pair to be added to the URL. +Authentication Info | Conditionally REQUIRED | If authentication is required, this MUST contain a URL to a human-readable page describing how the authentication should be performed and how credentials can be created, or directly contain the public key-value pair to append to the feed URLs. ## GBFS JSON Schemas Complete JSON schemas for each version of GBFS can be found [here](https://github.com/MobilityData/gbfs-json-schema).