From 204cb2300ac1187ffb5351138a333d3d8f36c451 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 13 Feb 2020 10:33:05 -0500 Subject: [PATCH] Squashed commit of the following: commit 82e230007fca02d486c3b2fa135d76bca8593d21 Merge: 2ed4acaf2 1cc6237c7 Author: Bryan Housel Date: Thu Feb 13 10:30:56 2020 -0500 Merge branch '7347_new' of https://github.com/animesh-007/iD into animesh-007-7347_new commit 1cc6237c78d5a582417eae700767d6605fbc7e27 Author: animesh-007 Date: Thu Feb 13 20:47:57 2020 +0530 deleted spike.json commit 5bba63c36ad040ea8eaf4f139bbc99cb8b941e54 Author: animesh-007 Date: Thu Feb 13 20:45:01 2020 +0530 named properly commit 96426f3efdf65c9eee2125fd036c077cd4d0a35d Author: animesh-007 Date: Thu Feb 13 01:25:23 2020 +0530 modified spike.json commit 40c092c1ea1bc56e078cbf94f2d9e69b5bc4e40f Author: animesh-007 Date: Thu Feb 13 01:22:53 2020 +0530 deleted spike_strip.json commit 679a409aacd0320b6cbbb470065c6efd7c9e0429 Author: animesh-007 Date: Thu Feb 13 00:55:38 2020 +0530 renamed to spike strip commit e484aea0ec4bdf456a697ed9bf170076e12486b4 Author: animesh-007 Date: Thu Feb 13 00:52:50 2020 +0530 removed spike.json commit 60ea432a5e3a4aeba8063232fbf1497305be90a2 Author: animesh-007 Date: Wed Feb 12 19:08:08 2020 +0530 spike preset --- data/presets.yaml | 4 ++++ data/presets/presets.json | 1 + data/presets/presets/barrier/spikes.json | 12 ++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 5 files changed, 22 insertions(+) create mode 100644 data/presets/presets/barrier/spikes.json diff --git a/data/presets.yaml b/data/presets.yaml index bfd737edf..9a7bedc8c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4179,6 +4179,10 @@ en: name: Sally Port # 'terms: Postern,castle side gate' terms: '' + barrier/spikes: + # barrier=spikes + name: Spike Strip + terms: '' barrier/stile: # barrier=stile name: Stile diff --git a/data/presets/presets.json b/data/presets/presets.json index be991f4b5..0643909b8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -321,6 +321,7 @@ "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"}, + "barrier/spikes": {"icon": "maki-fence", "geometry": ["vertex"], "tags": {"barrier": "spikes"}, "name": "Spike Strip", "matchScore": 0.5}, "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"}, "barrier/swing_gate": {"icon": "temaki-gate", "fields": ["{barrier/gate}"], "moreFields": ["{barrier/gate}"], "geometry": ["vertex"], "tags": {"barrier": "swing_gate"}, "name": "Swing Gate"}, "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, diff --git a/data/presets/presets/barrier/spikes.json b/data/presets/presets/barrier/spikes.json new file mode 100644 index 000000000..b85086376 --- /dev/null +++ b/data/presets/presets/barrier/spikes.json @@ -0,0 +1,12 @@ +{ + "icon": "maki-fence", + + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "spikes" + }, + "name": "Spike Strip", + "matchScore": 0.50 +} diff --git a/data/taginfo.json b/data/taginfo.json index 1ac3aec65..b973f62ff 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -318,6 +318,7 @@ {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/lift_gate.svg"}, {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/wall.svg"}, {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"}, + {"key": "barrier", "value": "spikes", "description": "🄿 Spike Strip", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fence-15.svg"}, {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, {"key": "barrier", "value": "swing_gate", "description": "🄿 Swing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gate.svg"}, {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index eb6fd1890..5894cfd50 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6163,6 +6163,10 @@ "name": "Sally Port", "terms": "Postern,castle side gate" }, + "barrier/spikes": { + "name": "Spike Strip", + "terms": "" + }, "barrier/stile": { "name": "Stile", "terms": ""