diff --git a/data/presets.yaml b/data/presets.yaml index 6dfcea47d..e4abb6f1d 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -630,6 +630,14 @@ en: fire_hydrant/diameter: # 'fire_hydrant:diameter=*' label: 'Nominal diameter (in mm, inches or letters).' + fire_hydrant/opening: + # 'fire_hydrant:opening=*' + label: Direction to open the valve. + options: + # 'fire_hydrant:opening=ccw' + ccw: counterclockwise + # 'fire_hydrant:opening=cw' + cw: clockwise fire_hydrant/position: # 'fire_hydrant:position=*' label: Position @@ -2080,7 +2088,7 @@ en: label: Water source water_volume: # water_volume=* - label: Volume of the water reserve (only tanks and pools). + label: Volume of the water reserve. Tanks and pools only (default in m^3). waterway: # waterway=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index d46c84c4b..0282d94e4 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -33,7 +33,7 @@ "bin": {"key": "bin", "type": "check", "label": "Waste Bin"}, "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"}, - "bonnet/colour": {"key": "bonnet:colour", "default": "red", "type": "combo", "label": "Colour of the top section (bonnet)", "options": ["blue", "green", "red", "yellow", "grey"]}, + "bonnet/colour": {"key": "bonnet:colour", "type": "combo", "label": "Colour of the top section (bonnet)", "options": ["blue", "green", "red", "yellow", "grey"]}, "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true}, "boules": {"key": "boules", "type": "typeCombo", "label": "Type"}, "boundary": {"key": "boundary", "type": "combo", "label": "Type"}, @@ -48,7 +48,7 @@ "camera/direction": {"key": "camera:direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"}, "camera/mount": {"key": "camera:mount", "type": "combo", "label": "Camera Mount"}, "camera/type": {"key": "camera:type", "type": "combo", "label": "Camera Type", "strings": {"options": {"fixed": "Fixed", "panning": "Panning", "dome": "Dome"}}}, - "cap/colour": {"key": "cap:colour", "default": "red", "type": "combo", "label": "Colour of the caps", "options": ["blue", "green", "red", "yellow", "grey"]}, + "cap/colour": {"key": "cap:colour", "type": "combo", "label": "Colour of the caps", "options": ["blue", "green", "red", "yellow", "grey"]}, "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."}, "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"}, "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"}, @@ -109,6 +109,7 @@ "fire_hydrant/awwa_class": {"key": "fire_hydrant:awwa_class", "type": "combo", "label": "AWWA Class (US only)", "strings": {"options": {"AA": "more than 1500 US gal/min (light blue)", "A": "between 1500 and 1000 US gal/min (green)", "B": "between 1000 and 500 US gal/min (yellow)", "C": "less than 500 US gal/min (red)"}}}, "fire_hydrant/count": {"key": "fire_hydrant:count", "minValue": 1, "type": "number", "label": "Number of hydrants, if there are more than one.", "placeholder": "1, 2, 3…"}, "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "text", "label": "Nominal diameter (in mm, inches or letters)."}, + "fire_hydrant/opening": {"key": "fire_hydrant:opening", "type": "combo", "label": "Direction to open the valve.", "strings": {"options": {"cw": "clockwise", "ccw": "counterclockwise"}}}, "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/style": {"key": "fire_hydrant:style", "type": "text", "label": "Style (for special designs)"}, @@ -254,7 +255,7 @@ "ref_taxiway": {"key": "ref", "type": "text", "label": "Taxiway Name", "placeholder": "e.g. A5"}, "ref": {"key": "ref", "type": "text", "label": "Reference Code"}, "ref/isil": {"key": "ref:isil", "type": "text", "label": "ISIL Code"}, - "reflective/colour": {"key": "reflective:colour", "default": "red", "type": "text", "label": "Colour of reflective material"}, + "reflective/colour": {"key": "reflective:colour", "type": "text", "label": "Colour of reflective material"}, "relation": {"key": "type", "type": "combo", "label": "Type"}, "religion": {"key": "religion", "type": "combo", "label": "Religion"}, "restriction": {"key": "restriction", "type": "combo", "label": "Type"}, @@ -352,7 +353,7 @@ "wall": {"key": "wall", "type": "combo", "label": "Type"}, "water_point": {"key": "water_point", "type": "check", "label": "Water Point"}, "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water source", "options": ["main", "groundwater", "stream", "river", "canal", "drain", "ditch", "pond", "lake", "water_tank", "swimming_pool"]}, - "water_volume": {"key": "water_volume", "type": "number", "label": "Volume of the water reserve (only tanks and pools)."}, + "water_volume": {"key": "water_volume", "type": "number", "label": "Volume of the water reserve. Tanks and pools only (default in m^3)."}, "water": {"key": "water", "type": "combo", "label": "Type"}, "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"}, "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "universal": true, "label": "Website"}, diff --git a/data/presets/fields/bonnet/colour.json b/data/presets/fields/bonnet/colour.json index 5f2aeb984..de054d7bb 100644 --- a/data/presets/fields/bonnet/colour.json +++ b/data/presets/fields/bonnet/colour.json @@ -1,6 +1,5 @@ { "key": "bonnet:colour", - "default": "red", "type": "combo", "label": "Colour of the top section (bonnet)", "options": [ "blue", "green", "red", "yellow", "grey" ] diff --git a/data/presets/fields/cap/colour.json b/data/presets/fields/cap/colour.json index 6d2f8024e..eaadecb8b 100644 --- a/data/presets/fields/cap/colour.json +++ b/data/presets/fields/cap/colour.json @@ -1,6 +1,5 @@ { "key": "cap:colour", - "default": "red", "type": "combo", "label": "Colour of the caps", "options": [ "blue", "green", "red", "yellow", "grey" ] diff --git a/data/presets/fields/fire_hydrant/opening.json b/data/presets/fields/fire_hydrant/opening.json new file mode 100644 index 000000000..d0222b7d9 --- /dev/null +++ b/data/presets/fields/fire_hydrant/opening.json @@ -0,0 +1,11 @@ +{ + "key": "fire_hydrant:opening", + "type": "combo", + "label": "Direction to open the valve.", + "strings": { + "options": { + "cw": "clockwise", + "ccw": "counterclockwise" + } + } +} diff --git a/data/presets/fields/reflective/colour.json b/data/presets/fields/reflective/colour.json index fb3bf8a3c..be5ecf120 100644 --- a/data/presets/fields/reflective/colour.json +++ b/data/presets/fields/reflective/colour.json @@ -1,6 +1,5 @@ { "key": "reflective:colour", - "default": "red", "type": "text", "label": "Colour of reflective material" } diff --git a/data/presets/fields/water_volume.json b/data/presets/fields/water_volume.json index f07ec8150..5d5f51bc5 100644 --- a/data/presets/fields/water_volume.json +++ b/data/presets/fields/water_volume.json @@ -1,5 +1,5 @@ { "key": "water_volume", "type": "number", - "label": "Volume of the water reserve (only tanks and pools)." + "label": "Volume of the water reserve. Tanks and pools only (default in m^3)." } diff --git a/data/presets/presets.json b/data/presets/presets.json index ef634f8d6..27ac1b4f9 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/pressure", "fire_hydrant/diameter", "water_source", "survey/date", "fire_hydrant/position", "water_volume", "flow_rate", "fire_hydrant/awwa_class", "pillar/type", "couplings", "couplings/type", "couplings/diameters", "colour", "bonnet/colour", "cap/colour", "reflective/colour", "manufacturer", "model", "fire_hydrant/count", "fire_hydrant/style", "ref", "name"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, + "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/pressure", "fire_hydrant/diameter", "water_source", "survey/date", "fire_hydrant/position", "water_volume", "flow_rate", "fire_hydrant/awwa_class", "pillar/type", "couplings", "couplings/type", "couplings/diameters", "colour", "bonnet/colour", "cap/colour", "reflective/colour", "manufacturer", "model", "fire_hydrant/opening", "fire_hydrant/count", "fire_hydrant/style", "ref", "name"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well"], "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 cfa4a3f3b..88be62541 100644 --- a/data/presets/presets/emergency/fire_hydrant.json +++ b/data/presets/presets/emergency/fire_hydrant.json @@ -20,6 +20,7 @@ "reflective/colour", "manufacturer", "model", + "fire_hydrant/opening", "fire_hydrant/count", "fire_hydrant/style", "ref", diff --git a/data/taginfo.json b/data/taginfo.json index 3c4fce4c7..d13561044 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6896,6 +6896,16 @@ "key": "fire_hydrant:diameter", "description": "Nominal diameter (in mm, inches or letters)." }, + { + "key": "fire_hydrant:opening", + "value": "cw", + "description": "Direction to open the valve." + }, + { + "key": "fire_hydrant:opening", + "value": "ccw", + "description": "Direction to open the valve." + }, { "key": "fire_hydrant:position", "value": "lane", @@ -7741,7 +7751,7 @@ {"key": "water_source", "description": "Water source"}, { "key": "water_volume", - "description": "Volume of the water reserve (only tanks and pools)." + "description": "Volume of the water reserve. Tanks and pools only (default in m^3)." }, {"key": "water", "description": "Type"}, {"key": "website", "description": "Website"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index ad4c0af46..82bd544e4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2005,6 +2005,13 @@ "fire_hydrant/diameter": { "label": "Nominal diameter (in mm, inches or letters)." }, + "fire_hydrant/opening": { + "label": "Direction to open the valve.", + "options": { + "cw": "clockwise", + "ccw": "counterclockwise" + } + }, "fire_hydrant/position": { "label": "Position", "options": { @@ -3188,7 +3195,7 @@ "label": "Water source" }, "water_volume": { - "label": "Volume of the water reserve (only tanks and pools)." + "label": "Volume of the water reserve. Tanks and pools only (default in m^3)." }, "water": { "label": "Type"