From 63c2528b51987569a58bd2fa2529a4fe032a9690 Mon Sep 17 00:00:00 2001 From: mm Date: Thu, 1 Nov 2018 22:44:34 +0100 Subject: [PATCH] wip: new fire_hydrant scheme --- data/presets.yaml | 26 ++++--- data/presets/fields.json | 6 +- .../presets/fields/fire_hydrant/diameter.json | 5 ++ .../presets/fields/fire_hydrant/position.json | 8 +- .../presets/fields/fire_hydrant/pressure.json | 6 ++ data/presets/fields/fire_hydrant/type.json | 10 +-- data/presets/presets.json | 2 +- .../presets/emergency/fire_hydrant.json | 2 + data/taginfo.json | 32 +++++++- dist/locales/en.json | 73 ++++++++++++++++--- 10 files changed, 135 insertions(+), 35 deletions(-) create mode 100644 data/presets/fields/fire_hydrant/diameter.json create mode 100644 data/presets/fields/fire_hydrant/pressure.json diff --git a/data/presets.yaml b/data/presets.yaml index 341e988c8..db2fcfd54 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -589,30 +589,36 @@ en: fence_type: # fence_type=* label: Type + fire_hydrant/diameter: + # 'fire_hydrant:diameter=*' + label: 'Nominal diameter (in mm, inches or letters).' fire_hydrant/position: # 'fire_hydrant:position=*' label: Position options: # 'fire_hydrant:position=green' - green: Green + green: in a grassy area # 'fire_hydrant:position=lane' - lane: Lane + lane: on the side of a road lane # 'fire_hydrant:position=parking_lot' - parking_lot: Parking Lot + parking_lot: in a parking_lot # 'fire_hydrant:position=sidewalk' - sidewalk: Sidewalk + sidewalk: on a sidewalk + fire_hydrant/pressure: + # 'fire_hydrant:pressure=*' + label: Pressure in bar or suction fire_hydrant/type: # 'fire_hydrant:type=*' - label: Type + label: The shape of the hydrant. options: # 'fire_hydrant:type=pillar' - pillar: Pillar/Aboveground - # 'fire_hydrant:type=pond' - pond: Pond + pillar: A pillar type hydrant. + # 'fire_hydrant:type=pipe' + pipe: 'A simple capped pipe, without the usual hydrant shape.' # 'fire_hydrant:type=underground' - underground: Underground + underground: A fire hydrant simple outlet located underground. # 'fire_hydrant:type=wall' - wall: Wall + wall: A wall-mounted fire hydrant. fireplace: # fireplace=* label: Fireplace diff --git a/data/presets/fields.json b/data/presets/fields.json index fafe8b83d..e2b47c0d5 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -101,8 +101,10 @@ "fax": {"key": "fax", "type": "tel", "label": "Fax", "universal": true, "placeholder": "+31 42 123 4567"}, "fee": {"key": "fee", "type": "check", "label": "Fee"}, "fence_type": {"key": "fence_type", "type": "combo", "label": "Type"}, - "fire_hydrant/position": {"key": "fire_hydrant:position", "type": "combo", "label": "Position", "strings": {"options": {"lane": "Lane", "parking_lot": "Parking Lot", "sidewalk": "Sidewalk", "green": "Green"}}}, - "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Type", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pond": "Pond"}}}, + "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "text", "label": "Nominal diameter (in mm, inches or letters)."}, + "fire_hydrant/position": {"key": "fire_hydrant:position", "type": "combo", "label": "Position", "strings": {"options": {"lane": "on the side of a road lane", "parking_lot": "in a parking_lot", "sidewalk": "on a sidewalk", "green": "in a grassy area"}}}, + "fire_hydrant/pressure": {"key": "fire_hydrant:pressure", "type": "combo", "label": "Pressure in bar or suction", "options": ["#", "yes", "suction"]}, + "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "The shape of the hydrant.", "strings": {"options": {"pillar": "A pillar type hydrant.", "underground": "A fire hydrant simple outlet located underground.", "wall": "A wall-mounted fire hydrant.", "pipe": "A simple capped pipe, without the usual hydrant shape."}}}, "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"}, "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"}, "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true}, diff --git a/data/presets/fields/fire_hydrant/diameter.json b/data/presets/fields/fire_hydrant/diameter.json new file mode 100644 index 000000000..50ffc101e --- /dev/null +++ b/data/presets/fields/fire_hydrant/diameter.json @@ -0,0 +1,5 @@ +{ + "key": "fire_hydrant:diameter", + "type": "text", + "label": "Nominal diameter (in mm, inches or letters)." +} diff --git a/data/presets/fields/fire_hydrant/position.json b/data/presets/fields/fire_hydrant/position.json index 0d2e245ec..6c0e3406b 100644 --- a/data/presets/fields/fire_hydrant/position.json +++ b/data/presets/fields/fire_hydrant/position.json @@ -4,10 +4,10 @@ "label": "Position", "strings": { "options": { - "lane": "Lane", - "parking_lot": "Parking Lot", - "sidewalk": "Sidewalk", - "green": "Green" + "lane": "on the side of a road lane", + "parking_lot": "in a parking_lot", + "sidewalk": "on a sidewalk", + "green": "in a grassy area" } } } diff --git a/data/presets/fields/fire_hydrant/pressure.json b/data/presets/fields/fire_hydrant/pressure.json new file mode 100644 index 000000000..78a4b50b6 --- /dev/null +++ b/data/presets/fields/fire_hydrant/pressure.json @@ -0,0 +1,6 @@ +{ + "key": "fire_hydrant:pressure", + "type": "combo", + "label": "Pressure in bar or suction", + "options": [ "#", "yes", "suction" ] +} diff --git a/data/presets/fields/fire_hydrant/type.json b/data/presets/fields/fire_hydrant/type.json index 13f5e6cde..0e3dbae1a 100644 --- a/data/presets/fields/fire_hydrant/type.json +++ b/data/presets/fields/fire_hydrant/type.json @@ -1,13 +1,13 @@ { "key": "fire_hydrant:type", "type": "combo", - "label": "Type", + "label": "The shape of the hydrant.", "strings": { "options": { - "pillar": "Pillar/Aboveground", - "underground": "Underground", - "wall": "Wall", - "pond": "Pond" + "pillar": "A pillar type hydrant.", + "underground": "A fire hydrant simple outlet located underground.", + "wall": "A wall-mounted fire hydrant.", + "pipe": "A simple capped pipe, without the usual hydrant shape." } } } diff --git a/data/presets/presets.json b/data/presets/presets.json index 4bba9b97d..810bb378f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -331,7 +331,7 @@ "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"}, - "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, + "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/diameter", "fire_hydrant/pressure", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "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/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"}, diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json index 1cdc55205..2e5ac6317 100644 --- a/data/presets/presets/emergency/fire_hydrant.json +++ b/data/presets/presets/emergency/fire_hydrant.json @@ -2,6 +2,8 @@ "icon": "temaki-fire_hydrant", "fields": [ "fire_hydrant/type", + "fire_hydrant/diameter", + "fire_hydrant/pressure", "fire_hydrant/position", "ref", "operator" diff --git a/data/taginfo.json b/data/taginfo.json index 2743fbc68..62a7bd95d 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6857,6 +6857,10 @@ {"key": "fax", "description": "Fax"}, {"key": "fee", "description": "Fee"}, {"key": "fence_type", "description": "Type"}, + { + "key": "fire_hydrant:diameter", + "description": "Nominal diameter (in mm, inches or letters)." + }, { "key": "fire_hydrant:position", "value": "lane", @@ -6877,10 +6881,30 @@ "value": "green", "description": "Position" }, - {"key": "fire_hydrant:type", "value": "pillar", "description": "Type"}, - {"key": "fire_hydrant:type", "value": "underground", "description": "Type"}, - {"key": "fire_hydrant:type", "value": "wall", "description": "Type"}, - {"key": "fire_hydrant:type", "value": "pond", "description": "Type"}, + { + "key": "fire_hydrant:pressure", + "description": "Pressure in bar or suction" + }, + { + "key": "fire_hydrant:type", + "value": "pillar", + "description": "The shape of the hydrant." + }, + { + "key": "fire_hydrant:type", + "value": "underground", + "description": "The shape of the hydrant." + }, + { + "key": "fire_hydrant:type", + "value": "wall", + "description": "The shape of the hydrant." + }, + { + "key": "fire_hydrant:type", + "value": "pipe", + "description": "The shape of the hydrant." + }, {"key": "fireplace", "description": "Fireplace"}, {"key": "fitness_station", "description": "Equipment Type"}, {"key": "fixme", "description": "Fix Me"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index b67bbe8be..596b76592 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1971,22 +1971,28 @@ "fence_type": { "label": "Type" }, + "fire_hydrant/diameter": { + "label": "Nominal diameter (in mm, inches or letters)." + }, "fire_hydrant/position": { "label": "Position", "options": { - "lane": "Lane", - "parking_lot": "Parking Lot", - "sidewalk": "Sidewalk", - "green": "Green" + "lane": "on the side of a road lane", + "parking_lot": "in a parking_lot", + "sidewalk": "on a sidewalk", + "green": "in a grassy area" } }, + "fire_hydrant/pressure": { + "label": "Pressure in bar or suction" + }, "fire_hydrant/type": { - "label": "Type", + "label": "The shape of the hydrant.", "options": { - "pillar": "Pillar/Aboveground", - "underground": "Underground", - "wall": "Wall", - "pond": "Pond" + "pillar": "A pillar type hydrant.", + "underground": "A fire hydrant simple outlet located underground.", + "wall": "A wall-mounted fire hydrant.", + "pipe": "A simple capped pipe, without the usual hydrant shape." } }, "fireplace": { @@ -7441,12 +7447,40 @@ "description": "Japan GSI Standard Map. Widely covered.", "name": "Japan GSI Standard Map" }, + "helsingborg-orto": { + "attribution": { + "text": "© Helsingborg municipality" + }, + "description": "Orthophotos from the municipality of Helsingborg 2016, public domain", + "name": "Helsingborg Orthophoto" + }, "hike_n_bike": { "attribution": { "text": "© OpenStreetMap contributors" }, "name": "Hike & Bike" }, + "kalmar-orto-2014": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for the north coast of the municipality of Kalmar 2014", + "name": "Kalmar North Orthophoto 2014" + }, + "kalmar-orto-2016": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for the south coast of the municipality of Kalmar 2016", + "name": "Kalmar South Orthophoto 2016" + }, + "kalmar-orto-2018": { + "attribution": { + "text": "© Kalmar municipality" + }, + "description": "Orthophotos for urban areas of the municipality of Kalmar 2018", + "name": "Kalmar Urban Orthophoto 2018" + }, "kelkkareitit": { "attribution": { "text": "© Kelkkareitit.fi" @@ -7468,6 +7502,20 @@ "description": "Mosaic of Swedish orthophotos from the period 1970–1980. Is under construction.", "name": "Lantmäteriet Historic Orthophoto 1975" }, + "lantmateriet-topowebb": { + "attribution": { + "text": "© Lantmäteriet, CC0" + }, + "description": "Topographic map of Sweden 1:50 000", + "name": "Lantmäteriet Topographic Map" + }, + "linkoping-orto": { + "attribution": { + "text": "© Linköping municipality" + }, + "description": "Orthophotos from the municipality of Linköping 2010, open data", + "name": "Linköping Orthophoto" + }, "mapbox_locator_overlay": { "attribution": { "text": "Terms & Feedback" @@ -7532,6 +7580,13 @@ }, "name": "Stamen Terrain" }, + "stockholm-orto": { + "attribution": { + "text": "© Stockholm municipality, CC0" + }, + "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license", + "name": "Stockholm Orthophoto" + }, "tf-cycle": { "attribution": { "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"