From 7999e2adbb814dd165b48f67e96eb26e9cdd940c Mon Sep 17 00:00:00 2001 From: Johnny Accot Date: Sat, 5 Feb 2022 08:47:41 +0100 Subject: [PATCH 1/4] Fix data/presets/amenity/ticket_validator format --- data/presets/amenity/ticket_validator | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/presets/amenity/ticket_validator b/data/presets/amenity/ticket_validator index f749873c3..d563240d8 100644 --- a/data/presets/amenity/ticket_validator +++ b/data/presets/amenity/ticket_validator @@ -2,7 +2,7 @@ "icon": "temaki-vending_machine", "fields": [ "ref", - "operator", + "operator" ], "moreFields": [ "colour", @@ -20,13 +20,12 @@ "terms": [ "ticket", "validator", - "puncher", + "puncher" ], - }, "aliases": [ "ticket puncher", "punching machine", - "ticket marker", + "ticket marker" ], "name": "Ticket Validator" } From cca04d9b32161670ae3729b95e0acb6e4926c0ee Mon Sep 17 00:00:00 2001 From: Johnny Accot Date: Sat, 5 Feb 2022 08:51:58 +0100 Subject: [PATCH 2/4] Fix reference to disc_golf_basket icon, which is from temaki, not maki --- data/presets/disc_golf/basket.json | 2 +- data/presets/disc_golf/tee.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/disc_golf/basket.json b/data/presets/disc_golf/basket.json index 846af1b04..6e11b5781 100644 --- a/data/presets/disc_golf/basket.json +++ b/data/presets/disc_golf/basket.json @@ -1,5 +1,5 @@ { - "icon": "maki-disc_golf_basket", + "icon": "temaki-disc_golf_basket", "geometry": [ "point", "vertex" diff --git a/data/presets/disc_golf/tee.json b/data/presets/disc_golf/tee.json index 72bfc64a1..3a5502527 100644 --- a/data/presets/disc_golf/tee.json +++ b/data/presets/disc_golf/tee.json @@ -1,5 +1,5 @@ { - "icon": "maki-disc_golf_basket", + "icon": "temaki-disc_golf_basket", "fields": [ "surface" ], From 9d6f2193be4bb1ec07e58d4c2c0fc8632b859934 Mon Sep 17 00:00:00 2001 From: Johnny Accot Date: Sat, 5 Feb 2022 10:40:29 +0100 Subject: [PATCH 3/4] Fixed space in preset name (water_reservoir_covered) --- ...ater_reservoir covered.json => water_reservoir_covered.json} | 0 interim/source_strings.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename data/presets/emergency/{water_reservoir covered.json => water_reservoir_covered.json} (100%) diff --git a/data/presets/emergency/water_reservoir covered.json b/data/presets/emergency/water_reservoir_covered.json similarity index 100% rename from data/presets/emergency/water_reservoir covered.json rename to data/presets/emergency/water_reservoir_covered.json diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b06206dc6..2799cd2bc 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5640,7 +5640,7 @@ en: name: Emergency Water Reservoir # 'terms: basin,reservoir,extinguishing,firefighting' terms: - emergency/water_reservoir covered: + emergency/water_reservoir_covered: # emergency=water_tank + man_made=reservoir_covered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Emergency Water Reservoir (Underground) # 'terms: cistern,reservoir,extinguishing,firefighting' From 7efb6348af69ef147426455665a830fd25c024ff Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 7 Feb 2022 14:32:14 +0100 Subject: [PATCH 4/4] use proper file ending --- data/presets/amenity/{ticket_validator => ticket_validator.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/presets/amenity/{ticket_validator => ticket_validator.json} (100%) diff --git a/data/presets/amenity/ticket_validator b/data/presets/amenity/ticket_validator.json similarity index 100% rename from data/presets/amenity/ticket_validator rename to data/presets/amenity/ticket_validator.json