From 7a3ca38093d4bf88393a93ce70abd06fbfc473cd Mon Sep 17 00:00:00 2001 From: Kyle Hensel Date: Sun, 25 May 2025 18:54:27 +0800 Subject: [PATCH 1/2] rename files this is a seperate commit to preserve the git blame --- data/presets/highway/crossing/{_zebra.json => zebra.json} | 0 data/presets/highway/footway/crossing/{_zebra.json => zebra.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename data/presets/highway/crossing/{_zebra.json => zebra.json} (100%) rename data/presets/highway/footway/crossing/{_zebra.json => zebra.json} (100%) diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/zebra.json similarity index 100% rename from data/presets/highway/crossing/_zebra.json rename to data/presets/highway/crossing/zebra.json diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/zebra.json similarity index 100% rename from data/presets/highway/footway/crossing/_zebra.json rename to data/presets/highway/footway/crossing/zebra.json From 6b307dc2791f4e770787089b8316cd40656257f0 Mon Sep 17 00:00:00 2001 From: Kyle Hensel Date: Sun, 25 May 2025 09:26:50 +0800 Subject: [PATCH 2/2] Refine the zebra crossing preset as per recent proposal --- data/fields/crossing/markings_zebra.json | 15 ++++ data/presets/highway/crossing/zebra.json | 73 +++++++++++++++++-- .../highway/footway/crossing/zebra.json | 30 ++++++-- 3 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 data/fields/crossing/markings_zebra.json diff --git a/data/fields/crossing/markings_zebra.json b/data/fields/crossing/markings_zebra.json new file mode 100644 index 00000000..229feefd --- /dev/null +++ b/data/fields/crossing/markings_zebra.json @@ -0,0 +1,15 @@ +{ + "key": "crossing:markings", + "type": "combo", + "label": "{crossing/markings}", + "autoSuggestions": false, + "default": "zebra", + "stringsCrossReference": "{crossing/markings}", + "iconsCrossReference": "{crossing/markings}", + "options": [ + "zebra", + "zebra:double", + "zebra:paired", + "zebra:bicolour" + ] +} diff --git a/data/presets/highway/crossing/zebra.json b/data/presets/highway/crossing/zebra.json index ed71daa0..f4459bf0 100644 --- a/data/presets/highway/crossing/zebra.json +++ b/data/presets/highway/crossing/zebra.json @@ -1,8 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", - "{@templates/crossing/markings}", + "crossing/markings_zebra", "{@templates/crossing/defaults}", "tactile_paving" ], @@ -15,12 +14,74 @@ ], "tags": { "highway": "crossing", - "crossing": "zebra" + "crossing": "uncontrolled", + "crossing_ref": "zebra" + }, + "addTags": { + "highway": "crossing", + "crossing": "uncontrolled", + "crossing_ref": "zebra", + "crossing:markings": "zebra" }, "reference": { - "key": "crossing", + "key": "crossing_ref", "value": "zebra" }, - "name": "{highway/crossing/uncontrolled}", - "searchable": false + "name": "Zebra Crossing", + "locationSet": { + "include": [ + "AD", + "AL", + "AT", + "AU", + "BA", + "BE", + "BG", + "BY", + "CH", + "CY", + "CZ", + "DE", + "DK", + "EE", + "ES", + "FI", + "FR", + "GR", + "HK", + "HR", + "HU", + "IE", + "IS", + "IT", + "JP", + "LI", + "LT", + "LU", + "LV", + "MC", + "MD", + "ME", + "MK", + "MT", + "NL", + "NO", + "NZ", + "PL", + "PT", + "RO", + "RS", + "RU", + "SE", + "SG", + "SI", + "SK", + "SM", + "TR", + "UA", + "UK", + "VA" + ] + }, + "matchScore": 1.01 } diff --git a/data/presets/highway/footway/crossing/zebra.json b/data/presets/highway/footway/crossing/zebra.json index 7ac1a29d..3b0b0617 100644 --- a/data/presets/highway/footway/crossing/zebra.json +++ b/data/presets/highway/footway/crossing/zebra.json @@ -1,8 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", - "{@templates/crossing/markings}", + "crossing/markings_zebra", "{@templates/crossing/defaults}", "surface" ], @@ -16,12 +15,31 @@ "tags": { "highway": "footway", "footway": "crossing", - "crossing": "zebra" + "crossing": "uncontrolled", + "crossing_ref": "zebra" + }, + "addTags": { + "highway": "footway", + "footway": "crossing", + "crossing": "uncontrolled", + "crossing_ref": "zebra", + "crossing:markings": "zebra" }, "reference": { - "key": "crossing", + "key": "crossing_ref", "value": "zebra" }, - "name": "{highway/footway/crossing/uncontrolled}", - "searchable": false + "name": "{highway/crossing/zebra}", + "locationSet": { + "include": [ + "AU", + "HK", + "JP", + "NZ", + "Q46", + "RU", + "SG" + ] + }, + "matchScore": 1.01 }