From 87c39e17a61106fcd65cad3c88802ce714c5af3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=E2=84=93e=20Hensel?= Date: Mon, 15 Jul 2024 17:23:51 +1000 Subject: [PATCH 1/2] Create preset for `man_made=footwear_decontamination` (#1235) Co-authored-by: Tobias --- .../footwear_decontamination-AU-NZ.json | 33 +++++++++++++++++++ interim/icons.json | 1 + interim/source_strings.yaml | 5 +++ 3 files changed, 39 insertions(+) create mode 100644 data/presets/man_made/footwear_decontamination-AU-NZ.json diff --git a/data/presets/man_made/footwear_decontamination-AU-NZ.json b/data/presets/man_made/footwear_decontamination-AU-NZ.json new file mode 100644 index 00000000..c97e6c95 --- /dev/null +++ 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 index cc9573d0..1ad7b914 100644 --- 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 index 41aad9cd..86d1fcc7 100644 --- 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: + 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: 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 From 062459e4b33edfdfeb0df62387c50de43c64dd4d Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Mon, 15 Jul 2024 08:27:03 +0100 Subject: [PATCH 2/2] Add deprecation rules for typos in sidewalk tags (#1278) --- data/deprecated.json | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index b4a4206e..c7722674 100644 --- 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"}