From e72fd752109fdadac4e91f19fee8af0705b27ca6 Mon Sep 17 00:00:00 2001 From: Emma Triphora Date: Thu, 27 Jun 2024 12:33:53 -0400 Subject: [PATCH 1/4] Add realtime feed for Milwaukee County Transit System --- .gitignore | 1 + feeds/kamino.mcts.org.dmfr.json | 7 ++++++- feeds/realtime.ridemcts.com.dmfr.json | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 feeds/realtime.ridemcts.com.dmfr.json diff --git a/.gitignore b/.gitignore index 245806063..a86367680 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.db dmfr.schema.json +.idea \ No newline at end of file diff --git a/feeds/kamino.mcts.org.dmfr.json b/feeds/kamino.mcts.org.dmfr.json index cb3d4dcad..dae495eb0 100644 --- a/feeds/kamino.mcts.org.dmfr.json +++ b/feeds/kamino.mcts.org.dmfr.json @@ -5,7 +5,7 @@ "id": "f-dp9-milwaukeecountytransitsystem", "spec": "gtfs", "urls": { - "static_current": "http://kamino.mcts.org/gtfs/google_transit.zip" + "static_current": "https://kamino.mcts.org/gtfs/google_transit.zip" }, "license": { "url": "https://www.ridemcts.com/policies/developer-terms" @@ -18,6 +18,11 @@ "onestop_id": "o-dp9-milwaukeecountytransitsystem", "name": "Milwaukee County Transit System", "short_name": "MCTS", + "associated_feeds": [ + { + "feed_onestop_id": "f-mcts~rt" + } + ], "tags": { "twitter_general": "RideMCTS", "us_ntd_id": "50008", diff --git a/feeds/realtime.ridemcts.com.dmfr.json b/feeds/realtime.ridemcts.com.dmfr.json new file mode 100644 index 000000000..a809c2e83 --- /dev/null +++ b/feeds/realtime.ridemcts.com.dmfr.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json", + "feeds": [ + { + "id": "f-mcts~rt", + "spec": "gtfs-rt", + "urls": { + "realtime_vehicle_positions": "https://realtime.ridemcts.com/gtfsrt/vehicles", + "realtime_trip_updates": "https://realtime.ridemcts.com/gtfsrt/trips", + "realtime_alerts": "https://realtime.ridemcts.com/gtfsrt/alerts" + }, + "license": { + "url": "https://www.ridemcts.com/policies/developer-terms" + } + } + ], + "license_spdx_identifier": "CDLA-Permissive-1.0" +} \ No newline at end of file From f452081b3ebe0bc1054c13693c95f9c6ebb86346 Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Mon, 8 Jul 2024 14:22:58 -0700 Subject: [PATCH 2/4] merge into a single file & use similar Onestop ID --- ...o.mcts.org.dmfr.json => mcts.org.dmfr.json} | 14 +++++++++++++- feeds/realtime.ridemcts.com.dmfr.json | 18 ------------------ 2 files changed, 13 insertions(+), 19 deletions(-) rename feeds/{kamino.mcts.org.dmfr.json => mcts.org.dmfr.json} (64%) delete mode 100644 feeds/realtime.ridemcts.com.dmfr.json diff --git a/feeds/kamino.mcts.org.dmfr.json b/feeds/mcts.org.dmfr.json similarity index 64% rename from feeds/kamino.mcts.org.dmfr.json rename to feeds/mcts.org.dmfr.json index dae495eb0..d2e92e08f 100644 --- a/feeds/kamino.mcts.org.dmfr.json +++ b/feeds/mcts.org.dmfr.json @@ -20,7 +20,7 @@ "short_name": "MCTS", "associated_feeds": [ { - "feed_onestop_id": "f-mcts~rt" + "feed_onestop_id": "f-dp9-milwaukeecountytransitsystem~rt" } ], "tags": { @@ -30,6 +30,18 @@ } } ] + }, + { + "id": "f-dp9-milwaukeecountytransitsystem~rt", + "spec": "gtfs-rt", + "urls": { + "realtime_vehicle_positions": "https://realtime.ridemcts.com/gtfsrt/vehicles", + "realtime_trip_updates": "https://realtime.ridemcts.com/gtfsrt/trips", + "realtime_alerts": "https://realtime.ridemcts.com/gtfsrt/alerts" + }, + "license": { + "url": "https://www.ridemcts.com/policies/developer-terms" + } } ], "license_spdx_identifier": "CDLA-Permissive-1.0" diff --git a/feeds/realtime.ridemcts.com.dmfr.json b/feeds/realtime.ridemcts.com.dmfr.json deleted file mode 100644 index a809c2e83..000000000 --- a/feeds/realtime.ridemcts.com.dmfr.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json", - "feeds": [ - { - "id": "f-mcts~rt", - "spec": "gtfs-rt", - "urls": { - "realtime_vehicle_positions": "https://realtime.ridemcts.com/gtfsrt/vehicles", - "realtime_trip_updates": "https://realtime.ridemcts.com/gtfsrt/trips", - "realtime_alerts": "https://realtime.ridemcts.com/gtfsrt/alerts" - }, - "license": { - "url": "https://www.ridemcts.com/policies/developer-terms" - } - } - ], - "license_spdx_identifier": "CDLA-Permissive-1.0" -} \ No newline at end of file From 8f0e0f7f45ee63deb05055fc788b9912ab688ced Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Mon, 8 Jul 2024 14:24:00 -0700 Subject: [PATCH 3/4] for IDE config files, please use your own global gitignore file --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a86367680..c4369ceee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ *.db -dmfr.schema.json -.idea \ No newline at end of file +dmfr.schema.json \ No newline at end of file From 9f221d77e83be869133a88403a7f7c503cfd7db4 Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Mon, 8 Jul 2024 14:25:33 -0700 Subject: [PATCH 4/4] bring back line break at end of file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c4369ceee..245806063 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.db -dmfr.schema.json \ No newline at end of file +dmfr.schema.json