Merge pull request #1943 from good-praxis/error_cleaning

Warning cleaning (and registering/deletion of warning causing instances
osmlab · Oct 18, 2018 · c09435c · c09435c
2 parents 2eb4af6 + 49b0873
commit c09435c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 41 deletions.
diff --git a/config/canonical.json b/config/canonical.json
@@ -935,6 +935,7 @@
   "amenity/bank|Banco Unión": {
     "count": 52,
     "nomatch": [
+      "amenity/bank|UnionBank",
       "amenity/money_transfer|Express Union"
     ],
     "tags": {
@@ -1071,9 +1072,12 @@
   },
   "amenity/bank|Bancpost": {
     "count": 80,
+    "nomatch": ["amenity/bank|Postbank"],
     "tags": {
       "amenity": "bank",
       "brand": "Bancpost",
+      "brand:wikidata": "Q4854143",
+      "brand:wikipedia": "ro:Bancpost",
       "name": "Bancpost"
     }
   },
@@ -2725,6 +2729,7 @@
   },
   "amenity/bank|Liberty Bank": {
     "count": 53,
+    "nomatch": ["amenity/fuel|Liberty"],
     "tags": {
       "amenity": "bank",
       "brand": "Liberty Bank",
@@ -3160,6 +3165,7 @@
     "match": [
       "amenity/bank|Postbank Finanzcenter"
     ],
+    "nomatch": ["amenity/bank|Bancpost"],
     "tags": {
       "amenity": "bank",
       "brand": "Postbank",
@@ -3793,6 +3799,7 @@
   "amenity/bank|UnionBank": {
     "count": 90,
     "match": ["amenity/bank|Union Bank"],
+    "nomatch": ["amenity/bank|Banco Unión"],
     "tags": {
       "amenity": "bank",
       "brand": "UnionBank",
@@ -3900,6 +3907,9 @@
   },
   "amenity/bank|Western Union": {
     "count": 471,
+    "match": [
+      "amenity/bureau_de_change|Western Union"
+    ],
     "tags": {
       "amenity": "bank",
       "brand": "Western Union",
@@ -5419,14 +5429,6 @@
       "name": "Travelex"
     }
   },
-  "amenity/bureau_de_change|Western Union": {
-    "count": 168,
-    "tags": {
-      "amenity": "bureau_de_change",
-      "brand": "Western Union",
-      "name": "Western Union"
-    }
-  },
   "amenity/cafe|85度C": {
     "count": 162,
     "tags": {
@@ -5512,17 +5514,6 @@
       "name": "Café Amazon"
     }
   },
-  "amenity/cafe|Café Central": {
-    "count": 132,
-    "match": ["amenity/cafe|Cafe Central"],
-    "tags": {
-      "amenity": "cafe",
-      "brand": "Café Central",
-      "brand:wikidata": "Q694757",
-      "brand:wikipedia": "en:Café Central",
-      "name": "Café Central"
-    }
-  },
   "amenity/cafe|Café Martínez": {
     "count": 162,
     "tags": {
@@ -5565,14 +5556,6 @@
       "name": "Caribou Coffee"
     }
   },
-  "amenity/cafe|Central": {
-    "count": 52,
-    "tags": {
-      "amenity": "cafe",
-      "brand": "Central",
-      "name": "Central"
-    }
-  },
   "amenity/cafe|Chatime": {
     "count": 61,
     "tags": {
@@ -9054,18 +9037,26 @@
       "amenity/fuel|ESSO",
       "amenity/fuel|Station Esso"
     ],
-    "nomatch": ["shop/convenience|Esso"],
+    "nomatch": [
+      "amenity/fuel|Esso Express",
+      "shop/convenience|Esso"
+    ],
     "tags": {
       "amenity": "fuel",
       "brand": "Esso",
+      "brand:wikidata": "Q867662",
+      "brand:wikipedia": "en:Esso",
       "name": "Esso"
     }
   },
   "amenity/fuel|Esso Express": {
     "count": 199,
+    "nomatch": ["amenity/fuel|Esso"],
     "tags": {
       "amenity": "fuel",
-      "brand": "Esso Express",
+      "brand": "Esso",
+      "brand:wikidata": "Q867662",
+      "brand:wikipedia": "en:Esso",
       "name": "Esso Express"
     }
   },
@@ -9422,20 +9413,15 @@
   },
   "amenity/fuel|Kroger": {
     "count": 64,
+    "match": ["amenity/fuel|Kroger Fuel"],
     "tags": {
       "amenity": "fuel",
       "brand": "Kroger",
+      "brand:wikidata": "Q153417",
+      "brand:wikipedia": "en:Kroger",
       "name": "Kroger"
     }
   },
-  "amenity/fuel|Kroger Fuel": {
-    "count": 135,
-    "tags": {
-      "amenity": "fuel",
-      "brand": "Kroger Fuel",
-      "name": "Kroger Fuel"
-    }
-  },
   "amenity/fuel|Kum & Go": {
     "count": 168,
     "nomatch": ["shop/convenience|Kum & Go"],
@@ -9464,6 +9450,7 @@
   },
   "amenity/fuel|Liberty": {
     "count": 112,
+    "nomatch": ["amenity/bank|Liberty Bank"],
     "tags": {
       "amenity": "fuel",
       "brand": "Liberty",

diff --git a/config/filters.json b/config/filters.json
@@ -63,7 +63,8 @@
         "^bread$",
         "^(bureau de |)change$",
         "^bureau de poste$",
-        "^caf(e|é)(t(e|é)r(i|í)a)?$",
+        "^caf(e|é)(t(e|é)r(i|í)a)?( )?(central)?$",
+        "^central$",
         "^centro naturista$",
         "^cine(ma)?$",
         "^cleaners$",

diff --git a/dist/discardNames.json b/dist/discardNames.json
@@ -160,10 +160,13 @@
   "amenity/cafe|Bar": 168,
   "amenity/cafe|Bistro": 68,
   "amenity/cafe|Cafe": 308,
+  "amenity/cafe|Cafe Central": 52,
   "amenity/cafe|Cafeteria": 694,
   "amenity/cafe|Cafetería": 110,
   "amenity/cafe|Café": 318,
+  "amenity/cafe|Café Central": 132,
   "amenity/cafe|Cafétéria": 58,
+  "amenity/cafe|Central": 52,
   "amenity/cafe|Coffee": 51,
   "amenity/cafe|Coffee Shop": 211,
   "amenity/cafe|Eisdiele": 89,

diff --git a/dist/keepNames.json b/dist/keepNames.json
@@ -634,19 +634,16 @@
   "amenity/cafe|Barista": 68,
   "amenity/cafe|Bonafide": 64,
   "amenity/cafe|Cafe Amazon": 66,
-  "amenity/cafe|Cafe Central": 52,
   "amenity/cafe|Cafe Coffee Day": 270,
   "amenity/cafe|Cafe Nero": 65,
   "amenity/cafe|Caffe Nero": 132,
   "amenity/cafe|Caffè Nero": 229,
   "amenity/cafe|Café Amazon": 255,
-  "amenity/cafe|Café Central": 132,
   "amenity/cafe|Café Martínez": 162,
   "amenity/cafe|Café de la Gare": 52,
   "amenity/cafe|Café de la Place": 67,
   "amenity/cafe|Café des Sports": 79,
   "amenity/cafe|Caribou Coffee": 201,
-  "amenity/cafe|Central": 52,
   "amenity/cafe|Chatime": 61,
   "amenity/cafe|Coffee Fellows": 84,
   "amenity/cafe|Coffee House": 84,