Merge branch 'master' into d3-v4

FAQ.md

@@ -42,7 +42,7 @@ main things iD uses the network for:
 * Downloading tiles -- ditto
 * Uploading changes
 
-We've though a little about [caching tiles](https://github.com/openstreetmap/iD/issues/127)
+We've thought a little about [caching tiles](https://github.com/openstreetmap/iD/issues/127)
 and downloaded data, but haven't actively worked on it, nor on the data download/upload
 question.
 

data/presets.yaml

@@ -2827,6 +2827,10 @@ en:
         # man_made=pipeline
         name: Pipeline
         terms: '<translate with synonyms or related terms for ''Pipeline'', separated by commas>'
+      man_made/pumping_station:
+        # man_made=pumping_station
+        name: Pumping Station
+        terms: '<translate with synonyms or related terms for ''Pumping Station'', separated by commas>'
       man_made/silo:
         # man_made=silo
         name: Silo

data/presets/presets.json

@@ -6597,6 +6597,16 @@
         },
         "name": "Pipeline"
     },
+    "man_made/pumping_station": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "pumping_station"
+        },
+        "name": "Pumping Station"
+    },
     "man_made/silo": {
         "fields": [
             "building_area",

data/presets/presets/man_made/pumping_station.json

@@ -0,0 +1,10 @@
+{
+   "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "man_made": "pumping_station"
+    },
+    "name": "Pumping Station"
+}

data/taginfo.json

@@ -1510,6 +1510,10 @@
             "key": "man_made",
             "value": "pipeline"
         },
+        {
+            "key": "man_made",
+            "value": "pumping_station"
+        },
         {
             "key": "man_made",
             "value": "silo"

dist/locales/en.json

@@ -3127,6 +3127,10 @@
                 "name": "Pipeline",
                 "terms": ""
             },
+            "man_made/pumping_station": {
+                "name": "Pumping Station",
+                "terms": ""
+            },
             "man_made/silo": {
                 "name": "Silo",
                 "terms": "grain,corn,wheat"