From d0fecf2f0a5dc51459b79918a08d195f8df3d66e Mon Sep 17 00:00:00 2001
From: Christian Mata <christian@hopthru.com>
Date: Tue, 1 Oct 2024 11:00:25 -0500
Subject: [PATCH 1/2] Create and add new Citilink feed

---
 feeds/fwcitilink.com.dmfr.json                | 36 +++++++++++++++++++
 ...sted-gtfs-feeds.s3.amazonaws.com.dmfr.json | 30 ----------------
 2 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 feeds/fwcitilink.com.dmfr.json

diff --git a/feeds/fwcitilink.com.dmfr.json b/feeds/fwcitilink.com.dmfr.json
new file mode 100644
index 000000000..46c7c652d
--- /dev/null
+++ b/feeds/fwcitilink.com.dmfr.json
@@ -0,0 +1,36 @@
+{
+    "$schema": "https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json",
+    "feeds": [
+      {
+        "id": "f-dp73-citilink",
+        "spec": "gtfs",
+        "urls": {
+          "static_current": "https://gtfs.remix.com/citilink_fortwayne_in_us.zip",
+          "static_historic": [
+            "http://jump.nextinsight.com/gtfs/ni_citilink/google_transit.zip"
+          ]
+        },
+        "tags": {
+          "gtfs_data_exchange": "citilink"
+        },
+        "operators": [
+          {
+            "onestop_id": "o-dp73-citilink",
+            "name": "Fort Wayne Citilink",
+            "website": "http://www.fwcitilink.com/",
+            "associated_feeds": [
+              {
+                "gtfs_agency_id": "77"
+              }
+            ],
+            "tags": {
+              "twitter_general": "FWCitilink",
+              "us_ntd_id": "50044",
+              "wikidata_id": "Q5472275"
+            }
+          }
+        ]
+      }
+    ],
+    "license_spdx_identifier": "CDLA-Permissive-1.0"
+  }
\ No newline at end of file
diff --git a/feeds/hosted-gtfs-feeds.s3.amazonaws.com.dmfr.json b/feeds/hosted-gtfs-feeds.s3.amazonaws.com.dmfr.json
index 06d68a473..8a3ebb9f7 100644
--- a/feeds/hosted-gtfs-feeds.s3.amazonaws.com.dmfr.json
+++ b/feeds/hosted-gtfs-feeds.s3.amazonaws.com.dmfr.json
@@ -63,36 +63,6 @@
           }
         }
       ]
-    },
-    {
-      "id": "f-dp73-citilink",
-      "spec": "gtfs",
-      "urls": {
-        "static_current": "https://hosted-gtfs-feeds.s3.amazonaws.com/Citilink-FW/gtfs.zip",
-        "static_historic": [
-          "http://jump.nextinsight.com/gtfs/ni_citilink/google_transit.zip"
-        ]
-      },
-      "tags": {
-        "gtfs_data_exchange": "citilink"
-      },
-      "operators": [
-        {
-          "onestop_id": "o-dp73-citilink",
-          "name": "Fort Wayne Citilink",
-          "website": "http://www.fwcitilink.com/",
-          "associated_feeds": [
-            {
-              "gtfs_agency_id": "77"
-            }
-          ],
-          "tags": {
-            "twitter_general": "FWCitilink",
-            "us_ntd_id": "50044",
-            "wikidata_id": "Q5472275"
-          }
-        }
-      ]
     }
   ],
   "license_spdx_identifier": "CDLA-Permissive-1.0"

From 4e6d5839c40903776dbfb5e5b7d92ca80f96ab18 Mon Sep 17 00:00:00 2001
From: Drew Dara-Abrams <drew@interline.io>
Date: Tue, 1 Oct 2024 10:49:30 -0700
Subject: [PATCH 2/2] combine together feeds from same domain & add some more
 info about Citlink

---
 feeds/fwcitilink.com.dmfr.json                | 36 -------------------
 ...org.dmfr.json => gtfs.remix.com.dmfr.json} | 27 ++++++++++++++
 2 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 feeds/fwcitilink.com.dmfr.json
 rename feeds/{bsoobtransit.org.dmfr.json => gtfs.remix.com.dmfr.json} (55%)

diff --git a/feeds/fwcitilink.com.dmfr.json b/feeds/fwcitilink.com.dmfr.json
deleted file mode 100644
index 46c7c652d..000000000
--- a/feeds/fwcitilink.com.dmfr.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "$schema": "https://dmfr.transit.land/json-schema/dmfr.schema-v0.5.0.json",
-    "feeds": [
-      {
-        "id": "f-dp73-citilink",
-        "spec": "gtfs",
-        "urls": {
-          "static_current": "https://gtfs.remix.com/citilink_fortwayne_in_us.zip",
-          "static_historic": [
-            "http://jump.nextinsight.com/gtfs/ni_citilink/google_transit.zip"
-          ]
-        },
-        "tags": {
-          "gtfs_data_exchange": "citilink"
-        },
-        "operators": [
-          {
-            "onestop_id": "o-dp73-citilink",
-            "name": "Fort Wayne Citilink",
-            "website": "http://www.fwcitilink.com/",
-            "associated_feeds": [
-              {
-                "gtfs_agency_id": "77"
-              }
-            ],
-            "tags": {
-              "twitter_general": "FWCitilink",
-              "us_ntd_id": "50044",
-              "wikidata_id": "Q5472275"
-            }
-          }
-        ]
-      }
-    ],
-    "license_spdx_identifier": "CDLA-Permissive-1.0"
-  }
\ No newline at end of file
diff --git a/feeds/bsoobtransit.org.dmfr.json b/feeds/gtfs.remix.com.dmfr.json
similarity index 55%
rename from feeds/bsoobtransit.org.dmfr.json
rename to feeds/gtfs.remix.com.dmfr.json
index 527e37c3c..602c6a54a 100644
--- a/feeds/bsoobtransit.org.dmfr.json
+++ b/feeds/gtfs.remix.com.dmfr.json
@@ -27,6 +27,33 @@
           }
         }
       ]
+    },
+    {
+      "id": "f-dp73-citilink",
+      "spec": "gtfs",
+      "urls": {
+        "static_current": "https://gtfs.remix.com/citilink_fortwayne_in_us.zip",
+        "static_historic": [
+          "https://hosted-gtfs-feeds.s3.amazonaws.com/Citilink-FW/gtfs.zip",
+          "http://jump.nextinsight.com/gtfs/ni_citilink/google_transit.zip"
+        ]
+      },
+      "tags": {
+        "gtfs_data_exchange": "citilink"
+      },
+      "operators": [
+        {
+          "onestop_id": "o-dp73-citilink",
+          "name": "Fort Wayne Public Transportation Corporation",
+          "short_name": "Citilink",
+          "website": "http://www.fwcitilink.com/",
+          "tags": {
+            "twitter_general": "FWCitilink",
+            "us_ntd_id": "50044",
+            "wikidata_id": "Q5472275"
+          }
+        }
+      ]
     }
   ],
   "license_spdx_identifier": "CDLA-Permissive-1.0"