Skip to content

Commit 71392bc

Browse files
tyrasdtyrasd
committed
Merge branch 'main' into HEAD
2 parents e41e600 + 9da3edf commit 71392bc

22 files changed

+28113
-582
lines changed

‎.github/workflows/build-preview.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
build-preview:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-node@v3
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-node@v4
1717
with:
1818
node-version-file: '.nvmrc'
1919
- run: npm clean-install
2020
- run: npm run dist
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
repository: openstreetmap/iD
2424
path: './iD'

‎.github/workflows/deploy-preview.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ on:
88

99
jobs:
1010
deploy-preview:
11+
environment: pr-previews
1112
runs-on: ubuntu-latest
1213
if: ${{github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'}}
1314
steps:
14-
- uses: actions/setup-node@v3
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-node@v4
1517
with:
1618
node-version: '18'
17-
- run: npm install --global netlify-cli@6
18-
- run: npm install unzipper@0.10
19+
- run: npm clean-install
1920

2021
- name: Get pull request number
21-
uses: actions/github-script@v6
22+
uses: actions/github-script@v7
2223
id: pull-request-number
2324
with:
2425
result-encoding: string
@@ -45,7 +46,7 @@ jobs:
4546
const file = directory.files.find(d => d.path === 'pr_number');
4647
const content = await file.buffer();
4748
return content.toString();
48-
- uses: dawidd6/action-download-artifact@v6
49+
- uses: dawidd6/action-download-artifact@v8
4950
with:
5051
github_token: ${{secrets.GITHUB_TOKEN}}
5152
workflow: build-preview.yml
@@ -56,10 +57,10 @@ jobs:
5657
env:
5758
NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
5859
NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
59-
run: netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
60+
run: ./node_modules/.bin/netlify deploy --dir=. --alias=pr-${{steps.pull-request-number.outputs.result}}
6061

6162
- name: Add comment to pull request
62-
uses: actions/github-script@v6
63+
uses: actions/github-script@v7
6364
with:
6465
script: |
6566
const pullRequestNumber = parseInt(${{steps.pull-request-number.outputs.result}}, 10);
@@ -85,7 +86,7 @@ jobs:
8586
}
8687
8788
- name: Clean up artifact
88-
uses: actions/github-script@v6
89+
uses: actions/github-script@v7
8990
with:
9091
result-encoding: string
9192
script: |

‎.github/workflows/deploy.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
deploy:
1313
name: Deploy
1414
runs-on: ubuntu-latest
15-
if: "github.repository == 'openstreetmap/id-tagging-schema'"
15+
if: github.repository == 'openstreetmap/id-tagging-schema'
1616
steps:
1717
- name: Checkout
18-
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.
18+
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.
1919
with:
2020
persist-credentials: false
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version-file: '.nvmrc'
2626

@@ -31,7 +31,7 @@ jobs:
3131
run: npm run build
3232

3333
- name: Deploy 🚀
34-
uses: JamesIves/github-pages-deploy-action@v4.6.1
34+
uses: JamesIves/github-pages-deploy-action@v4
3535
with:
36-
BRANCH: interim # The branch the action should deploy to.
37-
FOLDER: interim # The folder the action should deploy.
36+
branch: interim # The branch the action should deploy to.
37+
folder: interim # The folder the action should deploy.

‎.github/workflows/lint.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: Check file endings
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
99
- run: |
1010
disallowedFiles=`find data/ -type f -not -iname "*.json" -not -iname "*.md"`
1111
for f in $disallowedFiles
@@ -18,8 +18,8 @@ jobs:
1818
name: Check for code formatting mistakes
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-node@v3
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-node@v4
2323
with:
2424
node-version-file: '.nvmrc'
2525
- run: npm clean-install
@@ -29,10 +29,10 @@ jobs:
2929
name: Check for spelling errors
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v3
33-
- uses: codespell-project/actions-codespell@master
32+
- uses: actions/checkout@v4
33+
- uses: codespell-project/actions-codespell@v2
3434
with:
3535
check_filenames: true
3636
skip: ./.git,./dist,./data/deprecated.json,./data/discarded.json
37-
ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te"
37+
ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te,brunch"
3838
only_warn: 1

‎.github/workflows/staging.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Build and Deploy Staging Instance
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
build-deploy:
12+
if: github.repository == 'openstreetmap/id-tagging-schema'
13+
runs-on: ubuntu-latest
14+
environment: staging
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version-file: '.nvmrc'
20+
# install and build development version of id-tagging-schema
21+
- run: npm clean-install
22+
- run: npm run translations
23+
env:
24+
transifex_password: ${{secrets.TX_TOKEN}}
25+
if: env.transifex_password != null
26+
- run: npm run dist
27+
# install and build development version of iD using freshest version of presets and ELI
28+
- uses: actions/checkout@v4
29+
with:
30+
repository: openstreetmap/id
31+
path: './iD'
32+
- run: npm clean-install
33+
working-directory: './iD'
34+
- run: npm install editor-layer-index
35+
working-directory: './iD'
36+
- run: mkdir dist/data
37+
working-directory: './iD'
38+
- run: npm run imagery
39+
working-directory: './iD'
40+
- run: npm run all
41+
working-directory: './iD'
42+
- run: npm run translations
43+
working-directory: './iD'
44+
env:
45+
transifex_password: ${{secrets.TX_TOKEN}}
46+
if: env.transifex_password != null
47+
- run: mkdir iD/dist/id-tagging-schema && mv dist iD/dist/id-tagging-schema/dist
48+
- run: npm run dist
49+
working-directory: './iD'
50+
env:
51+
ID_PRESETS_CDN_URL: './id-tagging-schema/'
52+
# deploy to netlify
53+
- name: Deploy to Netlify
54+
env:
55+
NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
56+
NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
57+
run: ./node_modules/.bin/netlify deploy --prod --dir=iD/dist

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
node-version: ['18']
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
- run: npm clean-install

‎CHANGELOG.md‎

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

‎data/fields/cycle_barrier.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"key": "cycle_barrier",
3+
"type": "combo",
4+
"label": "Type",
5+
"customValues": false,
6+
"autoSuggestions": false,
7+
"strings": {
8+
"options": {
9+
"single": "Single",
10+
"double": "Double",
11+
"triple": "Triple",
12+
"diagonal": "Diagonal",
13+
"tilted": "Tilted"
14+
}
15+
}
16+
}

‎data/fields/cycle_barrier/installation.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"key": "cycle_barrier:installation",
3+
"type": "combo",
4+
"label": "Installation",
5+
"customValues": false,
6+
"autoSuggestions": false,
7+
"strings": {
8+
"options": {
9+
"fixed": "Fixed",
10+
"openable": "Openable",
11+
"removable": "Removable"
12+
}
13+
}
14+
}

‎data/fields/deflection.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"key": "deflection",
3+
"type": "number",
4+
"label": "Angle",
5+
"increment": 5,
6+
"prerequisiteTag": {
7+
"key": "cycle_barrier",
8+
"value": "diagonal"
9+
}
10+
}

0 commit comments

Comments
 (0)
⚡