Swap out mergeStrategy idea with simpler preserveTags array

(closes #4906)
osmlab · Feb 24, 2021 · deb8799 · deb8799
1 parent de8e23c
commit deb8799
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 58 deletions.
diff --git a/data/brands/amenity/bar.json b/data/brands/amenity/bar.json
@@ -2,6 +2,7 @@
   "properties": {
     "path": "brands/amenity/bar",
     "skipCollection": true,
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": ["^(pool|snack)?\\s?bar$"],
       "named": ["^уют$"]

diff --git a/data/brands/amenity/cinema.json b/data/brands/amenity/cinema.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/cinema",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": ["^cine(ma)?$"],
       "named": ["^октябрь$"]

diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/fuel",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^((drummed|independent|جایگاه) )?(cng|filling|fuel|gas|gpl|gnv|lpg|petrol)( (station|pump))?$",

diff --git a/data/brands/amenity/pharmacy.json b/data/brands/amenity/pharmacy.json
@@ -4,9 +4,8 @@
     "exclude": {
       "generic": [
         "^(alte )?apotheke( am markt)?$",
+        "^(apotek(a|et)|apteka?)$",
         "^(centro naturista|eczane|botica|gyógyszertár|lékárna|ljekarna|parafarmacia)$",
-        "^apotek(a|et)$",
-        "^aptek(a)?$",
         "^droguer[ií]a$",
         "^farm[aàá]ci[aàáe]?$",
         "^pharmac(ie|y)$",

diff --git a/data/brands/amenity/pub.json b/data/brands/amenity/pub.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/pub",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^(bar|bistro|pub)$",

diff --git a/data/brands/amenity/social_centre.json b/data/brands/amenity/social_centre.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/social_centre",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^social centre$"]}
   },
   "items": [

diff --git a/data/brands/amenity/vending_machine.json b/data/brands/amenity/vending_machine.json
@@ -43,6 +43,7 @@
         "amazon ロッカー",
         "アマゾン・ハブ・ロッカー"
       ],
+      "preserveTags": ["^name"],
       "tags": {
         "amenity": "vending_machine",
         "brand": "Amazon Hub ロッカー",
@@ -62,6 +63,7 @@
       "locationSet": {
         "include": ["de", "gb", "us"]
       },
+      "preserveTags": ["^name"],
       "tags": {
         "amenity": "vending_machine",
         "brand": "Amazon Locker",

diff --git a/data/brands/landuse/residential.json b/data/brands/landuse/residential.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/landuse/residential",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^residential$"]}
   },
   "items": [

diff --git a/data/brands/office/insurance.json b/data/brands/office/insurance.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/office/insurance",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^insurance$"]}
   },
   "items": [

diff --git a/data/brands/shop/car.json b/data/brands/shop/car.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/shop/car",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^(car|mécanique)$",

diff --git a/data/brands/shop/car_repair.json b/data/brands/shop/car_repair.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/shop/car_repair",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^(auto serwis|car repair)$",

diff --git a/data/brands/shop/electronics.json b/data/brands/shop/electronics.json
@@ -48,6 +48,7 @@
       "displayName": "Apple Store",
       "id": "applestore-9377b7",
       "locationSet": {"include": ["001"]},
+      "preserveTags": ["^name"],
       "tags": {
         "brand": "Apple Store",
         "brand:wikidata": "Q421253",

diff --git a/data/brands/shop/motorcycle.json b/data/brands/shop/motorcycle.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/shop/motorcycle",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": ["^motorcycle$"],
       "named": ["^independent$"]

diff --git a/data/brands/tourism/hotel.json b/data/brands/tourism/hotel.json
@@ -8,9 +8,9 @@
         "^гостиница$"
       ],
       "named": [
-        "^(h(o|ô)tel\\s)?((zur\\s)?post|de france|de la gare|строитель)$",
-        "^(h(o|ô)tel\\s)?(astoria|belvedere|central|city|colonial|continental|europa)\\s?(h(o|ô)tel)?$",
-        "^(h(o|ô)tel\\s)?(grand|imperial|krone|palace|panorama|park|plaza|royal|victoria)\\s?(h(o|ô)tel)?$",
+        "^(h[oô]tel )?((zur )?post|de france|de la gare|строитель)$",
+        "^(h[oô]tel )?(astoria|belvedere|central|city|colonial|continental|europa)\\s?(h[oô]tel)?$",
+        "^(h[oô]tel )?(grand|imperial|krone|palace|panorama|park|plaza|royal|victoria)\\s?(h[oô]tel)?$",
         "^budget inn$"
       ]
     }

diff --git a/data/flags/man_made/flagpole.json b/data/flags/man_made/flagpole.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "flags/man_made/flagpole",
+    "preserveTags": ["^flag:name"],
     "exclude": {"generic": ["^flagpole$"]}
   },
   "items": [

diff --git a/data/operators/amenity/hospital.json b/data/operators/amenity/hospital.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "operators/amenity/hospital",
+    "preserveTags": ["^emergency$", "^name"],
     "exclude": {
       "generic": [
         "^(govern?ment( authorities)?|govt( hospital)?|municipal|private|public|private not for profit|village)$",

diff --git a/data/operators/amenity/parking.json b/data/operators/amenity/parking.json
@@ -2,6 +2,7 @@
   "properties": {
     "path": "operators/amenity/parking",
     "skipCollection": true,
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^parking( lot)?$",

diff --git a/data/operators/amenity/post_depot.json b/data/operators/amenity/post_depot.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "operators/amenity/post_depot",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^post depot$"]}
   },
   "items": [

diff --git a/data/operators/amenity/post_office.json b/data/operators/amenity/post_office.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "operators/amenity/post_office",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^(agencja pocztowa|ufficio postale|urząd pocztowy)$",

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/trees.json b/dist/trees.json
@@ -125,9 +125,9 @@
         "^shop/supermarket\\|(famiglia cooperativa|семейный)$",
         "^shop/tailor\\|couture\\s?(dame|homme|mixte)?$",
         "^tourism/(h|m)otel\\|budget inn$",
-        "^tourism/hotel\\|(h(o|ô)tel\\s)?((zur\\s)?post|de france|de la gare|строитель)$",
-        "^tourism/hotel\\|(h(o|ô)tel\\s)?(astoria|belvedere|central|city|continental|europa)\\s?(h(o|ô)tel)?$",
-        "^tourism/hotel\\|(h(o|ô)tel\\s)?(grand|imperial|krone|palace|panorama|park|plaza|royal|victoria)\\s?(h(o|ô)tel)?$"
+        "^tourism/hotel\\|(h[oô]tel\\s)?((zur\\s)?post|de france|de la gare|строитель)$",
+        "^tourism/hotel\\|(h[oô]tel\\s)?(astoria|belvedere|central|city|continental|europa)\\s?(h[oô]tel)?$",
+        "^tourism/hotel\\|(h[oô]tel\\s)?(grand|imperial|krone|palace|panorama|park|plaza|royal|victoria)\\s?(h[oô]tel)?$"
       ]
     },
     "flags": {

diff --git a/lib/file_tree.js b/lib/file_tree.js
@@ -220,12 +220,12 @@ exports.write = (cache) => {
 
           // clean locationSet
           let cleaned = {};
-          if (item.locationSet.include) {
+          if (Array.isArray(item.locationSet.include)) {
             cleaned.include = item.locationSet.include.map(_cleanLower).sort(withLocale);
           } else {
             cleaned.include = ['001'];  // default to world
           }
-          if (item.locationSet.exclude) {
+          if (Array.isArray(item.locationSet.exclude)) {
             cleaned.exclude = item.locationSet.exclude.map(_cleanLower).sort(withLocale);
           }
           item.locationSet = cleaned;
@@ -257,21 +257,21 @@ exports.write = (cache) => {
       let cleanedProps = {};
       cleanedProps.path = tkv;
 
-      if (properties.nameTag) {
-        cleanedProps.nameTag = properties.nameTag;
-      }
       if (properties.skipCollection) {
         cleanedProps.skipCollection = properties.skipCollection;
       }
+      if (Array.isArray(properties.preserveTags)) {
+        cleanedProps.preserveTags = properties.preserveTags.map(_cleanLower).sort(withLocale)
+      }
 
       cleanedProps.exclude = {};
-      if (properties.exclude.generic) {
+      if (Array.isArray(properties.exclude.generic)) {
         cleanedProps.exclude.generic = properties.exclude.generic.map(_cleanLower).sort(withLocale);
       } else {
         const v2 = v.replace(/_/g, ' ');    // add the value as a generic name exclude (e.g. 'restaurant')
         cleanedProps.exclude.generic = [`^${v2}$`];
       }
-      if (properties.exclude.named) {
+      if (Array.isArray(properties.exclude.named)) {
         cleanedProps.exclude.named = properties.exclude.named.map(_cleanLower).sort(withLocale);
       }
 

diff --git a/schema/categories.json b/schema/categories.json
@@ -19,45 +19,9 @@
           "pattern": "^\\S+/\\S+/\\S+$"
         },
 
-        "mergeStrategy": {
-          "$comment": "Values here should be patterns that match OSM tag keys",
-          "description": "(optional) Strategy to take when merging tag values from name-suggestion-index into OpenStreetMap",
-          "type": "object",
-          "required": [],
-          "additionalProperties": false,
-
-          "properties": {
-            "add": {
-              "description": "(optional) Values in OSM can be added, but existing values should not be modified",
-              "examples": ["^building$", "^flag:name$", "^takeaway$"],
-              "type": "array",
-              "uniqueItems": true,
-              "items": {
-                "type": "string",
-                "format": "regex"
-              }
-            },
-            "replace": {
-              "description": "(optional) Values in OSM are always replaced with values in NSI",
-              "default": [".*"],
-              "type": "array",
-              "uniqueItems": true,
-              "items": {
-                "type": "string",
-                "format": "regex"
-              }
-            },
-            "ignore": {
-              "description": "(optional) Values in NSI are never used to update OSM",
-              "examples": ["^payment:"],
-              "type": "array",
-              "uniqueItems": true,
-              "items": {
-                "type": "string",
-                "format": "regex"
-              }
-            }
-          }
+        "preserveTags": {
+          "description": "(optional) For tags matching these patterns, NSI should not replace an existing value in OSM",
+          "$ref": "#/definitions/preserveTags"
         },
 
         "skipCollection": {
@@ -169,6 +133,17 @@
       "pattern": "^.*\\.geojson$"
     },
 
+    "preserveTags": {
+      "description": "(optional) For tags matching these patterns, NSI should not replace an existing value in OSM",
+      "examples": ["^name"],
+      "type": "array",
+      "uniqueItems": true,
+      "items": {
+        "type": "string",
+        "pattern": "^\\S+$"
+      }
+    },
+
     "notTags": {
       "description": "A list of properties that we never want as tags, this is to prevent common mistakes",
       "type": "object",
@@ -178,10 +153,10 @@
         "id":              { "not" : {} },
         "include":         { "not" : {} },
         "locationSet":     { "not" : {} },
-        "mergeStrategy":   { "not" : {} },
         "matchNames":      { "not" : {} },
         "matchTags":       { "not" : {} },
         "path":            { "not" : {} },
+        "preserveTags":    { "not" : {} },
         "note":            { "not" : {} },
         "skipCollection":  { "not" : {} },
         "tags":            { "not" : {} },
@@ -232,6 +207,11 @@
           }
         },
 
+        "preserveTags": {
+          "description": "(optional) For tags matching these patterns, NSI should not replace an existing value in OSM",
+          "$ref": "#/definitions/preserveTags"
+        },
+
         "note": {
           "description": "(optional) An optional note - can contain anything about the item.",
           "type": "string"
@@ -302,9 +282,8 @@
             { "$ref": "#/definitions/notTags" }
           ]
         }
-
       }
     }
-  }
 
+  }
 }