From 5d535b90088f69838eb2b287d4eef385db1477d3 Mon Sep 17 00:00:00 2001
From: Aruna S <aruna@Arunas-MacBook-Pro.local>
Date: Tue, 13 Oct 2015 12:23:06 +0530
Subject: [PATCH] Add military presets (fixes #2177)

---
 data/presets.yaml                             | 20 +++++++
 data/presets/presets.json                     | 60 +++++++++++++++++++
 data/presets/presets/military/checkpoint.json | 12 ++++
 .../presets/presets/military/danger_area.json | 12 ++++
 data/presets/presets/military/naval_base.json | 12 ++++
 .../presets/military/obstacle_course.json     | 12 ++++
 .../presets/military/training_area.json       | 12 ++++
 data/taginfo.json                             | 20 +++++++
 dist/locales/en.json                          | 20 +++++++
 9 files changed, 180 insertions(+)
 create mode 100644 data/presets/presets/military/checkpoint.json
 create mode 100644 data/presets/presets/military/danger_area.json
 create mode 100644 data/presets/presets/military/naval_base.json
 create mode 100644 data/presets/presets/military/obstacle_course.json
 create mode 100644 data/presets/presets/military/training_area.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 479b66fbe..cc1f7fb76 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2591,10 +2591,30 @@ en:
         # military=bunker
         name: Bunker
         terms: "<translate with synonyms or related terms for 'Bunker', separated by commas>"
+      military/checkpoint:
+        # military=checkpoint
+        name: Checkpoint
+        terms: "<translate with synonyms or related terms for 'Checkpoint', separated by commas>"
+      military/danger_area:
+        # military=danger_area
+        name: Danger Area
+        terms: "<translate with synonyms or related terms for 'Danger Area', separated by commas>"
+      military/naval_base:
+        # military=naval_base
+        name: Naval Base
+        terms: "<translate with synonyms or related terms for 'Naval Base', separated by commas>"
+      military/obstacle_course:
+        # military=obstacle_course
+        name: Obstacle Course
+        terms: "<translate with synonyms or related terms for 'Obstacle Course', separated by commas>"
       military/range:
         # military=range
         name: Military Range
         terms: "<translate with synonyms or related terms for 'Military Range', separated by commas>"
+      military/training_area:
+        # military=training_area
+        name: Training area
+        terms: "<translate with synonyms or related terms for 'Training area', separated by commas>"
       natural:
         # 'natural=*'
         name: Natural
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3f530187a..69343913e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5925,6 +5925,54 @@
         },
         "name": "Bunker"
     },
+    "military/checkpoint": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "military": "checkpoint"
+        },
+        "name": "Checkpoint"
+    },
+    "military/danger_area": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "military": "danger_area"
+        },
+        "name": "Danger Area"
+    },
+    "military/naval_base": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "military": "naval_base"
+        },
+        "name": "Naval Base"
+    },
+    "military/obstacle_course": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "military": "obstacle_course"
+        },
+        "name": "Obstacle Course"
+    },
     "military/range": {
         "geometry": [
             "point",
@@ -5937,6 +5985,18 @@
         },
         "name": "Military Range"
     },
+    "military/training_area": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "military": "training_area"
+        },
+        "name": "Training area"
+    },
     "natural": {
         "fields": [
             "natural"
diff --git a/data/presets/presets/military/checkpoint.json b/data/presets/presets/military/checkpoint.json
new file mode 100644
index 000000000..eb36b2b75
--- /dev/null
+++ b/data/presets/presets/military/checkpoint.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "military": "checkpoint"
+    },
+    "name": "Checkpoint"
+}
\ No newline at end of file
diff --git a/data/presets/presets/military/danger_area.json b/data/presets/presets/military/danger_area.json
new file mode 100644
index 000000000..8b17fa513
--- /dev/null
+++ b/data/presets/presets/military/danger_area.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "military": "danger_area"
+    },
+    "name": "Danger Area"
+}
\ No newline at end of file
diff --git a/data/presets/presets/military/naval_base.json b/data/presets/presets/military/naval_base.json
new file mode 100644
index 000000000..c627a3b2b
--- /dev/null
+++ b/data/presets/presets/military/naval_base.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "military": "naval_base"
+    },
+    "name": "Naval Base"
+}
\ No newline at end of file
diff --git a/data/presets/presets/military/obstacle_course.json b/data/presets/presets/military/obstacle_course.json
new file mode 100644
index 000000000..b07aaff5a
--- /dev/null
+++ b/data/presets/presets/military/obstacle_course.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "military": "obstacle_course"
+    },
+    "name": "Obstacle Course"
+}
\ No newline at end of file
diff --git a/data/presets/presets/military/training_area.json b/data/presets/presets/military/training_area.json
new file mode 100644
index 000000000..31e1b1310
--- /dev/null
+++ b/data/presets/presets/military/training_area.json
@@ -0,0 +1,12 @@
+{
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [],
+    "tags": {
+        "military": "training_area"
+    },
+    "name": "Training area"
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 545e8c262..3161ebc82 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1378,10 +1378,30 @@
             "key": "military",
             "value": "bunker"
         },
+        {
+            "key": "military",
+            "value": "checkpoint"
+        },
+        {
+            "key": "military",
+            "value": "danger_area"
+        },
+        {
+            "key": "military",
+            "value": "naval_base"
+        },
+        {
+            "key": "military",
+            "value": "obstacle_course"
+        },
         {
             "key": "military",
             "value": "range"
         },
+        {
+            "key": "military",
+            "value": "training_area"
+        },
         {
             "key": "natural"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index adc0f7421..0d7c4d3c1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2858,10 +2858,30 @@
                 "name": "Bunker",
                 "terms": ""
             },
+            "military/checkpoint": {
+                "name": "Checkpoint",
+                "terms": ""
+            },
+            "military/danger_area": {
+                "name": "Danger Area",
+                "terms": ""
+            },
+            "military/naval_base": {
+                "name": "Naval Base",
+                "terms": ""
+            },
+            "military/obstacle_course": {
+                "name": "Obstacle Course",
+                "terms": ""
+            },
             "military/range": {
                 "name": "Military Range",
                 "terms": ""
             },
+            "military/training_area": {
+                "name": "Training area",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""