Merge branch 'openstreetmap:main' into barangay_health_station

data/fields/hazard_boundary.json

@@ -0,0 +1,19 @@
+{
+    "key": "hazard",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "archery_range": "Arrows",
+            "avalanche": "Avalanche",
+            "biohazard": "Biohazard",
+            "contamination": "Chemical Contamination",
+            "electricity": "Electric Shock",
+            "shooting_range": "Gunfire",
+            "hole": "Hole",
+            "minefield": "Land Mines",
+            "nuclear": "Nuclear / Radioactive",
+            "quicksand": "Quicksand"
+        }
+    },
+    "label": "Hazard"
+}

data/presets/boundary/hazard.json

@@ -0,0 +1,18 @@
+{
+    "icon": "fas-triangle-exclamation",
+    "fields": [
+        "name",
+        "hazard_boundary"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "boundary": "hazard"
+    },
+    "terms": [
+        "danger",
+        "prohibited"
+    ],
+    "name": "Hazardous Area"
+}

data/presets/landuse/military/danger_area.json

@@ -29,5 +29,5 @@
         "troop",
         "war"
     ],
-    "name": "Danger Zone, Access Prohibited"
+    "name": "Military Danger Area"
 }

interim/source_strings.yaml

@@ -2314,6 +2314,30 @@ en:
         label: Hashtags
         # hashtags field placeholder
         placeholder: '#example'
+      hazard_boundary:
+        # hazard=*
+        label: Hazard
+        options:
+          # hazard=archery_range
+          archery_range: Arrows
+          # hazard=avalanche
+          avalanche: Avalanche
+          # hazard=biohazard
+          biohazard: Biohazard
+          # hazard=contamination
+          contamination: Chemical Contamination
+          # hazard=electricity
+          electricity: Electric Shock
+          # hazard=hole
+          hole: Hole
+          # hazard=minefield
+          minefield: Land Mines
+          # hazard=nuclear
+          nuclear: Nuclear / Radioactive
+          # hazard=quicksand
+          quicksand: Quicksand
+          # hazard=shooting_range
+          shooting_range: Gunfire
       healthcare:
         # healthcare=*
         label: Type
@@ -7640,6 +7664,11 @@ en:
         # boundary=administrative | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Administrative Boundary
         terms: <translate with synonyms or related terms for 'Administrative Boundary', separated by commas>
+      boundary/hazard:
+        # boundary=hazard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Hazardous Area
+        # 'terms: danger,prohibited'
+        terms: <translate with synonyms or related terms for 'Hazardous Area', separated by commas>
       bridge/support:
         # bridge:support=* | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Bridge Support
@@ -9252,9 +9281,9 @@ en:
         terms: <translate with synonyms or related terms for 'Naval Base', separated by commas>
       landuse/military/danger_area:
         # military=danger_area | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Danger Zone, Access Prohibited
+        name: Military Danger Area
         # 'terms: air force,army,base,blast,bomb,explosion,explosive,force,guard,marine,mine,navy,troop,war'
-        terms: <translate with synonyms or related terms for 'Danger Zone, Access Prohibited', separated by commas>
+        terms: <translate with synonyms or related terms for 'Military Danger Area', separated by commas>
       landuse/military/danger_area_point:
         # military=danger_area | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
       landuse/military/obstacle_course:

package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "devDependencies": {
         "@ideditor/schema-builder": "~6.3.0",
-        "prettier": "~2.8.0"
+        "prettier": "~3.0.0"
       }
     },
     "node_modules/@ideditor/schema-builder": {
@@ -512,15 +512,15 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
+      "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
       "dev": true,
       "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"
@@ -1232,9 +1232,9 @@
       }
     },
     "prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz",
+      "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
       "dev": true
     },
     "rechoir": {

package.json

@@ -21,6 +21,6 @@
   },
   "devDependencies": {
     "@ideditor/schema-builder": "~6.3.0",
-    "prettier": "~2.8.0"
+    "prettier": "~3.0.0"
   }
 }