Merge branch 'prison' of git://github.com/kepta/iD into kepta-prison

data/presets.yaml

@@ -1447,6 +1447,11 @@ en:
         name: Post Office
         # 'terms: letter,mail'
         terms: "<translate with synonyms or related terms for 'Post Office', separated by commas>"
+      amenity/prison:
+        # amenity=prison
+        name: Prison Grounds
+        # 'terms: cell,jail'
+        terms: "<translate with synonyms or related terms for 'Prison Grounds', separated by commas>"
       amenity/pub:
         # amenity=pub
         name: Pub

data/presets/presets.json

@@ -1507,6 +1507,25 @@
         },
         "name": "Post Office"
     },
+    "amenity/prison": {
+        "icon": "prison",
+        "fields": [
+            "operator",
+            "access"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "cell",
+            "jail"
+        ],
+        "tags": {
+            "amenity": "prison"
+        },
+        "name": "Prison Grounds"
+    },
     "amenity/pub": {
         "icon": "beer",
         "fields": [

data/presets/presets/amenity/prison.json

@@ -0,0 +1,19 @@
+{
+    "icon": "prison",
+    "fields": [
+        "operator",
+        "access"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cell",
+        "jail"
+    ],
+    "tags": {
+        "amenity": "prison"
+    },
+    "name": "Prison Grounds"
+}

data/taginfo.json

@@ -324,6 +324,10 @@
             "key": "amenity",
             "value": "post_office"
         },
+        {
+            "key": "amenity",
+            "value": "prison"
+        },
         {
             "key": "amenity",
             "value": "pub"

dist/locales/en.json

@@ -1857,6 +1857,10 @@
                 "name": "Post Office",
                 "terms": "letter,mail"
             },
+            "amenity/prison": {
+                "name": "Prison Grounds",
+                "terms": "cell,jail"
+            },
             "amenity/pub": {
                 "name": "Pub",
                 "terms": "dive,beer,bier,booze"