From 2786974210f43e4ef62f0b23c4906f72caba4867 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 21 Jun 2018 12:27:58 -0400 Subject: [PATCH] Add preset for `emergency=siren` (closes #5100) --- data/presets.yaml | 18 ++++++++++++++++ data/presets/fields.json | 2 ++ data/presets/fields/siren/purpose.json | 5 +++++ data/presets/fields/siren/type.json | 12 +++++++++++ data/presets/presets.json | 1 + data/presets/presets/emergency/siren.json | 25 +++++++++++++++++++++++ data/taginfo.json | 11 ++++++++++ dist/locales/en.json | 15 ++++++++++++++ svg/fontawesome/fas-volume-up.svg | 1 + 9 files changed, 90 insertions(+) create mode 100644 data/presets/fields/siren/purpose.json create mode 100644 data/presets/fields/siren/type.json create mode 100644 data/presets/presets/emergency/siren.json create mode 100644 svg/fontawesome/fas-volume-up.svg diff --git a/data/presets.yaml b/data/presets.yaml index da1251068..cdcd5d3cd 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1332,6 +1332,19 @@ en: shop: # shop=* label: Type + siren/purpose: + # 'siren:purpose=*' + label: Purpose + siren/type: + # 'siren:type=*' + label: Type + options: + # 'siren:type=electronic' + electronic: Electronic + # 'siren:type=other' + other: Other + # 'siren:type=pneumatic' + pneumatic: Pneumatic site: # site=* label: Type @@ -3097,6 +3110,11 @@ en: emergency/private: # emergency=private name: Emergency Access Private + emergency/siren: + # emergency=siren + name: Siren + # 'terms: air raid,loud,noise,storm,tornado,warning' + terms: '' emergency/water_tank: # emergency=water_tank name: Emergency Water Tank diff --git a/data/presets/fields.json b/data/presets/fields.json index 86c249a71..b6d861577 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -236,6 +236,8 @@ "shelter_type": {"key": "shelter_type", "type": "combo", "label": "Type"}, "shelter": {"key": "shelter", "type": "check", "label": "Shelter"}, "shop": {"key": "shop", "type": "typeCombo", "label": "Type"}, + "siren/purpose": {"key": "siren:purpose", "type": "combo", "label": "Purpose"}, + "siren/type": {"key": "siren:type", "type": "combo", "label": "Type", "strings": {"options": {"pneumatic": "Pneumatic", "electronic": "Electronic", "other": "Other"}}}, "site": {"key": "site", "type": "combo", "label": "Type"}, "smoking": {"key": "smoking", "type": "combo", "label": "Smoking", "placeholder": "No, Separated, Yes...", "strings": {"options": {"no": "No smoking anywhere", "separated": "In smoking areas, not physically isolated", "isolated": "In smoking areas, physically isolated", "outside": "Allowed outside", "yes": "Allowed everywhere", "dedicated": "Dedicated to smokers (e.g. smokers' club)"}}}, "smoothness": {"key": "smoothness", "type": "combo", "label": "Smoothness", "placeholder": "Thin Rollers, Wheels, Off-Road...", "strings": {"options": {"excellent": "Thin Rollers: rollerblade, skateboard", "good": "Thin Wheels: racing bike", "intermediate": "Wheels: city bike, wheelchair, scooter", "bad": "Robust Wheels: trekking bike, car, rickshaw", "very_bad": "High Clearance: light duty off-road vehicle", "horrible": "Off-Road: heavy duty off-road vehicle", "very_horrible": "Specialized off-road: tractor, ATV", "impassable": "Impassable / No wheeled vehicle"}}}, diff --git a/data/presets/fields/siren/purpose.json b/data/presets/fields/siren/purpose.json new file mode 100644 index 000000000..f2fb6d9a5 --- /dev/null +++ b/data/presets/fields/siren/purpose.json @@ -0,0 +1,5 @@ +{ + "key": "siren:purpose", + "type": "combo", + "label": "Purpose" +} diff --git a/data/presets/fields/siren/type.json b/data/presets/fields/siren/type.json new file mode 100644 index 000000000..3c17c67e6 --- /dev/null +++ b/data/presets/fields/siren/type.json @@ -0,0 +1,12 @@ +{ + "key": "siren:type", + "type": "combo", + "label": "Type", + "strings": { + "options": { + "pneumatic": "Pneumatic", + "electronic": "Electronic", + "other": "Other" + } + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 58baae6df..42771ffe4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -317,6 +317,7 @@ "emergency/first_aid": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid"}, "name": "First Aid Kit"}, "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"}, "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"}, + "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"}, "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"}, "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"}, "footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"}, diff --git a/data/presets/presets/emergency/siren.json b/data/presets/presets/emergency/siren.json new file mode 100644 index 000000000..90c7fe9a7 --- /dev/null +++ b/data/presets/presets/emergency/siren.json @@ -0,0 +1,25 @@ +{ + "icon": "fas-volume-up", + "fields": [ + "siren/purpose", + "siren/type", + "ref", + "operator" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "air raid", + "loud", + "noise", + "storm", + "tornado", + "warning" + ], + "tags": { + "emergency": "siren" + }, + "name": "Siren" +} diff --git a/data/taginfo.json b/data/taginfo.json index 2a6e8ced1..f5d8bda16 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2164,6 +2164,13 @@ "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/emergency-phone-15.svg?sanitize=true" }, + { + "key": "emergency", + "value": "siren", + "description": "Siren", + "object_types": ["node"], + "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-volume-up.svg?sanitize=true" + }, { "key": "emergency", "value": "water_tank", @@ -6867,6 +6874,10 @@ {"key": "service:vehicle:", "description": "Services"}, {"key": "shelter_type", "description": "Type"}, {"key": "shelter", "description": "Shelter"}, + {"key": "siren:purpose", "description": "Purpose"}, + {"key": "siren:type", "value": "pneumatic", "description": "Type"}, + {"key": "siren:type", "value": "electronic", "description": "Type"}, + {"key": "siren:type", "value": "other", "description": "Type"}, {"key": "site", "description": "Type"}, {"key": "smoking", "value": "no", "description": "Smoking"}, {"key": "smoking", "value": "separated", "description": "Smoking"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 53168f20d..4924c99d0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2492,6 +2492,17 @@ "shop": { "label": "Type" }, + "siren/purpose": { + "label": "Purpose" + }, + "siren/type": { + "label": "Type", + "options": { + "pneumatic": "Pneumatic", + "electronic": "Electronic", + "other": "Other" + } + }, "site": { "label": "Type" }, @@ -4084,6 +4095,10 @@ "name": "Emergency Phone", "terms": "" }, + "emergency/siren": { + "name": "Siren", + "terms": "air raid,loud,noise,storm,tornado,warning" + }, "emergency/water_tank": { "name": "Emergency Water Tank", "terms": "water tank,cistern,reservoir" diff --git a/svg/fontawesome/fas-volume-up.svg b/svg/fontawesome/fas-volume-up.svg new file mode 100644 index 000000000..1b79fd302 --- /dev/null +++ b/svg/fontawesome/fas-volume-up.svg @@ -0,0 +1 @@ + \ No newline at end of file