more assorted cross-category tag matching

osmlab · Dec 2, 2024 · 1458a09 · 1458a09
1 parent dd54df8
commit 1458a09
Show file tree

Hide file tree

Showing 40 changed files with 2,292 additions and 636 deletions.
diff --git a/data/brands/amenity/bicycle_rental.json b/data/brands/amenity/bicycle_rental.json
@@ -25,6 +25,23 @@
         "operator:type": "private"
       }
     },
+    {
+      "displayName": "Aarhus Kommune",
+      "id": "aarhuskommune-578125",
+      "locationSet": {
+        "include": ["dk-82.geojson"]
+      },
+      "matchNames": ["århus kommune"],
+      "tags": {
+        "amenity": "bicycle_rental",
+        "brand": "Aarhus Kommune",
+        "brand:wikidata": "Q240262",
+        "name": "Aarhus Kommune",
+        "operator": "Aarhus Kommune",
+        "operator:type": "government",
+        "operator:wikidata": "Q240262"
+      }
+    },
     {
       "displayName": "AlbaBici",
       "id": "albabici-f59a8b",
@@ -98,22 +115,6 @@
         "operator:type": "private"
       }
     },
-    {
-      "displayName": "Århus Kommune",
-      "id": "arhuskommune-578125",
-      "locationSet": {
-        "include": ["dk-82.geojson"]
-      },
-      "tags": {
-        "amenity": "bicycle_rental",
-        "brand": "Århus Kommune",
-        "brand:wikidata": "Q240262",
-        "name": "Århus Kommune",
-        "operator": "Århus Kommune",
-        "operator:type": "government",
-        "operator:wikidata": "Q240262"
-      }
-    },
     {
       "displayName": "àVélo",
       "id": "avelo-05ea99",

diff --git a/data/brands/amenity/childcare.json b/data/brands/amenity/childcare.json
@@ -49,10 +49,10 @@
       "displayName": "Arbeiterwohlfahrt",
       "id": "arbeiterwohlfahrt-284c2e",
       "locationSet": {"include": ["de"]},
+      "matchNames": ["awo"],
       "tags": {
         "amenity": "childcare",
         "brand": "Arbeiterwohlfahrt",
-        "brand:short": "AWO",
         "brand:wikidata": "Q627256"
       }
     },

diff --git a/data/brands/amenity/kindergarten.json b/data/brands/amenity/kindergarten.json
@@ -16,21 +16,21 @@
       "displayName": "Arbeiter-Samariter-Bund (Deutschland)",
       "id": "arbeitersamariterbund-6709ec",
       "locationSet": {"include": ["de"]},
+      "matchNames": ["asb"],
       "tags": {
         "amenity": "kindergarten",
         "brand": "Arbeiter-Samariter-Bund",
-        "brand:short": "ASB",
         "brand:wikidata": "Q627071"
       }
     },
     {
       "displayName": "Arbeiterwohlfahrt",
       "id": "arbeiterwohlfahrt-6709ec",
       "locationSet": {"include": ["de"]},
+      "matchNames": ["awo"],
       "tags": {
         "amenity": "kindergarten",
         "brand": "Arbeiterwohlfahrt",
-        "brand:short": "AWO",
         "brand:wikidata": "Q627256"
       }
     },

diff --git a/data/brands/shop/telecommunication.json b/data/brands/shop/telecommunication.json
@@ -101,6 +101,9 @@
       "displayName": "Agencia ICE",
       "id": "agenciaice-478408",
       "locationSet": {"include": ["cr"]},
+      "matchNames": [
+        "instituto costarricense de electricidad"
+      ],
       "tags": {
         "brand": "ICE",
         "brand:wikidata": "Q3431114",

diff --git a/data/operators/advertising/billboard.json b/data/operators/advertising/billboard.json
@@ -321,7 +321,7 @@
       }
     },
     {
-      "displayName": "Clear Channel (UK)",
+      "displayName": "Clear Channel UK",
       "id": "clearchanneluk-7bfab1",
       "locationSet": {"include": ["gb"]},
       "tags": {

diff --git a/data/operators/advertising/column.json b/data/operators/advertising/column.json
@@ -79,8 +79,10 @@
     },
     {
       "displayName": "Compagnie des Transports Strasbourgeois",
-      "id": "compagniedestransportsstrasbourgeois-ce93ee",
-      "locationSet": {"include": ["fx"]},
+      "id": "compagniedestransportsstrasbourgeois-d2e336",
+      "locationSet": {
+        "include": ["fr-ges.geojson"]
+      },
       "tags": {
         "advertising": "column",
         "operator": "Compagnie des Transports Strasbourgeois",

diff --git a/data/operators/amenity/charging_station.json b/data/operators/amenity/charging_station.json
@@ -521,10 +521,10 @@
       "locationSet": {
         "include": ["us-md.geojson"]
       },
+      "matchNames": ["bg&e", "bge"],
       "tags": {
         "amenity": "charging_station",
         "operator": "Baltimore Gas and Electric",
-        "operator:short": "BGE",
         "operator:wikidata": "Q4852862"
       }
     },
@@ -639,6 +639,9 @@
       "locationSet": {
         "include": ["de-be.geojson"]
       },
+      "matchNames": [
+        "bew berliner energie und wärme ag"
+      ],
       "tags": {
         "amenity": "charging_station",
         "operator": "BEW",
@@ -1687,16 +1690,6 @@
         "operator:wikidata": "Q701755"
       }
     },
-    {
-      "displayName": "EDF",
-      "id": "edf-c22d3a",
-      "locationSet": {"include": ["001"]},
-      "tags": {
-        "amenity": "charging_station",
-        "operator": "EDF",
-        "operator:wikidata": "Q274591"
-      }
-    },
     {
       "displayName": "EDP",
       "id": "edp-387085",
@@ -1823,6 +1816,17 @@
         "operator:wikidata": "Q105834331"
       }
     },
+    {
+      "displayName": "Électricité de France",
+      "id": "electricitedefrance-c22d3a",
+      "locationSet": {"include": ["001"]},
+      "tags": {
+        "amenity": "charging_station",
+        "operator": "Électricité de France",
+        "operator:short": "EDF",
+        "operator:wikidata": "Q274591"
+      }
+    },
     {
       "displayName": "Electricity Authority of Cyprus",
       "id": "electricityauthorityofcyprus-fb82c8",
@@ -3399,6 +3403,9 @@
       "displayName": "ICE",
       "id": "ice-296db6",
       "locationSet": {"include": ["cr"]},
+      "matchNames": [
+        "instituto costarricense de electricidad"
+      ],
       "tags": {
         "amenity": "charging_station",
         "operator": "ICE",
@@ -5015,6 +5022,16 @@
         "operator": "RWE-Effizienz"
       }
     },
+    {
+      "displayName": "S.T.P.T.",
+      "id": "stpt-806f62",
+      "locationSet": {"include": ["ro"]},
+      "tags": {
+        "amenity": "charging_station",
+        "operator": "S.T.P.T.",
+        "operator:wikidata": "Q929687"
+      }
+    },
     {
       "displayName": "SachsenEnergie",
       "id": "sachsenenergie-b8794d",
@@ -5689,6 +5706,7 @@
       "tags": {
         "amenity": "charging_station",
         "operator": "Stadtwerke Erfurt",
+        "operator:short": "SWE",
         "operator:wikidata": "Q28543328"
       }
     },
@@ -5825,6 +5843,7 @@
       "tags": {
         "amenity": "charging_station",
         "operator": "Stadtwerke Kiel",
+        "operator:short": "SWK",
         "operator:wikidata": "Q17592555"
       }
     },
@@ -5964,6 +5983,7 @@
       "tags": {
         "amenity": "charging_station",
         "operator": "Stadtwerke Neuss",
+        "operator:short": "SWN",
         "operator:wikidata": "Q2328572"
       }
     },
@@ -6263,16 +6283,6 @@
         "operator:wikidata": "Q2328404"
       }
     },
-    {
-      "displayName": "STPT",
-      "id": "stpt-806f62",
-      "locationSet": {"include": ["ro"]},
-      "tags": {
-        "amenity": "charging_station",
-        "operator": "STPT",
-        "operator:wikidata": "Q929687"
-      }
-    },
     {
       "displayName": "Stromnetz Hamburg",
       "id": "stromnetzhamburg-43ccfe",

diff --git a/data/operators/amenity/clinic.json b/data/operators/amenity/clinic.json
@@ -1299,6 +1299,7 @@
         "amenity": "clinic",
         "healthcare": "clinic",
         "operator": "Ministerio de Salud",
+        "operator:short": "MSAL",
         "operator:type": "government",
         "operator:wikidata": "Q5420596"
       }
@@ -1361,6 +1362,7 @@
         "amenity": "clinic",
         "healthcare": "clinic",
         "operator": "Ministerio de Salud Pública",
+        "operator:short": "MSP",
         "operator:type": "government",
         "operator:wikidata": "Q22984534"
       }
@@ -1417,6 +1419,7 @@
         "amenity": "clinic",
         "healthcare": "clinic",
         "operator": "Ministry of Public Health",
+        "operator:short": "MOPH",
         "operator:type": "government",
         "operator:wikidata": "Q5970641"
       }

diff --git a/data/operators/amenity/fire_station.json b/data/operators/amenity/fire_station.json
@@ -316,6 +316,7 @@
       "tags": {
         "amenity": "fire_station",
         "operator": "California Department of Forestry and Fire Protection",
+        "operator:short": "Cal Fire",
         "operator:wikidata": "Q5020422"
       }
     },

diff --git a/data/operators/amenity/hospital.json b/data/operators/amenity/hospital.json
@@ -1228,18 +1228,19 @@
       }
     },
     {
-      "displayName": "Inova",
-      "id": "inova-37da20",
+      "displayName": "Inova Health System",
+      "id": "inovahealthsystem-37da20",
       "locationSet": {
         "include": [
           "us-md.geojson",
           "us-va.geojson"
         ]
       },
+      "matchNames": ["inova"],
       "tags": {
         "amenity": "hospital",
         "healthcare": "hospital",
-        "operator": "Inova",
+        "operator": "Inova Health System",
         "operator:type": "private",
         "operator:wikidata": "Q16996992"
       }
@@ -1902,13 +1903,14 @@
       }
     },
     {
-      "displayName": "Ministerio de Salud (Perú)",
-      "id": "ministeriodesalud-d29164",
+      "displayName": "Ministerio de Salud del Perú",
+      "id": "ministeriodesaluddelperu-d29164",
       "locationSet": {"include": ["pe"]},
+      "matchNames": ["ministerio de salud"],
       "tags": {
         "amenity": "hospital",
         "healthcare": "hospital",
-        "operator": "Ministerio de Salud",
+        "operator": "Ministerio de Salud del Perú",
         "operator:short": "MINSA",
         "operator:type": "government",
         "operator:wikidata": "Q3065012"

diff --git a/data/operators/amenity/kindergarten.json b/data/operators/amenity/kindergarten.json
@@ -1442,12 +1442,12 @@
       }
     },
     {
-      "displayName": "Save The Children",
+      "displayName": "Save the Children",
       "id": "savethechildren-0ff93d",
       "locationSet": {"include": ["001"]},
       "tags": {
         "amenity": "kindergarten",
-        "operator": "Save The Children",
+        "operator": "Save the Children",
         "operator:type": "ngo",
         "operator:wikidata": "Q215934"
       }

diff --git a/data/operators/amenity/library.json b/data/operators/amenity/library.json
@@ -1280,6 +1280,7 @@
       "tags": {
         "amenity": "library",
         "operator": "İstanbul Büyükşehir Belediyesi",
+        "operator:short": "İBB",
         "operator:type": "public",
         "operator:wikidata": "Q6085390"
       }

diff --git a/data/operators/amenity/post_office.json b/data/operators/amenity/post_office.json
@@ -913,12 +913,13 @@
       }
     },
     {
-      "displayName": "OPT",
-      "id": "opt-d4df4a",
+      "displayName": "OPT (Polynésie française)",
+      "id": "officedespostesettelecommunicationsdepolynesiefrancaise-d4df4a",
       "locationSet": {"include": ["pf"]},
       "tags": {
         "amenity": "post_office",
-        "operator": "OPT",
+        "operator": "Office des postes et télécommunications de Polynésie française",
+        "operator:short": "OPT",
         "operator:wikidata": "Q3349602"
       }
     },

diff --git a/data/operators/amenity/prison.json b/data/operators/amenity/prison.json
@@ -76,6 +76,7 @@
       "tags": {
         "amenity": "prison",
         "operator": "Bureau of Jail Management and Penology",
+        "operator:short": "BJMP",
         "operator:type": "government",
         "operator:wikidata": "Q17027213"
       }

diff --git a/data/operators/amenity/recycling.json b/data/operators/amenity/recycling.json
@@ -1741,6 +1741,7 @@
       "tags": {
         "amenity": "recycling",
         "operator": "Durance Luberon Verdon Agglomération",
+        "operator:short": "DLVA",
         "operator:wikidata": "Q2986893"
       }
     },

diff --git a/data/operators/amenity/school.json b/data/operators/amenity/school.json
@@ -15443,8 +15443,10 @@
     },
     {
       "displayName": "Durham County Council",
-      "id": "durhamcountycouncil-7a837c",
-      "locationSet": {"include": ["gb-eng"]},
+      "id": "durhamcountycouncil-9b6b70",
+      "locationSet": {
+        "include": ["gb-north-east.geojson"]
+      },
       "tags": {
         "amenity": "school",
         "operator": "Durham County Council",