diff --git a/data/presets.yaml b/data/presets.yaml
index 22da8a02f..f341bab61 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -248,9 +248,6 @@ en:
board_type:
# board_type=*
label: Type
- bonnet/colour:
- # 'bonnet:colour=*'
- label: Colour of the top section (bonnet)
booth:
# booth=*
label: Booth
@@ -306,9 +303,6 @@ en:
fixed: Fixed
# 'camera:type=panning'
panning: Panning
- cap/colour:
- # 'cap:colour=*'
- label: Colour of the caps
capacity:
# capacity=*
label: Capacity
@@ -364,21 +358,6 @@ en:
country:
# country=*
label: Country
- couplings:
- # couplings=*
- label: Number of couplings
- # couplings field placeholder
- placeholder: '1, 2, 3…'
- couplings/diameters:
- # 'couplings:diameters=*'
- label: Each coupling diameter (separated by ;)
- # couplings/diameters field placeholder
- placeholder: E.g. 45 mm;45 mm;110 mm
- couplings/type:
- # 'couplings:type=*'
- label: Coupling standard.
- # couplings/type field placeholder
- placeholder: 'Bayonet, Storz, UNI…'
covered:
# covered=*
label: Covered
@@ -610,34 +589,9 @@ en:
fence_type:
# fence_type=*
label: Type
- fire_hydrant/awwa_class:
- # 'fire_hydrant:awwa_class=*'
- label: AWWA Class (US only)
- options:
- # 'fire_hydrant:awwa_class=A'
- A: between 1500 and 1000 US gal/min (green)
- # 'fire_hydrant:awwa_class=AA'
- AA: more than 1500 US gal/min (light blue)
- # 'fire_hydrant:awwa_class=B'
- B: between 1000 and 500 US gal/min (yellow)
- # 'fire_hydrant:awwa_class=C'
- C: less than 500 US gal/min (red)
- fire_hydrant/count:
- # 'fire_hydrant:count=*'
- label: 'Number of hydrants, if there are more than one.'
- # fire_hydrant/count field placeholder
- placeholder: '1, 2, 3…'
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
@@ -653,9 +607,6 @@ en:
fire_hydrant/pressure:
# 'fire_hydrant:pressure=*'
label: Pressure in bar or suction
- fire_hydrant/style:
- # 'fire_hydrant:style=*'
- label: Style (for special designs)
fire_hydrant/type:
# 'fire_hydrant:type=*'
label: The shape of the hydrant.
@@ -680,9 +631,6 @@ en:
flag/type:
# 'flag:type=*'
label: Flag Type
- flow_rate:
- # flow_rate=*
- label: Nominal flow rate with unit of measure.
ford:
# ford=*
label: Type
@@ -983,9 +931,6 @@ en:
manhole:
# manhole=*
label: Type
- manufacturer:
- # manufacturer=*
- label: Manufacturers' name
map_size:
# map_size=*
label: Coverage
@@ -1019,9 +964,6 @@ en:
memorial:
# memorial=*
label: Type
- model:
- # model=*
- label: Model
monitoring_multi:
# 'monitoring:=*'
label: Monitoring
@@ -1220,14 +1162,6 @@ en:
label: Telephone
# phone field placeholder
placeholder: +31 42 123 4567
- pillar/type:
- # 'pillar:type=*'
- label: Description of pillar hydrants.
- options:
- # 'pillar:type=dry_barrel'
- dry_barrel: The water shutoff valve is below ground.
- # 'pillar:type=wet_barrel'
- wet_barrel: The barrel is pressurized at all times.
piste/difficulty:
# 'piste:difficulty=*'
label: Difficulty
@@ -1484,9 +1418,6 @@ en:
label: Taxiway Name
# ref_taxiway field placeholder
placeholder: e.g. A5
- reflective/colour:
- # 'reflective:colour=*'
- label: Colour of reflective material
relation:
# type=*
label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 0282d94e4..44830196b 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -33,7 +33,6 @@
"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", "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 +47,6 @@
"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", "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"},
@@ -63,9 +61,6 @@
"content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
"conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
"country": {"key": "country", "type": "combo", "label": "Country"},
- "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Number of couplings", "placeholder": "1, 2, 3…"},
- "couplings/diameters": {"key": "couplings:diameters", "type": "text", "label": "Each coupling diameter (separated by ;)", "placeholder": "E.g. 45 mm;45 mm;110 mm"},
- "couplings/type": {"key": "couplings:type", "type": "combo", "label": "Coupling standard.", "placeholder": "Bayonet, Storz, UNI…", "options": ["Bayonet", "Barcelona", "Guillemin", "Klaue", "Sprawny", "Storz", "UNI"]},
"covered": {"key": "covered", "type": "check", "label": "Covered"},
"craft": {"key": "craft", "type": "typeCombo", "label": "Type"},
"crane/type": {"key": "crane:type", "type": "combo", "label": "Crane Type", "strings": {"options": {"portal_crane": "Portal Crane", "floor-mounted_crane": "Floor-mounted Crane", "travel_lift": "Travel Lift"}}},
@@ -106,19 +101,14 @@
"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/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)"},
"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},
"flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
- "flow_rate": {"key": "flow_rate", "type": "number", "label": "Nominal flow rate with unit of measure."},
"ford": {"key": "ford", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
"frequency": {"key": "frequency", "type": "combo", "label": "Operating Frequency"},
"from": {"key": "from", "type": "text", "label": "From"},
@@ -181,7 +171,6 @@
"location": {"key": "location", "type": "combo", "label": "Location"},
"man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
"manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
- "manufacturer": {"key": "manufacturer", "type": "text", "label": "Manufacturers' name"},
"map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
"map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
"material": {"key": "material", "type": "combo", "universal": true, "label": "Material"},
@@ -191,7 +180,6 @@
"maxstay": {"key": "maxstay", "type": "combo", "label": "Max Stay", "options": ["15 min", "30 min", "45 min", "1 hr", "1.5 hr", "2 hr", "2.5 hr", "3 hr", "4 hr", "1 day", "2 day"], "snake_case": false},
"maxweight": {"key": "maxweight", "type": "combo", "label": "Max Weight", "snake_case": false},
"memorial": {"key": "memorial", "type": "typeCombo", "label": "Type"},
- "model": {"key": "model", "type": "text", "label": "Model"},
"monitoring_multi": {"key": "monitoring:", "type": "multiCombo", "label": "Monitoring"},
"mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}},
"mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}},
@@ -217,7 +205,6 @@
"payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "universal": true},
"phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
"phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
- "pillar/type": {"key": "pillar:type", "type": "combo", "label": "Description of pillar hydrants.", "strings": {"options": {"dry_barrel": "The water shutoff valve is below ground.", "wet_barrel": "The barrel is pressurized at all times."}}},
"piste/difficulty_downhill": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
"piste/difficulty_nordic": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
"piste/difficulty_skitour": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - L: <30° incline", "easy": "Easy - WS: 30-35° incline", "intermediate": "Intermediate - ZS: 35-40° incline", "advanced": "Advanced - S: 40-45° incline", "expert": "Expert - SS: 45–50° incline", "freeride": "Freeride - AS: 50–55° incline", "extreme": "Extreme - EX: >55° incline"}}},
@@ -255,7 +242,6 @@
"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", "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"},
diff --git a/data/presets/fields/bonnet/colour.json b/data/presets/fields/bonnet/colour.json
deleted file mode 100644
index de054d7bb..000000000
--- a/data/presets/fields/bonnet/colour.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "bonnet:colour",
- "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
deleted file mode 100644
index eaadecb8b..000000000
--- a/data/presets/fields/cap/colour.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "cap:colour",
- "type": "combo",
- "label": "Colour of the caps",
- "options": [ "blue", "green", "red", "yellow", "grey" ]
-}
diff --git a/data/presets/fields/couplings.json b/data/presets/fields/couplings.json
deleted file mode 100644
index 31e0f4e25..000000000
--- a/data/presets/fields/couplings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "key": "couplings",
- "type": "number",
- "minValue": 1,
- "label": "Number of couplings",
- "placeholder": "1, 2, 3…"
-}
diff --git a/data/presets/fields/couplings/diameters.json b/data/presets/fields/couplings/diameters.json
deleted file mode 100644
index e2c42f606..000000000
--- a/data/presets/fields/couplings/diameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "couplings:diameters",
- "type": "text",
- "label": "Each coupling diameter (separated by ;)",
- "placeholder": "E.g. 45 mm;45 mm;110 mm"
-}
diff --git a/data/presets/fields/couplings/type.json b/data/presets/fields/couplings/type.json
deleted file mode 100644
index 316d75dc8..000000000
--- a/data/presets/fields/couplings/type.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "key": "couplings:type",
- "type": "combo",
- "label": "Coupling standard.",
- "placeholder": "Bayonet, Storz, UNI…",
- "options": [
- "Bayonet",
- "Barcelona",
- "Guillemin",
- "Klaue",
- "Sprawny",
- "Storz",
- "UNI"
- ]
-}
diff --git a/data/presets/fields/fire_hydrant/awwa_class.json b/data/presets/fields/fire_hydrant/awwa_class.json
deleted file mode 100644
index b89ae590a..000000000
--- a/data/presets/fields/fire_hydrant/awwa_class.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "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)"
- }
- }
-}
diff --git a/data/presets/fields/fire_hydrant/count.json b/data/presets/fields/fire_hydrant/count.json
deleted file mode 100644
index fa7351012..000000000
--- a/data/presets/fields/fire_hydrant/count.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "key": "fire_hydrant:count",
- "minValue": 1,
- "type": "number",
- "label": "Number of hydrants, if there are more than one.",
- "placeholder": "1, 2, 3…"
-}
diff --git a/data/presets/fields/fire_hydrant/opening.json b/data/presets/fields/fire_hydrant/opening.json
deleted file mode 100644
index d0222b7d9..000000000
--- a/data/presets/fields/fire_hydrant/opening.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "key": "fire_hydrant:opening",
- "type": "combo",
- "label": "Direction to open the valve.",
- "strings": {
- "options": {
- "cw": "clockwise",
- "ccw": "counterclockwise"
- }
- }
-}
diff --git a/data/presets/fields/fire_hydrant/style.json b/data/presets/fields/fire_hydrant/style.json
deleted file mode 100644
index ed1967377..000000000
--- a/data/presets/fields/fire_hydrant/style.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "fire_hydrant:style",
- "type": "text",
- "label": "Style (for special designs)"
-
-}
diff --git a/data/presets/fields/flow_rate.json b/data/presets/fields/flow_rate.json
deleted file mode 100644
index ed4620437..000000000
--- a/data/presets/fields/flow_rate.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "key": "flow_rate",
- "type": "number",
- "label": "Nominal flow rate with unit of measure."
-}
diff --git a/data/presets/fields/manufacturer.json b/data/presets/fields/manufacturer.json
deleted file mode 100644
index bc137e707..000000000
--- a/data/presets/fields/manufacturer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "manufacturer",
- "type": "text",
- "label": "Manufacturers' name"
-
-}
diff --git a/data/presets/fields/model.json b/data/presets/fields/model.json
deleted file mode 100644
index 9cfc58ad2..000000000
--- a/data/presets/fields/model.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "key": "model",
- "type": "text",
- "label": "Model"
-
-}
diff --git a/data/presets/fields/pillar/type.json b/data/presets/fields/pillar/type.json
deleted file mode 100644
index 6b284dd0a..000000000
--- a/data/presets/fields/pillar/type.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "key": "pillar:type",
- "type": "combo",
- "label": "Description of pillar hydrants.",
- "strings": {
- "options": {
- "dry_barrel": "The water shutoff valve is below ground.",
- "wet_barrel": "The barrel is pressurized at all times."
- }
- }
-}
diff --git a/data/presets/fields/reflective/colour.json b/data/presets/fields/reflective/colour.json
deleted file mode 100644
index be5ecf120..000000000
--- a/data/presets/fields/reflective/colour.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "key": "reflective:colour",
- "type": "text",
- "label": "Colour of reflective material"
-}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0ebd30b3a..3cbdb4057 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -355,7 +355,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/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/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", "colour", "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 88be62541..745791474 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -8,23 +8,9 @@
"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"
+ "name"
],
"geometry": [
"point",
diff --git a/data/taginfo.json b/data/taginfo.json
index 6de10be1e..12130e42c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -6914,10 +6914,6 @@
{"key": "blood:", "value": "platelets", "description": "Blood Components"},
{"key": "blood:", "value": "stemcells", "description": "Blood Components"},
{"key": "board_type", "description": "Type"},
- {
- "key": "bonnet:colour",
- "description": "Colour of the top section (bonnet)"
- },
{"key": "booth", "description": "Booth"},
{"key": "boules", "description": "Type"},
{"key": "boundary", "description": "Type"},
@@ -6931,7 +6927,6 @@
{"key": "camera:type", "value": "fixed", "description": "Camera Type"},
{"key": "camera:type", "value": "panning", "description": "Camera Type"},
{"key": "camera:type", "value": "dome", "description": "Camera Type"},
- {"key": "cap:colour", "description": "Colour of the caps"},
{"key": "capacity", "description": "Capacity"},
{"key": "cash_in", "description": "Cash In"},
{"key": "castle_type", "description": "Type"},
@@ -6959,12 +6954,6 @@
"description": "Movement Direction"
},
{"key": "country", "description": "Country"},
- {"key": "couplings", "description": "Number of couplings"},
- {
- "key": "couplings:diameters",
- "description": "Each coupling diameter (separated by ;)"
- },
- {"key": "couplings:type", "description": "Coupling standard."},
{"key": "covered", "description": "Covered"},
{"key": "crane:type", "value": "portal_crane", "description": "Crane Type"},
{
@@ -7071,44 +7060,10 @@
{"key": "fax", "description": "Fax"},
{"key": "fee", "description": "Fee"},
{"key": "fence_type", "description": "Type"},
- {
- "key": "fire_hydrant:awwa_class",
- "value": "AA",
- "description": "AWWA Class (US only)"
- },
- {
- "key": "fire_hydrant:awwa_class",
- "value": "A",
- "description": "AWWA Class (US only)"
- },
- {
- "key": "fire_hydrant:awwa_class",
- "value": "B",
- "description": "AWWA Class (US only)"
- },
- {
- "key": "fire_hydrant:awwa_class",
- "value": "C",
- "description": "AWWA Class (US only)"
- },
- {
- "key": "fire_hydrant:count",
- "description": "Number of hydrants, if there are more than one."
- },
{
"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",
@@ -7133,7 +7088,6 @@
"key": "fire_hydrant:pressure",
"description": "Pressure in bar or suction"
},
- {"key": "fire_hydrant:style", "description": "Style (for special designs)"},
{
"key": "fire_hydrant:type",
"value": "pillar",
@@ -7158,10 +7112,6 @@
{"key": "fitness_station", "description": "Equipment Type"},
{"key": "fixme", "description": "Fix Me"},
{"key": "flag:type", "description": "Flag Type"},
- {
- "key": "flow_rate",
- "description": "Nominal flow rate with unit of measure."
- },
{"key": "ford", "description": "Type"},
{"key": "frequency", "description": "Operating Frequency"},
{"key": "from", "description": "From"},
@@ -7286,7 +7236,6 @@
{"key": "location", "value": "indoor", "description": "Location"},
{"key": "location", "value": "roof", "description": "Location"},
{"key": "location", "description": "Location"},
- {"key": "manufacturer", "description": "Manufacturers' name"},
{"key": "map_size", "description": "Coverage"},
{"key": "map_type", "description": "Type"},
{"key": "material", "description": "Material"},
@@ -7296,7 +7245,6 @@
{"key": "maxstay", "description": "Max Stay"},
{"key": "maxweight", "description": "Max Weight"},
{"key": "memorial", "description": "Type"},
- {"key": "model", "description": "Model"},
{"key": "monitoring:", "description": "Monitoring"},
{
"key": "mtb:scale",
@@ -7425,16 +7373,6 @@
{"key": "payment:", "description": "Payment Types"},
{"key": "phases", "description": "Phases"},
{"key": "phone", "description": "Telephone"},
- {
- "key": "pillar:type",
- "value": "dry_barrel",
- "description": "Description of pillar hydrants."
- },
- {
- "key": "pillar:type",
- "value": "wet_barrel",
- "description": "Description of pillar hydrants."
- },
{"key": "piste:difficulty", "value": "novice", "description": "Difficulty"},
{"key": "piste:difficulty", "value": "easy", "description": "Difficulty"},
{
@@ -7507,10 +7445,6 @@
"description": "Gate Number, Hole Number, Junction Number, Platform Number, Road Number, Route Number, Runway Number, Stop Number, Taxiway Name, Reference Code"
},
{"key": "ref:isil", "description": "ISIL Code"},
- {
- "key": "reflective:colour",
- "description": "Colour of reflective material"
- },
{"key": "type", "description": "Type"},
{"key": "religion", "description": "Religion"},
{"key": "restriction", "description": "Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c5b583f43..6d872e646 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1681,9 +1681,6 @@
"board_type": {
"label": "Type"
},
- "bonnet/colour": {
- "label": "Colour of the top section (bonnet)"
- },
"booth": {
"label": "Booth"
},
@@ -1734,9 +1731,6 @@
"dome": "Dome"
}
},
- "cap/colour": {
- "label": "Colour of the caps"
- },
"capacity": {
"label": "Capacity",
"placeholder": "50, 100, 200..."
@@ -1787,18 +1781,6 @@
"country": {
"label": "Country"
},
- "couplings": {
- "label": "Number of couplings",
- "placeholder": "1, 2, 3…"
- },
- "couplings/diameters": {
- "label": "Each coupling diameter (separated by ;)",
- "placeholder": "E.g. 45 mm;45 mm;110 mm"
- },
- "couplings/type": {
- "label": "Coupling standard.",
- "placeholder": "Bayonet, Storz, UNI…"
- },
"covered": {
"label": "Covered"
},
@@ -2000,29 +1982,9 @@
"fence_type": {
"label": "Type"
},
- "fire_hydrant/awwa_class": {
- "label": "AWWA Class (US only)",
- "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": {
- "label": "Number of hydrants, if there are more than one.",
- "placeholder": "1, 2, 3…"
- },
"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": {
@@ -2035,9 +1997,6 @@
"fire_hydrant/pressure": {
"label": "Pressure in bar or suction"
},
- "fire_hydrant/style": {
- "label": "Style (for special designs)"
- },
"fire_hydrant/type": {
"label": "The shape of the hydrant.",
"options": {
@@ -2059,9 +2018,6 @@
"flag/type": {
"label": "Flag Type"
},
- "flow_rate": {
- "label": "Nominal flow rate with unit of measure."
- },
"ford": {
"label": "Type",
"placeholder": "Default"
@@ -2323,9 +2279,6 @@
"manhole": {
"label": "Type"
},
- "manufacturer": {
- "label": "Manufacturers' name"
- },
"map_size": {
"label": "Coverage"
},
@@ -2356,9 +2309,6 @@
"memorial": {
"label": "Type"
},
- "model": {
- "label": "Model"
- },
"monitoring_multi": {
"label": "Monitoring"
},
@@ -2509,13 +2459,6 @@
"label": "Telephone",
"placeholder": "+31 42 123 4567"
},
- "pillar/type": {
- "label": "Description of pillar hydrants.",
- "options": {
- "dry_barrel": "The water shutoff valve is below ground.",
- "wet_barrel": "The barrel is pressurized at all times."
- }
- },
"piste/difficulty_downhill": {
"label": "Difficulty",
"placeholder": "Easy, Intermediate, Advanced...",
@@ -2716,9 +2659,6 @@
"ref/isil": {
"label": "ISIL Code"
},
- "reflective/colour": {
- "label": "Colour of reflective material"
- },
"relation": {
"label": "Type"
},
@@ -7540,6 +7480,9 @@
"SPW_PICC": {
"name": "SPW(allonie) PICC numerical imagery"
},
+ "US-TIGER-Roads-2012": {
+ "name": "TIGER Roads 2012"
+ },
"US-TIGER-Roads-2014": {
"description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
"name": "TIGER Roads 2014"
@@ -7548,10 +7491,6 @@
"description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
"name": "TIGER Roads 2017"
},
- "US-TIGER-Roads-2018": {
- "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
- "name": "TIGER Roads 2018"
- },
"US_Forest_Service_roads_overlay": {
"description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars",
"name": "U.S. Forest Roads Overlay"
@@ -7659,26 +7598,11 @@
"description": "Orthophotos from the municipality of Helsingborg 2016, public domain",
"name": "Helsingborg Orthophoto"
},
- "kalmar-orto-2014": {
+ "hike_n_bike": {
"attribution": {
- "text": "© Kalmar municipality"
+ "text": "© OpenStreetMap contributors"
},
- "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"
+ "name": "Hike & Bike"
},
"kalmar-orto-2014": {
"attribution": {
diff --git a/svg/fontawesome/fas-snowflake.svg b/svg/fontawesome/fas-snowflake.svg
index 4806d0fe8..a162d4179 100644
--- a/svg/fontawesome/fas-snowflake.svg
+++ b/svg/fontawesome/fas-snowflake.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file