From df1324ebf2667358ed4e995e422be61c0770b5db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 11:59:30 +0200 Subject: [PATCH 1/3] Bump prettier from 2.8.8 to 3.0.0 (#948) Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index f51d0251..b7b88038 100644 --- a/package-lock.json +++ b/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": { diff --git a/package.json b/package.json index ded2f756..8a21c522 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,6 @@ }, "devDependencies": { "@ideditor/schema-builder": "~6.3.0", - "prettier": "~2.8.0" + "prettier": "~3.0.0" } } From 0e30e9fcce73c679cb168daeb467dce7f5501415 Mon Sep 17 00:00:00 2001 From: archpdx Date: Mon, 10 Jul 2023 05:22:36 -0700 Subject: [PATCH 2/3] Add Hazardous Area preset (#952) Also renamed `miliary=danger_area` preset to "Military Danger Area" --- data/fields/hazard_boundary.json | 19 +++++++++++++++++++ data/presets/boundary/hazard.json | 18 ++++++++++++++++++ .../presets/landuse/military/danger_area.json | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 data/fields/hazard_boundary.json create mode 100644 data/presets/boundary/hazard.json diff --git a/data/fields/hazard_boundary.json b/data/fields/hazard_boundary.json new file mode 100644 index 00000000..d7ff255e --- /dev/null +++ b/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" +} diff --git a/data/presets/boundary/hazard.json b/data/presets/boundary/hazard.json new file mode 100644 index 00000000..a2bb5d4e --- /dev/null +++ b/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" +} diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json index e5a08072..c175261d 100644 --- a/data/presets/landuse/military/danger_area.json +++ b/data/presets/landuse/military/danger_area.json @@ -29,5 +29,5 @@ "troop", "war" ], - "name": "Danger Zone, Access Prohibited" + "name": "Military Danger Area" } From 33988712e5d3cabdcc4a199eabe085a34defb6aa Mon Sep 17 00:00:00 2001 From: tyrasd Date: Mon, 10 Jul 2023 12:22:58 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Deploying=20to=20main=20from=20@=20openstre?= =?UTF-8?q?etmap/id-tagging-schema@0e30e9fcce73c679cb168daeb467dce7f550141?= =?UTF-8?q?5=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interim/source_strings.yaml | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 001361d1..0c2ce321 100644 --- a/interim/source_strings.yaml +++ b/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: + 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: 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: 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: + terms: 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: