Merge branch 'fire-hydrants-shortened' of https://github.com/momu/iD into momu-fire-hydrants-shortened

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)."
+}

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"
         }
     }
 }

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" ]
+}

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."
         }
     }
 }

data/presets/fields/survey/date.json

@@ -0,0 +1,6 @@
+{
+    "key": "survey:date",
+    "type": "text",
+    "universal": true,
+    "label": "Date of last site survey (YYYY-MM-DD)"
+}

data/presets/fields/water_source.json

@@ -0,0 +1,7 @@
+{
+    "key": "water_source",
+    "default": "main",
+    "type": "combo",
+    "label": "Water source",
+    "options": [ "main", "groundwater", "stream", "river", "canal", "drain", "ditch", "pond", "lake", "water_tank", "swimming_pool" ]
+}

data/presets/fields/water_volume.json

@@ -0,0 +1,5 @@
+{
+    "key": "water_volume",
+    "type": "number",
+    "label": "Volume of the water reserve. Tanks and pools only (default in m^3)."
+}