From 9ab8c35ca14b3ee15415b1e2d277d502801c0efc Mon Sep 17 00:00:00 2001 From: Nadya Febiana Djojosantoso Date: Mon, 1 Oct 2018 06:46:36 -0700 Subject: [PATCH 1/4] Add bridge support type field --- data/presets/fields/bridge/support.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/presets/fields/bridge/support.json diff --git a/data/presets/fields/bridge/support.json b/data/presets/fields/bridge/support.json new file mode 100644 index 000000000..7d7563c04 --- /dev/null +++ b/data/presets/fields/bridge/support.json @@ -0,0 +1,5 @@ +{ + "key": "bridge:support", + "type": "combo", + "label": "Type" +} From 4c4cd55e838702ec8e2ed33f1ec6941fee203ee9 Mon Sep 17 00:00:00 2001 From: Nadya Febiana Djojosantoso Date: Mon, 1 Oct 2018 06:48:24 -0700 Subject: [PATCH 2/4] Add bridge support preset --- data/presets/presets/bridge/support.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/presets/presets/bridge/support.json diff --git a/data/presets/presets/bridge/support.json b/data/presets/presets/bridge/support.json new file mode 100644 index 000000000..464badee1 --- /dev/null +++ b/data/presets/presets/bridge/support.json @@ -0,0 +1,15 @@ +{ + "icon": "fas-archway", + "fields": [ + "bridge/support" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "bridge:support": "*" + }, + "name": "Bridge Support" +} From ffd3de5aaaf64c7e42ec591adf4ad9fc323d429f Mon Sep 17 00:00:00 2001 From: Nadya Febiana Djojosantoso Date: Mon, 1 Oct 2018 06:49:19 -0700 Subject: [PATCH 3/4] Add bridge pier preset --- data/presets/presets/bridge/support/pier.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/presets/presets/bridge/support/pier.json diff --git a/data/presets/presets/bridge/support/pier.json b/data/presets/presets/bridge/support/pier.json new file mode 100644 index 000000000..194027440 --- /dev/null +++ b/data/presets/presets/bridge/support/pier.json @@ -0,0 +1,15 @@ +{ + "icon": "fas-archway", + "fields": [ + "bridge/support" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "bridge:support": "pier" + }, + "name": "Bridge Pier" +} From dd46dae9ad53d68fb90ae4f5af9e3a95ed60200e Mon Sep 17 00:00:00 2001 From: Nadya Febiana Djojosantoso Date: Mon, 1 Oct 2018 07:18:10 -0700 Subject: [PATCH 4/4] Include build files for bridge:support presets --- data/presets.yaml | 11 +++++++++++ data/presets/fields.json | 1 + data/presets/presets.json | 2 ++ data/taginfo.json | 13 +++++++++++++ dist/locales/en.json | 11 +++++++++++ 5 files changed, 38 insertions(+) diff --git a/data/presets.yaml b/data/presets.yaml index e44e808a8..12a1ad0b3 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -266,6 +266,9 @@ en: label: Type # bridge field placeholder placeholder: Default + bridge/support: + # 'bridge:support=*' + label: Type building: # building=* label: Building @@ -2857,6 +2860,14 @@ en: # boundary=administrative name: Administrative Boundary terms: '' + bridge/support: + # 'bridge:support=*' + name: Bridge Support + terms: '' + bridge/support/pier: + # 'bridge:support=pier' + name: Bridge Pier + terms: '' building: # building=* name: Building diff --git a/data/presets/fields.json b/data/presets/fields.json index 8216e6f17..ef606e2b2 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -39,6 +39,7 @@ "brand": {"key": "brand", "type": "text", "label": "Brand"}, "brewery": {"key": "brewery", "type": "semiCombo", "label": "Draft Beers"}, "bridge": {"key": "bridge", "type": "typeCombo", "label": "Type", "placeholder": "Default"}, + "bridge/support": {"key": "bridge:support", "type": "combo", "label": "Type"}, "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"}, "building": {"key": "building", "type": "combo", "label": "Building"}, "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"}, diff --git a/data/presets/presets.json b/data/presets/presets.json index d50ccff81..b980f4a28 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -213,6 +213,8 @@ "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"}, "barrier/wall": {"icon": "maki-barrier", "fields": ["wall", "height"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25}, "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]}, + "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"}, + "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"}, "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "geometry": ["point", "area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"}, "building/bunker": {"fields": ["name", "address", "levels", "height"], "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false}, "building/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false}, diff --git a/data/taginfo.json b/data/taginfo.json index 355401102..c5e62af93 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1449,6 +1449,19 @@ "description": "Administrative Boundary", "object_types": ["way"] }, + { + "key": "bridge:support", + "description": "Bridge Support, Type", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true" + }, + { + "key": "bridge:support", + "value": "pier", + "description": "Bridge Pier", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-archway.svg?sanitize=true" + }, { "key": "building", "description": "Building", diff --git a/dist/locales/en.json b/dist/locales/en.json index 3f2809e9d..f8b240dc2 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1680,6 +1680,9 @@ "label": "Type", "placeholder": "Default" }, + "bridge/support": { + "label": "Type" + }, "building_area": { "label": "Building" }, @@ -3911,6 +3914,14 @@ "name": "Administrative Boundary", "terms": "" }, + "bridge/support": { + "name": "Bridge Support", + "terms": "" + }, + "bridge/support/pier": { + "name": "Bridge Pier", + "terms": "" + }, "building": { "name": "Building", "terms": ""