Solve merge conflict transloc file

catenarytransit · Jul 8, 2024 · 828b4cd · 828b4cd
2 parents d33a919 + 66b5c85
commit 828b4cd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/feeds/pacebus.com.dmfr.json b/feeds/pacebus.com.dmfr.json
@@ -24,6 +24,10 @@
           "associated_feeds": [
             {
               "gtfs_agency_id": "PACE"
+            },
+            {
+              "feed_onestop_id": "f-dp3-pace~rt",
+              "gtfs_agency_id": "PACE"
             }
           ],
           "tags": {
@@ -33,7 +37,16 @@
           }
         }
       ]
+    },
+    {
+      "id": "f-dp3-pace~rt",
+      "spec": "gtfs-rt",
+      "urls": {
+        "realtime_vehicle_positions": "https://tmweb.pacebus.com/TMGTFSRealTimeWebService/Vehicle/VehiclePositions.pb",
+        "realtime_trip_updates": "https://tmweb.pacebus.com/TMGTFSRealTimeWebService/TripUpdate/TripUpdates.pb",
+        "realtime_alerts": "https://tmweb.pacebus.com/TMGTFSRealTimeWebService/Alert/Alerts.pb"
+      }
     }
   ],
   "license_spdx_identifier": "CDLA-Permissive-1.0"
-}
+}
diff --git a/feeds/passio3.com.dmfr.json b/feeds/passio3.com.dmfr.json
@@ -667,6 +667,16 @@
         "static_current": "https://passio3.com/ozark/passioTransit/gtfs/google_transit.zip"
       }
     },
+    {
+      "id": "f-rochester~institute~of~technology",
+      "spec": "gtfs",
+      "urls": {
+        "static_current": "https://passio3.com/ritech/passioTransit/gtfs/google_transit.zip",
+        "static_historic": [
+          "https://api.transloc.com/gtfs/rit.zip"
+        ]
+      }
+    },
     {
       "id": "f-rosemead~ca~us",
       "spec": "gtfs",