Merge branch 'main' into feat/license_matcher

Author: davidgamez

api/src/scripts/populate_db_gtfs.py

@@ -236,7 +236,9 @@ def populate_db(self, session: "Session", fetch_url: bool = True):
             # Populate common fields from Feed
             feed.feed_name = self.get_safe_value(row, "name", "")
             feed.note = self.get_safe_value(row, "note", "")
-            feed.producer_url = self.get_safe_value(row, "urls.direct_download", "")
+            producer_url = self.get_safe_value(row, "urls.direct_download", "")
+            if "transitfeeds" not in producer_url:  # Avoid setting transitfeeds as producer_url
+                feed.producer_url = producer_url
             feed.authentication_type = str(int(float(self.get_safe_value(row, "urls.authentication_type", "0"))))
             feed.authentication_info_url = self.get_safe_value(row, "urls.authentication_info", "")
             feed.api_key_parameter_name = self.get_safe_value(row, "urls.api_key_parameter_name", "")

functions-data/transitfeeds_data_import/gtfs_feeds.csv

@@ -0,0 +1,22 @@
+Mobility Database Feed ID,Feed Name,Entity Types,External Feed ID,Provider,Producer URL,Data Type,Redirects,Country,Subdivision,Municipality,Provider URL,License URL
+tfs-1323,Christchurch Metro Service Alerts,sa,christchurch-metro/1323,Metro Christchurch,rtt.metroinfo.org.nz/rtt/public/utility/gtfsrealtime.aspx/alert,gtfs_rt,mdb-1793,New Zealand,,,http://data.ecan.govt.nz/Catalogue/Method?MethodId=106#tab-desc,
+tfs-1097,RTC Southern Nevada Trip Updates,tu,rtc-southern-nevada/1097,Regional Transportation Commission of Southern Nevada (RTC),rtcws.rtcsnv.com/gtfrt/tripUpdates.pb,gtfs_rt,mdb-1666,United States,NV,Las Vegas,https://www.rtcsnv.com/transit/rtc-transit-services/rtc-transit-developer-information/,
+tfs-967,Guelph Transit Vehicle Locations,vp,guelph-transit/967,Guelph Transit,transitgtfs.guelph.ca:9780/TMGTFSRealTimeWebService/Vehicle/VehiclePositions.pb,gtfs_rt,mdb-2592,Canada,ON,Guelph,,
+tfs-966,Guelph Transit Trip Updates,tu,guelph-transit/966,Guelph Transit,transitgtfs.guelph.ca:9780/TMGTFSRealTimeWebService/TripUpdate/TripUpdates.pb,gtfs_rt,mdb-2594,Canada,ON,Guelph,,
+tfs-965,Guelph Transit Service Alerts,sa,guelph-transit/965,Guelph Transit,transitgtfs.guelph.ca:9780/TMGTFSRealTimeWebService/Alert/Alerts.pb,gtfs_rt,mdb-2593,Canada,ON,Guelph,,
+tfs-890,ETS Service Alerts,sa,edmonton-transit-system/890,ETS,data.edmonton.ca/download/rqaa-jae6/application%2Foctet-stream,gtfs_rt,mdb-1497,Canada,AB,Edmonton,https://data.edmonton.ca/Transit/Real-Time-Alerts-GTFS-PB-File-/rqaa-jae6,
+tfs-816,,,ov/816,OVapi Train,gtfs.ovapi.nl/nl/trainUpdates.pb,gtfs_rt,mdb-1644,Netherlands,,,,
+tfs-665,Capital Metro Trip Updates,tu,capital-metro/665,Capital Metro,data.texas.gov/download/rmk2-acnw/application/octet-stream,gtfs_rt,mdb-1429,United States,TX,Austin,https://www.capmetro.org/metrolabs/,
+tfs-624,GRT Trip Updates,tu,grand-river-transit/624,GRT,192.237.29.212:8080/gtfsrealtime/TripUpdates,gtfs_rt,mdb-1520,Canada,ON,Waterloo,http://www.regionofwaterloo.ca/en/regionalGovernment/GRT_GTFSdata.asp,
+tfs-623,GRT Vehicle Positions,vp,grand-river-transit/623,GRT,192.237.29.212:8080/gtfsrealtime/VehiclePositions,gtfs_rt,mdb-1521,Canada,ON,Waterloo,http://www.regionofwaterloo.ca/en/regionalGovernment/GRT_GTFSdata.asp,
+tfs-576,ETS Vehicle Positions,vp,edmonton-transit-system/576,ETS,data.edmonton.ca/download/7qed-k2fc/application/octet-stream,gtfs_rt,mdb-1496,Canada,AB,Edmonton,https://data.edmonton.ca/Transit/Real-Time-Vehicle-Position-GTFS-PB-File-/7qed-k2fc,
+tfs-575,ETS Trip Updates,tu,edmonton-transit-system/575,ETS,data.edmonton.ca/download/uzpc-8bnm/application%2Foctet-stream,gtfs_rt,mdb-1498,Canada,AB,Edmonton,https://data.edmonton.ca/Transit/Real-Time-Trip-Updates-GTFS-PB-File-/uzpc-8bnm,
+tfs-545,Cincinnati Metro Trip Updates,tu,cincinnati-metro/545,Cincinnati Metro,developer.go-metro.com/TMGTFSRealTimeWebService/TripUpdate/TripUpdates.pb,gtfs_rt,mdb-1488,United States,OH,Cincinnati,http://www.go-metro.com/about-metro/developer-data,
+tfs-544,Cincinnati Metro Vehicle Positions,vp,cincinnati-metro/544,Cincinnati Metro,developer.go-metro.com/TMGTFSRealTimeWebService/vehicle/VehiclePositions.pb,gtfs_rt,mdb-1489,United States,OH,Cincinnati,http://www.go-metro.com/about-metro/developer-data,
+tfs-502,CT Transit Hartford Alerts,sa,connecticut-transit/502,CT Transit Hartford,65.213.12.244/realtimefeed/alert/alerts.pb,gtfs_rt,mdb-2424,United States,,,,
+tfs-501,CT Transit Hartford Vehicle Positions,vp,connecticut-transit/501,CT Transit Hartford,65.213.12.244/realtimefeed/vehicle/vehiclepositions.pb,gtfs_rt,mdb-2422,United States,,,,
+tfs-500,CT Transit Hartford Trip Updates,tu,connecticut-transit/500,CT Transit Hartford,65.213.12.244/realtimefeed/tripupdate/tripupdates.pb,gtfs_rt,mdb-2423,United States,,,,
+tfs-292,Cairns Vehicle Positions & Trip Updates,vp | tu,translink/292,Cairns,gtfsrt.api.translink.com.au/Feed/MCS,gtfs_rt,mdb-1702 | mdb-1704,Australia,,,https://gtfsrt.api.translink.com.au/,
+tfs-150,ART Trip Updates,tu,arlington-transit/150,ART,realtime.commuterpage.com/rtt/public/utility/gtfsrealtime.aspx/tripupdate,gtfs_rt,mdb-1372,United States,VA,Arlington,http://www.arlingtontransit.com/pages/rider-tools/tools-for-developers/,
+tfs-119,MARTA Vehicle Positions,vp,marta/119,MARTA,onebusaway.gatech.edu:8080/vehicle-positions,gtfs_rt,mdb-1601,United States,GA,Atlanta,http://www.itsmarta.com/app-developer-resources.aspx,
+tfs-118,MARTA Trip Updates,tu,marta/118,MARTA,onebusaway.gatech.edu:8080/trip-updates,gtfs_rt,mdb-1600,United States,GA,Atlanta,http://www.itsmarta.com/app-developer-resources.aspx,