CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-17 14:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move barrier=bollard as a line into a Bollard Row preset

Browse Source 
Add additional fields to bollard presets, including a Type field for the `bollard` key
This commit is contained in:
Quincy Morgan
2019-09-18 10:07:55 -04:00
parent 55392f5eae
commit 085dd4e890
8 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+7
View File
@@ -292,6 +292,9 @@ en:
board_type:
# board_type=*
label: Type
bollard:
# bollard=*
label: Type
booth:
# booth=*
label: Booth
@@ -3765,6 +3768,10 @@ en:
# barrier=bollard
name: Bollard
terms: '<translate with synonyms or related terms for ''Bollard'', separated by commas>'
barrier/bollard_line:
# barrier=bollard
name: Bollard Row
terms: '<translate with synonyms or related terms for ''Bollard Row'', separated by commas>'
barrier/border_control:
# barrier=border_control
name: Border Control
data/presets/fields.json
+1
View File
@@ -40,6 +40,7 @@
"bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
"blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
"board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"},
"bollard": {"key": "bollard", "type": "combo", "label": "Type"},
"booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
"boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
"boundary": {"key": "boundary", "type": "combo", "label": "Type"},
data/presets/fields/bollard.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "bollard",
"type": "combo",
"label": "Type"
}
data/presets/presets.json
+2 -1
View File
@@ -280,7 +280,8 @@
"barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "moreFields": ["level"], "name": "Barrier", "matchScore": 0.4},
"barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
"barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
"barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
"barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
"barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
"barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
"barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
"barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
data/presets/presets/barrier/bollard.json
+7 -4
View File
@@ -1,13 +1,16 @@
{
"icon": "maki-roadblock",
"icon": "temaki-silo",
"fields": [
"access",
"material"
"bollard",
"height",
"width",
"material",
"colour"
],
"geometry": [
"point",
"vertex",
"line"
"vertex"
],
"tags": {
"barrier": "bollard"
data/presets/presets/barrier/bollard_line.json
+17
View File
@@ -0,0 +1,17 @@
{
"icon": "temaki-silo",
"fields": [
"access",
"bollard",
"height",
"material",
"colour"
],
"geometry": [
"line"
],
"tags": {
"barrier": "bollard"
},
"name": "Bollard Row"
}
data/taginfo.json
+2 -1
View File
@@ -277,7 +277,7 @@
{"key": "barrier", "description": "🄿 Barrier, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
{"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
{"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
{"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
{"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
{"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
{"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
{"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
@@ -1280,6 +1280,7 @@
{"key": "blood:", "value": "platelets", "description": "🄵 Blood Components"},
{"key": "blood:", "value": "stemcells", "description": "🄵 Blood Components"},
{"key": "board_type", "description": "🄵 Type"},
{"key": "bollard", "description": "🄵 Type"},
{"key": "booth", "description": "🄵 Booth"},
{"key": "boules", "description": "🄵 Type"},
{"key": "brand", "description": "🄵 Brand"},
dist/locales/en.json
Vendored
+8
View File
@@ -2705,6 +2705,10 @@
"label": "Type",
"terms": ""
},
"bollard": {
"label": "Type",
"terms": ""
},
"booth": {
"label": "Booth",
"terms": ""
@@ -5969,6 +5973,10 @@
"name": "Block",
"terms": ""
},
"barrier/bollard_line": {
"name": "Bollard Row",
"terms": ""
},
"barrier/bollard": {
"name": "Bollard",
"terms": ""