From 2c534282003b0fc6928d6068904bfd7539633c53 Mon Sep 17 00:00:00 2001
From: Emerson Veenstra <github@emersonveenstra.net>
Date: Wed, 15 Feb 2023 10:55:28 -0500
Subject: [PATCH 1/3] Update danger_area.json

Clearly specify that this is for military areas only, not a general tag for "something that might be dangerous"
---
 data/presets/landuse/military/danger_area.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json
index 6c38b4353..131433c72 100644
--- a/data/presets/landuse/military/danger_area.json
+++ b/data/presets/landuse/military/danger_area.json
@@ -31,5 +31,5 @@
         "troop",
         "war"
     ],
-    "name": "Danger Area"
+    "name": "Military Danger Area"
 }

From 7d839bf3e67a0fe54bf59fee235cc345012ff6d4 Mon Sep 17 00:00:00 2001
From: Emerson Veenstra <github@emersonveenstra.net>
Date: Mon, 27 Feb 2023 12:38:52 -0500
Subject: [PATCH 2/3] update name and only show it for areas, not points or
 lines

---
 .../landuse/military/_danger_area.json        | 20 +++++++++++++++++++
 .../presets/landuse/military/danger_area.json |  4 +---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 data/presets/landuse/military/_danger_area.json

diff --git a/data/presets/landuse/military/_danger_area.json b/data/presets/landuse/military/_danger_area.json
new file mode 100644
index 000000000..2fda3f0b6
--- /dev/null
+++ b/data/presets/landuse/military/_danger_area.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-danger",
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "military": "danger_area"
+    },
+    "addTags": {
+        "landuse": "military",
+        "military": "danger_area"
+    },
+    "terms": [],
+    "searchable": false,
+    "name": "Danger Zone, Access Prohibited"
+}
\ No newline at end of file
diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json
index 131433c72..e5a08072c 100644
--- a/data/presets/landuse/military/danger_area.json
+++ b/data/presets/landuse/military/danger_area.json
@@ -4,8 +4,6 @@
         "name"
     ],
     "geometry": [
-        "point",
-        "vertex",
         "area"
     ],
     "tags": {
@@ -31,5 +29,5 @@
         "troop",
         "war"
     ],
-    "name": "Military Danger Area"
+    "name": "Danger Zone, Access Prohibited"
 }

From 1274e8037c70c5dec72637741f8315feeb1fdb30 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 6 Mar 2023 11:52:05 +0100
Subject: [PATCH 3/3] reference name and fields from main preset; lint

---
 .../{_danger_area.json => _danger_area_point.json}         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename data/presets/landuse/military/{_danger_area.json => _danger_area_point.json} (76%)

diff --git a/data/presets/landuse/military/_danger_area.json b/data/presets/landuse/military/_danger_area_point.json
similarity index 76%
rename from data/presets/landuse/military/_danger_area.json
rename to data/presets/landuse/military/_danger_area_point.json
index 2fda3f0b6..61bd87c5d 100644
--- a/data/presets/landuse/military/_danger_area.json
+++ b/data/presets/landuse/military/_danger_area_point.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-danger",
     "fields": [
-        "name"
+        "{landuse/military/danger_area}"
     ],
     "geometry": [
         "point",
@@ -14,7 +14,6 @@
         "landuse": "military",
         "military": "danger_area"
     },
-    "terms": [],
     "searchable": false,
-    "name": "Danger Zone, Access Prohibited"
-}
\ No newline at end of file
+    "name": "{landuse/military/danger_area}"
+}