From 9d9412a6aca2cfaf66f6cb750a7409577403031c Mon Sep 17 00:00:00 2001
From: Snowysauce <22599992+Snowysauce@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:57:56 -0500
Subject: [PATCH] transit network and brand updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* added GATE Petroleum locations (#10332) and Pan Pa' Ya! (resolves #10330)
* expanded Petco locationSet to include Mexico (resolves #10331)
* updated IDS ŽSK (resolves #10327) and MHD Žilina (resolves #10329)
---
 data/brands/amenity/car_wash.json  | 19 +++++++++++++++++++
 data/brands/amenity/fuel.json      | 19 +++++++++++++++++++
 data/brands/shop/bakery.json       | 11 +++++++++++
 data/brands/shop/convenience.json  | 19 +++++++++++++++++++
 data/brands/shop/pet.json          |  4 ++--
 data/transit/route/bus.json        | 28 +++++++++++++++++-----------
 data/transit/route/train.json      | 13 ++++++++++++-
 data/transit/route/trolleybus.json | 13 +++++++++++++
 8 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/data/brands/amenity/car_wash.json b/data/brands/amenity/car_wash.json
index 9fcfee7b2cd..da7c5cde148 100644
--- a/data/brands/amenity/car_wash.json
+++ b/data/brands/amenity/car_wash.json
@@ -256,6 +256,25 @@
         "name": "Esso TigerWash"
       }
     },
+    {
+      "displayName": "GATE Express Car Wash",
+      "id": "gateexpresscarwash-da012f",
+      "locationSet": {
+        "include": [
+          "us-fl.geojson",
+          "us-ga.geojson",
+          "us-nc.geojson",
+          "us-sc.geojson"
+        ]
+      },
+      "matchNames": ["gate petroleum"],
+      "tags": {
+        "amenity": "car_wash",
+        "brand": "GATE",
+        "brand:wikidata": "Q5526991",
+        "name": "GATE Express Car Wash"
+      }
+    },
     {
       "displayName": "Globus",
       "id": "globus-f2c690",
diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
index b8c2e161d2e..c10245a8437 100644
--- a/data/brands/amenity/fuel.json
+++ b/data/brands/amenity/fuel.json
@@ -2634,6 +2634,25 @@
         "name": "Gasenergy"
       }
     },
+    {
+      "displayName": "GATE",
+      "id": "gate-c085bb",
+      "locationSet": {
+        "include": [
+          "us-fl.geojson",
+          "us-ga.geojson",
+          "us-nc.geojson",
+          "us-sc.geojson"
+        ]
+      },
+      "matchNames": ["gate petroleum"],
+      "tags": {
+        "amenity": "fuel",
+        "brand": "GATE",
+        "brand:wikidata": "Q5526991",
+        "name": "GATE"
+      }
+    },
     {
       "displayName": "Gazel",
       "id": "gazel-419915",
diff --git a/data/brands/shop/bakery.json b/data/brands/shop/bakery.json
index 47546272489..181318ee1f7 100644
--- a/data/brands/shop/bakery.json
+++ b/data/brands/shop/bakery.json
@@ -1829,6 +1829,17 @@
         "shop": "bakery"
       }
     },
+    {
+      "displayName": "Pan Pa' Ya!",
+      "id": "panpaya-db8524",
+      "locationSet": {"include": ["co"]},
+      "tags": {
+        "brand": "Pan Pa' Ya!",
+        "brand:wikidata": "Q131744932",
+        "name": "Pan Pa' Ya!",
+        "shop": "bakery"
+      }
+    },
     {
       "displayName": "Pan-pek",
       "id": "panpek-0cc7ae",
diff --git a/data/brands/shop/convenience.json b/data/brands/shop/convenience.json
index 927cc07a84f..265597b9fdd 100644
--- a/data/brands/shop/convenience.json
+++ b/data/brands/shop/convenience.json
@@ -2251,6 +2251,25 @@
         "shop": "convenience"
       }
     },
+    {
+      "displayName": "GATE",
+      "id": "gate-243e0e",
+      "locationSet": {
+        "include": [
+          "us-fl.geojson",
+          "us-ga.geojson",
+          "us-nc.geojson",
+          "us-sc.geojson"
+        ]
+      },
+      "matchNames": ["gate petroleum"],
+      "tags": {
+        "brand": "GATE",
+        "brand:wikidata": "Q5526991",
+        "name": "GATE",
+        "shop": "convenience"
+      }
+    },
     {
       "displayName": "Gavranović",
       "id": "gavranovic-5b00ff",
diff --git a/data/brands/shop/pet.json b/data/brands/shop/pet.json
index 6fd0e4b99ae..f1ffa738754 100644
--- a/data/brands/shop/pet.json
+++ b/data/brands/shop/pet.json
@@ -425,8 +425,8 @@
     },
     {
       "displayName": "Petco",
-      "id": "petco-81a22d",
-      "locationSet": {"include": ["us"]},
+      "id": "petco-1d9238",
+      "locationSet": {"include": ["mx", "us"]},
       "tags": {
         "brand": "Petco",
         "brand:wikidata": "Q7171798",
diff --git a/data/transit/route/bus.json b/data/transit/route/bus.json
index 7b916613c0c..72a01511b10 100644
--- a/data/transit/route/bus.json
+++ b/data/transit/route/bus.json
@@ -7277,6 +7277,18 @@
       "locationSet": {"include": ["be"]},
       "tags": {"network": "IBXL", "route": "bus"}
     },
+    {
+      "displayName": "ID ŽK (Slovensko)",
+      "id": "integrovanadopravazilinskehokraja-51c51c",
+      "locationSet": {"include": ["sk"]},
+      "matchNames": ["ids žsk"],
+      "tags": {
+        "network": "Integrovaná doprava Žilinského kraja",
+        "network:short": "ID ŽK",
+        "network:wikidata": "Q105957236",
+        "route": "bus"
+      }
+    },
     {
       "displayName": "Ida- Virumaa",
       "id": "idavirumaa-fca621",
@@ -7364,16 +7376,6 @@
         "route": "bus"
       }
     },
-    {
-      "displayName": "IDS ŽSK",
-      "id": "idszsk-51c51c",
-      "locationSet": {"include": ["sk"]},
-      "tags": {
-        "network": "IDS ŽSK",
-        "network:wikidata": "Q105957236",
-        "route": "bus"
-      }
-    },
     {
       "displayName": "IDSOK",
       "id": "idsok-1bafda",
@@ -7381,7 +7383,7 @@
       "tags": {"network": "IDSOK", "route": "bus"}
     },
     {
-      "displayName": "IDZK",
+      "displayName": "IDZK (Česko)",
       "id": "integrovanadopravazlinskehokraje-1bafda",
       "locationSet": {"include": ["cz"]},
       "tags": {
@@ -10583,6 +10585,10 @@
       "locationSet": {"include": ["sk"]},
       "tags": {
         "network": "MHD Žilina",
+        "network:wikidata": "Q110521812",
+        "operator": "Dopravný podnik mesta Žiliny",
+        "operator:short": "DPMŽ",
+        "operator:wikidata": "Q13407157",
         "route": "bus"
       }
     },
diff --git a/data/transit/route/train.json b/data/transit/route/train.json
index 4934dfa4e8b..f7fdfb92480 100644
--- a/data/transit/route/train.json
+++ b/data/transit/route/train.json
@@ -743,6 +743,17 @@
         "route": "train"
       }
     },
+    {
+      "displayName": "ID ŽK (Slovensko)",
+      "id": "integrovanadopravazilinskehokraja-b6707b",
+      "locationSet": {"include": ["sk"]},
+      "tags": {
+        "network": "Integrovaná doprava Žilinského kraja",
+        "network:short": "ID ŽK",
+        "network:wikidata": "Q105957236",
+        "route": "train"
+      }
+    },
     {
       "displayName": "IDOL",
       "id": "integrovanadopravalibereckehokraje-cc6cef",
@@ -775,7 +786,7 @@
       }
     },
     {
-      "displayName": "IDZK",
+      "displayName": "IDZK (Česko)",
       "id": "integrovanadopravazlinskehokraje-cc6cef",
       "locationSet": {"include": ["cz"]},
       "tags": {
diff --git a/data/transit/route/trolleybus.json b/data/transit/route/trolleybus.json
index 1b9f992d0a8..4f93dd035ec 100644
--- a/data/transit/route/trolleybus.json
+++ b/data/transit/route/trolleybus.json
@@ -285,6 +285,19 @@
         "route": "trolleybus"
       }
     },
+    {
+      "displayName": "MHD Žilina",
+      "id": "mhdzilina-acc88b",
+      "locationSet": {"include": ["sk"]},
+      "tags": {
+        "network": "MHD Žilina",
+        "network:wikidata": "Q110521812",
+        "operator": "Dopravný podnik mesta Žiliny",
+        "operator:short": "DPMŽ",
+        "operator:wikidata": "Q13407157",
+        "route": "trolleybus"
+      }
+    },
     {
       "displayName": "Mobilis",
       "id": "mobilis-c36613",