Merge branch 'openstreetmap:main' into main

kjonosm · Jul 15, 2024 · 8a2b278 · 8a2b278
2 parents c2505f0 + 062459e
commit 8a2b278
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 4 deletions.
diff --git a/data/deprecated.json b/data/deprecated.json
@@ -686,10 +686,6 @@
     "old": {"footway": "both"},
     "replace": {"sidewalk": "both"}
   },
-  {
-    "old": {"sidewalk": "none"},
-    "replace": {"sidewalk": "no"}
-  },
   {
     "old": {"footway": "crossing", "highway": "cycleway"},
     "replace": {"cycleway": "crossing", "highway": "cycleway"}
@@ -1552,6 +1548,42 @@
     "old": {"shop": "winery"},
     "replace": {"craft": "winery"}
   },
+  {
+    "old": {"sidewalks": "*"},
+    "replace": {"sidewalk": "$1"}
+  },
+  {
+    "old": {"sidewalk": "none"},
+    "replace": {"sidewalk": "no"}
+  },
+  {
+    "old": {"sidewalk:left": "none"},
+    "replace": {"sidewalk:left": "no"}
+  },
+  {
+    "old": {"sidewalk:right": "none"},
+    "replace": {"sidewalk:right": "no"}
+  },
+  {
+    "old": {"sidewalk:both": "none"},
+    "replace": {"sidewalk:both": "no"}
+  },
+  {
+    "old": {"sidewalk": "seperate"},
+    "replace": {"sidewalk": "separate"}
+  },
+  {
+    "old": {"sidewalk:left": "seperate"},
+    "replace": {"sidewalk:left": "separate"}
+  },
+  {
+    "old": {"sidewalk:right": "seperate"},
+    "replace": {"sidewalk:right": "separate"}
+  },
+  {
+    "old": {"sidewalk:both": "seperate"},
+    "replace": {"sidewalk:both": "separate"}
+  },
   {
     "old": {"sloped_curb": "0"},
     "replace": {"kerb": "flush"}

diff --git a/data/presets/man_made/footwear_decontamination-AU-NZ.json b/data/presets/man_made/footwear_decontamination-AU-NZ.json
@@ -0,0 +1,33 @@
+{
+    "icon": "temaki-footwear_decontamination",
+    "fields": [
+        "operator",
+        "capacity"
+    ],
+    "moreFields": [
+        "{@templates/poi}",
+        "covered"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "footwear cleaning",
+        "shoe cleaning",
+        "boot cleaning",
+        "contamination station",
+        "decontamination station"
+    ],
+    "tags": {
+        "man_made": "footwear_decontamination"
+    },
+    "name": "Footwear Decontamination Station",
+    "locationSet": {
+        "include": [
+            "AU",
+            "NZ"
+        ]
+    }
+}
diff --git a/interim/icons.json b/interim/icons.json
@@ -583,6 +583,7 @@
     "temaki-fireplace",
     "temaki-fish_cleaning",
     "temaki-fish_ladder",
+    "temaki-footwear_decontamination",
     "temaki-fountain",
     "temaki-freight_car",
     "temaki-furniture",

diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
@@ -10613,6 +10613,11 @@ en:
         # man_made=flagpole | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Flagpole
         terms: <translate with synonyms or related terms for 'Flagpole', separated by commas>
+      man_made/footwear_decontamination-AU-NZ:
+        # man_made=footwear_decontamination | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "AU", "NZ"
+        name: Footwear Decontamination Station
+        # 'terms: footwear cleaning,shoe cleaning,boot cleaning,contamination station,decontamination station'
+        terms: <translate with synonyms or related terms for 'Footwear Decontamination Station', separated by commas>
       man_made/flare:
         # man_made=flare | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Gas Flare