Merge branch 'feat-redirect-handling' of https://github.com/MobilityD…

…ata/mobility-database-catalogs into feat-redirect-handling
MobilityData · Jul 23, 2024 · 9a98f99 · 9a98f99
2 parents e23ec97 + b32c902
commit 9a98f99
Show file tree

Hide file tree

Showing 34 changed files with 208 additions and 52 deletions.
diff --git a/.github/workflows/export_to_csv.yml b/.github/workflows/export_to_csv.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Load secrets from 1Password to be used for sending notification
         id: onepw_secrets
-        uses: 1password/load-secrets-action@v1.3.1
+        uses: 1password/load-secrets-action@v2.0.0
         with:
           export-env: true # Export loaded secrets as environment variables
         env:
@@ -81,4 +81,4 @@ jobs:
         with:
           token: ${{ env.CREDENTIALS }}
           repository: MobilityData/mobility-feed-api
-          event-type: catalog-sources-updated
+          event-type: catalog-sources-updated
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-bus-gtfs-rt-sa-1628.json b/catalogs/sources/gtfs/realtime/us-new-york-bus-gtfs-rt-sa-1628.json
@@ -4,7 +4,7 @@
     "entity_type": [
         "sa"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "Bus",
     "static_reference": [
         510
@@ -16,4 +16,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-long-island-rail-road-gtfs-rt-sa-1625.json b/catalogs/sources/gtfs/realtime/us-new-york-long-island-rail-road-gtfs-rt-sa-1625.json
@@ -4,7 +4,7 @@
     "entity_type": [
         "sa"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "Long Island Rail Road",
     "static_reference": [
         507
@@ -16,4 +16,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-long-island-rail-road-gtfs-rt-vp-tu-1624.json b/catalogs/sources/gtfs/realtime/us-new-york-long-island-rail-road-gtfs-rt-vp-tu-1624.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "Long Island Rail Road",
     "static_reference": [
         507
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-metro-north-railroad-gtfs-rt-sa-1626.json b/catalogs/sources/gtfs/realtime/us-new-york-metro-north-railroad-gtfs-rt-sa-1626.json
@@ -4,7 +4,7 @@
     "entity_type": [
         "sa"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "Metro North Railroad",
     "static_reference": [
         524
@@ -16,4 +16,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-metro-north-railroad-gtfs-rt-tu-1627.json b/catalogs/sources/gtfs/realtime/us-new-york-metro-north-railroad-gtfs-rt-tu-1627.json
@@ -4,7 +4,7 @@
     "entity_type": [
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "Metro North Railroad",
     "static_reference": [
         524
@@ -16,4 +16,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-1-gtfs-rt-vp-tu-1635.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-1-gtfs-rt-vp-tu-1635.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway 1, 2, 3, 4, 5, 6, 7 trains",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-ace-lines-gtfs-rt-vp-tu-1630.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-ace-lines-gtfs-rt-vp-tu-1630.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway ACE Lines",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-bdfm-lines-gtfs-rt-vp-tu-1631.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-bdfm-lines-gtfs-rt-vp-tu-1631.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway BDFM Lines",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-g-line-gtfs-rt-vp-tu-1632.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-g-line-gtfs-rt-vp-tu-1632.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway G Line",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-gtfs-rt-sa-1629.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-gtfs-rt-sa-1629.json
@@ -4,7 +4,7 @@
     "entity_type": [
         "sa"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway",
     "static_reference": [
         516
@@ -16,4 +16,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-jz-lines-gtfs-rt-vp-tu-1633.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-jz-lines-gtfs-rt-vp-tu-1633.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway JZ Lines",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-l-train-gtfs-rt-vp-tu-1636.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-l-train-gtfs-rt-vp-tu-1636.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway L Train ",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-nqrw-lines-gtfs-rt-vp-tu-1634.json b/catalogs/sources/gtfs/realtime/us-new-york-nyc-subway-nqrw-lines-gtfs-rt-vp-tu-1634.json
@@ -5,7 +5,7 @@
         "vp",
         "tu"
     ],
-    "provider": "MTA New York City Transit",
+    "provider": "Metropolitan Transit Authority (MTA)",
     "name": "NYC Subway NQRW Lines",
     "static_reference": [
         516
@@ -18,4 +18,4 @@
         "api_key_parameter_name": "x-api-key",
         "license": "https://api.mta.info/#/DataFeedAgreement"
     }
-}
+}
diff --git a/...ule/au-unknown-transcollie-gtfs-1086.json → ...tern-australia-transcollie-gtfs-1086.json b/...ule/au-unknown-transcollie-gtfs-1086.json → ...tern-australia-transcollie-gtfs-1086.json
@@ -4,6 +4,7 @@
     "provider": "TransCollie, TransCarnarvon, TransEsperance, TransKarratha, TransNarrogin, Transperth, TransHedland, TransBroome, TransGeraldton, TransAlbany, TransBunbury, TransBusselton, TransGoldfields, 2K Tours, TransManjimup, Transwa",
     "location": {
         "country_code": "AU",
+        "subdivision_name": "Western Australia",
         "bounding_box": {
             "minimum_latitude": -35.0682822222222,
             "maximum_latitude": -20.3008238888889,
@@ -14,6 +15,6 @@
     },
     "urls": {
         "direct_download": "http://www.transperth.wa.gov.au/TimetablePDFs/GoogleTransit/Production/google_transit.zip",
-        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/au-unknown-transcollie-gtfs-1086.zip?alt=media"
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/au-western-australia-transcollie-gtfs-1086.zip?alt=media"
     }
-}
+}
diff --git a/...ces/gtfs/schedule/es-unknown-alta-velocidad-larga-distancia-media-distancia-gtfs-790.json b/...ces/gtfs/schedule/es-unknown-alta-velocidad-larga-distancia-media-distancia-gtfs-790.json
@@ -1,7 +1,8 @@
 {
     "mdb_source_id": 790,
     "data_type": "gtfs",
-    "provider": "Alta-Velocidad-Larga Distancia-Media Distancia",
+    "provider": "Renfe",
+    "name": "Alta-Velocidad-Larga Distancia-Media Distancia",
     "location": {
         "country_code": "ES",
         "bounding_box": {

diff --git a/catalogs/sources/gtfs/schedule/gb-westminster-transport-for-london-gtfs-995.json b/catalogs/sources/gtfs/schedule/gb-westminster-transport-for-london-gtfs-995.json
@@ -1,7 +1,7 @@
 {
     "mdb_source_id": 995,
     "data_type": "gtfs",
-    "provider": "Transport For London",
+    "provider": "Transport For London (TfL)",
     "status": "inactive",
     "location": {
         "country_code": "GB",
@@ -20,4 +20,4 @@
         "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/gb-westminster-transport-for-london-gtfs-995.zip?alt=media",
         "license": "https://tfl.gov.uk/corporate/terms-and-conditions/transport-data-service"
     }
-}
+}
diff --git a/...chedule/united-states-minnesota-city-of-winona-mn---winona-transit-service-gtfs-2032.json b/...chedule/united-states-minnesota-city-of-winona-mn---winona-transit-service-gtfs-2032.json
@@ -5,7 +5,7 @@
     "feed_contact_email": "[email protected]",
     "location": {
         "country_code": "US",
-        "subdivision_name": "Minnesota ",
+        "subdivision_name": "Minnesota",
         "municipality": "Winona",
         "bounding_box": {
             "minimum_latitude": 44.019137,

diff --git a/catalogs/sources/gtfs/schedule/us-chicago-brown-county-heartland-express-gtfs-2037.json b/catalogs/sources/gtfs/schedule/us-chicago-brown-county-heartland-express-gtfs-2037.json
@@ -0,0 +1,25 @@
+{
+    "mdb_source_id": 2037,
+    "data_type": "gtfs",
+    "provider": "Brown County Heartland Express",
+    "name": "Flex v2 included",
+    "feed_contact_email": "support+browncounty-mn-us@trilliumtransit", 
+    "status": "active",
+    "location": {
+        "country_code": "US",
+        "subdivision_name": "Chicago",
+        "bounding_box": {
+            "minimum_latitude": 44.2874149536113,
+            "maximum_latitude": 44.3393958836996,
+            "minimum_longitude": -94.5065654828155,
+            "maximum_longitude": -94.4329113488943,
+            "extracted_on": "2024-07-17T21:31:06+00:00"
+        }
+    },
+    "urls": {
+        "direct_download": "https://data.trilliumtransit.com/gtfs/browncounty-mn-us/browncounty-mn-us--flex-v2.zip",
+        "authentication_type": 0,
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/us-chicago-brown-county-heartland-express-gtfs-2037.zip?alt=media"
+    },
+    "redirect": []
+}
diff --git a/catalogs/sources/gtfs/schedule/us-chicago-the-otter-express-gtfs-2038.json b/catalogs/sources/gtfs/schedule/us-chicago-the-otter-express-gtfs-2038.json
@@ -0,0 +1,25 @@
+{
+    "mdb_source_id": 2038,
+    "data_type": "gtfs",
+    "provider": "The Otter Express",
+    "name": "Flex v2 included",
+    "feed_contact_email": "[email protected]",
+    "status": "active",
+    "location": {
+        "country_code": "US",
+        "subdivision_name": "Chicago",
+        "bounding_box": {
+            "minimum_latitude": 46.26504432555926,
+            "maximum_latitude": 46.593913339587104,
+            "minimum_longitude": -96.5883107286256,
+            "maximum_longitude": -95.57152642784416,
+            "extracted_on": "2024-07-17T21:31:07+00:00"
+        }
+    },
+    "urls": {
+        "direct_download": "https://data.trilliumtransit.com/gtfs/otterexpress-mn-us/otterexpress-mn-us--flex-v2.zip",
+        "authentication_type": 0,
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/us-chicago-the-otter-express-gtfs-2038.zip?alt=media"
+    },
+    "redirect": []
+}
diff --git a/catalogs/sources/gtfs/schedule/us-colorado-all-points-transit-gtfs-2039.json b/catalogs/sources/gtfs/schedule/us-colorado-all-points-transit-gtfs-2039.json
@@ -0,0 +1,26 @@
+{
+    "mdb_source_id": 2039,
+    "data_type": "gtfs",
+    "provider": "All Points Transit",
+    "name": "Flex v2 included",
+    "feed_contact_email": "[email protected]",
+    "status": "active",
+    "location": {
+        "country_code": "US",
+        "subdivision_name": "Colorado",
+        "municipality": "Denver",
+        "bounding_box": {
+            "minimum_latitude": 37.9372925642184,
+            "maximum_latitude": 38.75049359794824,
+            "minimum_longitude": -108.57209467590911,
+            "maximum_longitude": -107.670295,
+            "extracted_on": "2024-07-17T21:31:07+00:00"
+        }
+    },
+    "urls": {
+        "direct_download": "https://data.trilliumtransit.com/gtfs/allpointstransit-co-us/allpointstransit-co-us--flex-v2.zip",
+        "authentication_type": 0,
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/us-colorado-all-points-transit-gtfs-2039.zip?alt=media"
+    },
+    "redirect": []
+}
diff --git a/catalogs/sources/gtfs/schedule/us-colorado-avon-transit-gtfs-2040.json b/catalogs/sources/gtfs/schedule/us-colorado-avon-transit-gtfs-2040.json
@@ -0,0 +1,26 @@
+{
+    "mdb_source_id": 2040,
+    "data_type": "gtfs",
+    "provider": "Avon Transit",
+    "name": "Flex v2 included",
+    "feed_contact_email": "[email protected]",
+    "status": "active",
+    "location": {
+        "country_code": "US",
+        "subdivision_name": "Colorado",
+        "municipality": "Denver",
+        "bounding_box": {
+            "minimum_latitude": 39.60389514864909,
+            "maximum_latitude": 39.657469818584616,
+            "minimum_longitude": -106.5484943943315,
+            "maximum_longitude": -106.493414,
+            "extracted_on": "2024-07-17T21:31:08+00:00"
+        }
+    },
+    "urls": {
+        "direct_download": "https://data.trilliumtransit.com/gtfs/avon-co-us/avon-co-us--flex-v2.zip",
+        "authentication_type": 0,
+        "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/us-colorado-avon-transit-gtfs-2040.zip?alt=media"
+    },
+    "redirect": []
+}