CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-21 19:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

wip: new fire_hydrant scheme

Browse Source
This commit is contained in:
mm
2018-11-01 22:44:34 +01:00
parent 3e03102731
commit 63c2528b51
10 changed files with 135 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+16 -10
View File
@@ -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
data/presets/fields.json
+4 -2
View File
@@ -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},
data/presets/fields/fire_hydrant/diameter.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "fire_hydrant:diameter",
"type": "text",
"label": "Nominal diameter (in mm, inches or letters)."
}
data/presets/fields/fire_hydrant/position.json
+4 -4
View File
@@ -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"
}
}
}
data/presets/fields/fire_hydrant/pressure.json
+6
View File
@@ -0,0 +1,6 @@
{
"key": "fire_hydrant:pressure",
"type": "combo",
"label": "Pressure in bar or suction",
"options": [ "#", "yes", "suction" ]
}
data/presets/fields/fire_hydrant/type.json
+5 -5
View File
@@ -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."
}
}
}
data/presets/presets.json
+1 -1
View File
@@ -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"},
data/presets/presets/emergency/fire_hydrant.json
+2
View File
@@ -2,6 +2,8 @@
"icon": "temaki-fire_hydrant",
"fields": [
"fire_hydrant/type",
"fire_hydrant/diameter",
"fire_hydrant/pressure",
"fire_hydrant/position",
"ref",
"operator"
data/taginfo.json
+28 -4
View File
@@ -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"},
dist/locales/en.json
Vendored
+64 -9
View File
@@ -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"