Merge branch 'main' into HEAD

.github/workflows/build-preview.yml

@@ -12,13 +12,13 @@ jobs:
   build-preview:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - run: npm clean-install
       - run: npm run dist
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: openstreetmap/iD
           path: './iD'

.github/workflows/deploy-preview.yml

@@ -8,17 +8,18 @@ on:
 
 jobs:
   deploy-preview:
+    environment: pr-previews
     runs-on: ubuntu-latest
     if: ${{github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'}}
     steps:
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
-      - run: npm install --global netlify-cli@6
-      - run: npm install unzipper@0.10
+      - run: npm clean-install
 
       - name: Get pull request number
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         id: pull-request-number
         with:
           result-encoding: string
@@ -45,7 +46,7 @@ jobs:
             const file = directory.files.find(d => d.path === 'pr_number');
             const content = await file.buffer();
             return content.toString();
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: dawidd6/action-download-artifact@v8
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: build-preview.yml
@@ -56,10 +57,10 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
           NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
-        run: netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
+        run: ./node_modules/.bin/netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
 
       - name: Add comment to pull request
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const pullRequestNumber = parseInt(${{steps.pull-request-number.outputs.result}}, 10);
@@ -85,7 +86,7 @@ jobs:
             }
 
       - name: Clean up artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |

.github/workflows/deploy.yml

@@ -12,15 +12,15 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
-    if: "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.
+        uses: actions/checkout@v4 # If you're using actions/checkout@v3 you must set persist-credentials to false in most cases for the deployment to work correctly.
         with:
           persist-credentials: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -31,7 +31,7 @@ jobs:
         run: npm run build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.6.1
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          BRANCH: interim # The branch the action should deploy to.
-          FOLDER: interim # The folder the action should deploy.
+          branch: interim # The branch the action should deploy to.
+          folder: interim # The folder the action should deploy.

.github/workflows/lint.yml

@@ -5,7 +5,7 @@ jobs:
     name: Check file endings
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           disallowedFiles=`find data/ -type f -not -iname "*.json" -not -iname "*.md"`
           for f in $disallowedFiles
@@ -18,8 +18,8 @@ jobs:
     name: Check for code formatting mistakes
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - run: npm clean-install
@@ -29,10 +29,10 @@ jobs:
     name: Check for spelling errors
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: codespell-project/actions-codespell@master
+      - uses: actions/checkout@v4
+      - uses: codespell-project/actions-codespell@v2
         with:
           check_filenames: true
           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"
+          ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te,brunch"
           only_warn: 1

.github/workflows/staging.yml

@@ -0,0 +1,57 @@
+name: Build and Deploy Staging Instance
+
+on:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+jobs:
+  build-deploy:
+    if: github.repository == 'openstreetmap/id-tagging-schema'
+    runs-on: ubuntu-latest
+    environment: staging
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      # install and build development version of id-tagging-schema
+      - run: npm clean-install
+      - run: npm run translations
+        env:
+          transifex_password: ${{secrets.TX_TOKEN}}
+        if: env.transifex_password != null
+      - run: npm run dist
+      # install and build development version of iD using freshest version of presets and ELI
+      - uses: actions/checkout@v4
+        with:
+          repository: openstreetmap/id
+          path: './iD'
+      - run: npm clean-install
+        working-directory: './iD'
+      - run: npm install editor-layer-index
+        working-directory: './iD'
+      - run: mkdir dist/data
+        working-directory: './iD'
+      - run: npm run imagery
+        working-directory: './iD'
+      - run: npm run all
+        working-directory: './iD'
+      - run: npm run translations
+        working-directory: './iD'
+        env:
+          transifex_password: ${{secrets.TX_TOKEN}}
+        if: env.transifex_password != null
+      - run: mkdir iD/dist/id-tagging-schema && mv dist iD/dist/id-tagging-schema/dist
+      - run: npm run dist
+        working-directory: './iD'
+        env:
+          ID_PRESETS_CDN_URL: './id-tagging-schema/'
+      # deploy to netlify
+      - name: Deploy to Netlify
+        env:
+          NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
+          NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
+        run: ./node_modules/.bin/netlify deploy --prod --dir=iD/dist

.github/workflows/test.yml

@@ -18,9 +18,9 @@ jobs:
         node-version: ['18']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm clean-install

CHANGELOG.md

@@ -437,7 +437,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Add specific presets for Trees which have the tags `leaf_cycle`/`leaf_type` mapped ([#956])
 #### Changed Presets
 * Add field to specify the type of a `house` ([#921], thanks [@arch0345])
-* Allow Drinking Water to be mapped on verticed ([#925], thanks [@arch0345])
+* Allow Drinking Water to be mapped on vertices ([#925], thanks [@arch0345])
 * Rename preset for Trash Cans and Recycling Bins ([#938], thanks [@arch0345])
 * Add `direction` field to Emergency Bay preset
 * Add more fields to Parcel Locker preset for the tags: `wheelchair`, `indoor` ([#940]), `collection_times`, `surveillance`

data/fields/cycle_barrier.json

@@ -0,0 +1,16 @@
+{
+    "key": "cycle_barrier",
+    "type": "combo",
+    "label": "Type",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "single": "Single",
+            "double": "Double",
+            "triple": "Triple",
+            "diagonal": "Diagonal",
+            "tilted": "Tilted"
+        }
+    }
+}

data/fields/cycle_barrier/installation.json

@@ -0,0 +1,14 @@
+{
+    "key": "cycle_barrier:installation",
+    "type": "combo",
+    "label": "Installation",
+    "customValues": false,
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "fixed": "Fixed",
+            "openable": "Openable",
+            "removable": "Removable"
+        }
+    }
+}

data/fields/deflection.json

@@ -0,0 +1,10 @@
+{
+    "key": "deflection",
+    "type": "number",
+    "label": "Angle",
+    "increment": 5,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "value": "diagonal"
+    }
+}

data/fields/entrance.json

@@ -8,6 +8,7 @@
             "main": "Main",
             "secondary": "Secondary",
             "service": "Service",
+            "shop": "Shop Entrance",
             "exit": "Exit Only",
             "entrance": "Entrance Only",
             "emergency": "Emergency Exit",

data/fields/irrigation_pivot.json

@@ -0,0 +1,16 @@
+{
+    "key": "irrigation",
+    "type": "defaultCheck",
+    "label": "Center-Pivot Irrigation",
+    "terms": [
+        "central pivot irrigation",
+        "water wheel",
+        "circle irrigation"
+    ],
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "pivot": "Yes"
+        }
+    }
+}

data/fields/maxwidth/physical.json

@@ -0,0 +1,6 @@
+{
+    "key": "maxwidth:physical",
+    "type": "roadheight",
+    "label": "Width Limit",
+    "snake_case": false
+}

data/fields/opening.json

@@ -0,0 +1,10 @@
+{
+    "key": "opening",
+    "type": "number",
+    "label": "Opening Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/fields/overlap.json

@@ -0,0 +1,10 @@
+{
+    "key": "overlap",
+    "type": "number",
+    "label": "Overlap Width (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/fields/ref/FR/siret-FR.json

@@ -3,7 +3,7 @@
     "type": "identifier",
     "label": "SIRET Number",
     "urlFormat": "https://annuaire-entreprises.data.gouv.fr/etablissement/{value}",
-    "pattern": "^[0-9]{9}([1-7][0-9]{3}|0[1-9][0-9]{2}|00[1-9][0-9]|000[1-9])[0-9]$",
+    "pattern": "^MONACO[A-Z\\d]{5}001|\\d{9}([1-7]\\d{3}|0[1-9]\\d{2}|00[1-9]\\d|000[1-9])\\d$",
     "locationSet": {
         "include": [
             "fr"

data/fields/spacing.json

@@ -0,0 +1,10 @@
+{
+    "key": "spacing",
+    "type": "number",
+    "label": "Distance Between Barriers (Meters)",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "cycle_barrier",
+        "valueNot": "single"
+    }
+}

data/presets/barrier/cycle_barrier.json

@@ -1,7 +1,17 @@
 {
     "icon": "temaki-cycle_barrier",
     "fields": [
-        "access"
+        "access",
+        "wheelchair",
+        "cycle_barrier",
+        "maxwidth/physical",
+        "opening",
+        "spacing",
+        "overlap",
+        "deflection"
+    ],
+    "moreFields": [
+        "cycle_barrier/installation"
     ],
     "geometry": [
         "vertex"
@@ -10,6 +20,9 @@
         "barrier": "cycle_barrier"
     },
     "terms": [
+        "chicane",
+        "bike chicane",
+        "bike barrier",
         "bicycle barrier",
         "bicycling barrier",
         "bike gates",

data/presets/emergency/fire_hydrant.json

@@ -4,13 +4,13 @@
         "ref",
         "fire_hydrant/type",
         "colour",
+        "fire_hydrant/position",
         "water_source",
         "couplings"
     ],
     "moreFields": [
         "fire_hydrant/diameter",
         "fire_hydrant/pressure",
-        "fire_hydrant/position",
         "level",
         "survey/date"
     ],

data/presets/landuse/farmland.json

@@ -8,7 +8,8 @@
     ],
     "moreFields": [
         "{@templates/contact}",
-        "address"
+        "address",
+        "irrigation_pivot"
     ],
     "geometry": [
         "area"