Merge branch 'osmlab:main' into main

gosgtan · Mar 13, 2024 · 0ee9f6b · 0ee9f6b
2 parents 7a04c95 + 6f1ef95
commit 0ee9f6b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/data/brands/shop/convenience.json b/data/brands/shop/convenience.json
@@ -5109,14 +5109,14 @@
       }
     },
     {
-      "displayName": "Березка",
+      "displayName": "Берёзка",
       "id": "5eefb7-854be4",
       "locationSet": {"include": ["bg"]},
-      "matchNames": ["берьозка"],
+      "matchNames": ["березка", "берьозка"],
       "tags": {
-        "brand": "Березка",
+        "brand": "Берёзка",
         "brand:wikidata": "Q115656510",
-        "name": "Березка",
+        "name": "Берёзка",
         "shop": "convenience"
       }
     },

diff --git a/data/brands/shop/storage_rental.json b/data/brands/shop/storage_rental.json
@@ -273,6 +273,17 @@
         "shop": "storage_rental"
       }
     },
+    {
+      "displayName": "SecurCare Self Storage",
+      "id": "securcareselfstorage-7879a0",
+      "locationSet": {"include": ["us"]},
+      "tags": {
+        "brand": "SecurCare Self Storage",
+        "brand:wikidata": "Q124821649",
+        "name": "SecurCare Self Storage",
+        "shop": "storage_rental"
+      }
+    },
     {
       "displayName": "SecureSpace Self Storage",
       "id": "securespaceselfstorage-7879a0",

diff --git a/data/operators/office/government.json b/data/operators/office/government.json
@@ -40,6 +40,17 @@
         "operator:wikidata": "Q31840061"
       }
     },
+    {
+      "displayName": "Automobile Club d'Italia",
+      "locationSet": {"include": ["it"]},
+      "tags": {
+        "government": "transportation",
+        "office": "government",
+        "operator": "Automobile Club d'Italia",
+        "operator:wikidata": "Q3630538",
+        "short_name": "ACI"
+      }
+    },
     {
       "displayName": "Autoridad Nacional del Agua",
       "id": "autoridadnacionaldelagua-7429f2",

diff --git a/data/operators/power/generator.json b/data/operators/power/generator.json
@@ -230,9 +230,10 @@
     {
       "displayName": "Alabama Power",
       "id": "alabamapower-74685d",
-      "locationSet": {"include": ["001"]},
+      "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "Alabama Power",
+        "operator:wikidata": "Q4705296",
         "power": "generator"
       }
     },
@@ -356,6 +357,7 @@
       "locationSet": {"include": ["001"]},
       "tags": {
         "operator": "Ameren",
+        "operator:wikidata": "Q462984",
         "power": "generator"
       }
     },
@@ -439,6 +441,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "Apex Clean Energy",
+        "operator:wikidata": "Q124800550",
         "power": "generator"
       }
     },
@@ -1103,9 +1106,10 @@
     {
       "displayName": "Capstone Infrastructure",
       "id": "capstoneinfrastructure-74685d",
-      "locationSet": {"include": ["001"]},
+      "locationSet": {"include": ["ca"]},
       "tags": {
         "operator": "Capstone Infrastructure",
+        "operator:wikidata": "Q5036370",
         "power": "generator"
       }
     },
@@ -1230,6 +1234,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "Chevron",
+        "operator:wikidata": "Q319642",
         "power": "generator"
       }
     },
@@ -1275,6 +1280,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "City of Shafter",
+        "operator:wikidata": "Q985258",
         "power": "generator"
       }
     },
@@ -1284,6 +1290,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "City of Truth or Consequences",
+        "operator:wikidata": "Q431932",
         "power": "generator"
       }
     },
@@ -3036,6 +3043,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "FirstEnergy",
+        "operator:wikidata": "Q1419248",
         "power": "generator"
       }
     },
@@ -4975,15 +4983,6 @@
         "power": "generator"
       }
     },
-    {
-      "displayName": "NextEra Wind Energy",
-      "id": "nexterawindenergy-4cccf0",
-      "locationSet": {"include": ["ca", "us"]},
-      "tags": {
-        "operator": "NextEra Wind Energy",
-        "power": "generator"
-      }
-    },
     {
       "displayName": "Noble Power",
       "id": "noblepower-19ecba",
@@ -6474,6 +6473,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "Southern Power Co",
+        "operator:wikidata": "Q116866621",
         "power": "generator"
       }
     },
@@ -6902,6 +6902,7 @@
       "locationSet": {"include": ["us"]},
       "tags": {
         "operator": "Target Corporation",
+        "operator:wikidata": "Q1046951",
         "power": "generator"
       }
     },