Merge branch 'openstreetmap:main' into deprecated_parking

Author: tiptoptom

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,72 @@
+### Description, Motivation & Context
+
+<!-- Help readers to understand why this is relevant -->
+
+### Related issues
+
+<!-- Please link any related issues here. 
+     Use "Closes #123" to reference issues that should be closed automatically when this is merged. -->
+
+### Links and data
+
+**Relevant OSM Wiki links:**
+- …
+
+**Relevant tag usage stats:**
+> …
+<!-- E.g., Numbers from Taginfo https://taginfo.openstreetmap.org/ and maybe local Taginfo https://taginfo.geofabrik.de/ -->
+<!-- E.g., a link to https://taghistory.raifer.tech -->
+
+### Checklist and Test-Documentation Template
+
+<details><summary>Read on to get your PR merged faster…</summary>
+
+Follow these steps to test your PR yourself and make it a lot easier and faster for maintainers to check and approve it.
+
+**This is how it works:**
+1. After you submit your PR, the system will create a preview and comment on your PR:
+   > 🍱 You can preview the tagging presets of this pull request here.
+   If this is your first contribution to this project, the preview will not happen right away but requires a click from one of the project members. We will do this ASAP.
+
+2. Once the preview is ready, use it to test your changes.
+
+3. Now copy the snippet below into a new comment and fill out the blanks.
+
+4. Now your PR is ready to be reviewed.
+
+```
+## Test-Documentation
+
+### Preview links & Sidebar Screenshots
+
+<!-- Use the preview to find examples, select the feature in question and **copy this link here**.
+     Find examples of nodes/areas. Find examples with a lot of tags or very few tags. – Whatever helps to test this thoroughly.
+     Add relevant **screenshots** of the sidebar of those examples. -->
+
+<!-- FYI: What we will check:
+     - Is the [icon](https://github.com/ideditor/schema-builder/blob/main/ICONS.md) well chosen.
+     - Are the fields well-structured and have good labels.
+     - Do the dropdowns (etc.) work well and show helpful data. -->
+
+### Search
+
+<!-- **Test the search** of your preset and share relevant **screenshots** here.
+     - Test the preset name as search terms.
+     - Also test the preset terms and aliases as search terms (if present). -->
+
+### Info-`i`
+
+<!-- **Test the info-i** for your fields and preset and share relevant **screenshots** here.
+     The info needs to help mappers understand the preset and when to use it.
+     [Learn more…](https://github.com/tordans/id-tagging-schema/blob/main/CONTRIBUTING.md#info-i)
+ -->
+
+### Wording
+
+- [ ] American English
+- [ ] `name`, `aliases` (if present) use Title Case
+- [ ] `terms` (if present) use lower case, sorted A-Z
+<!-- Learn more in https://github.com/openstreetmap/id-tagging-schema/blob/main/GUIDELINES.md#2-design-the-preset -->
+```
+
+</details>

.github/workflows/deploy-preview.yml

@@ -78,7 +78,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 issue_number: pullRequestNumber,
-                body: `${start} Preview the tagging presets of this pull request here: https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en.`
+                body: `${start} You can preview the tagging presets of this pull request [here](https://pr-${pullRequestNumber}--ideditor-presets-preview.netlify.app/id/dist/#locale=en).`
               });
             } else {
               console.log(`Preview URL comment already added to PR #${pullRequestNumber}`);

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'Deploy') && github.repository == 'openstreetmap/id-tagging-schema'"
+    if: "github.repository == 'openstreetmap/id-tagging-schema'"
     steps:
       - name: Checkout
         uses: actions/checkout@v3 # If you're using actions/checkout@v3 you must set persist-credentials to false in most cases for the deployment to work correctly.
@@ -31,8 +31,7 @@ jobs:
         run: npm run build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.0
+        uses: JamesIves/github-pages-deploy-action@v4.6.1
         with:
-          BRANCH: main # The branch the action should deploy to.
-          FOLDER: . # The folder the action should deploy.
-          CLEAN: false # Automatically remove deleted files from the deploy branch
+          BRANCH: interim # The branch the action should deploy to.
+          FOLDER: interim # The folder the action should deploy.

.github/workflows/lint.yml

@@ -34,7 +34,7 @@ jobs:
       - uses: codespell-project/actions-codespell@master
         with:
           check_filenames: true
-          skip: ./.git,./dist/translations
+          skip: ./.git,./dist,./data/deprecated.json,./data/discarded.json
           ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te"
           only_warn: 1
 

.prettierrc

@@ -1,6 +1,6 @@
 {
-	"parser": "json-stringify",
-	"proseWrap": "never",
-	"bracketSpacing": true,
-	"endOfLine": "lf"
+    "parser": "json-stringify",
+    "proseWrap": "never",
+    "bracketSpacing": true,
+    "endOfLine": "lf"
 }

.vscode/settings.json

@@ -36,5 +36,8 @@
             ],
             "url": "./node_modules/@ideditor/schema-builder/schemas/preset_defaults.json"
         }
-    ]
+    ],
+    "files.exclude": {
+        "**/dist": true
+    }
 }