Skip to content

Commit

Permalink
Merge release branch v2.29.0
Browse files Browse the repository at this point in the history
  • Loading branch information
royallsilwallz committed Jul 30, 2024
2 parents 886ee5f + 6c3eae8 commit a95c38f
Show file tree
Hide file tree
Showing 3,307 changed files with 542,834 additions and 87,307 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .codespellignorelines
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Rename sculpter to sculptor ([#4504], thanks [@simonpoole])
.fillD {
72 changes: 0 additions & 72 deletions .eslintrc

This file was deleted.

14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
blank_issues_enabled: true
contact_links:
- name: There is an issue with presets or osm tagging recommendations
url: https://github.com/openstreetmap/id-tagging-schema/issues
about: Please share your feedback in the id-tagging-schema repository.
- name: There is an issue with brand icons or brand tagging recommendations.
url: https://github.com/osmlab/name-suggestion-index/issues
about: Please create a feature request in the name-suggestion-index repository.
- name: There is an issue with a background imagery source.
url: https://github.com/osmlab/editor-layer-index/issues
about: Please create an issue in the editor-layer-index repository.
- name: You have a general question or want to discuss something.
url: https://github.com/openstreetmap/iD/discussions
about: Please ask and answer questions in iD's Discussions tab.
68 changes: 68 additions & 0 deletions .github/ISSUE_TEMPLATE/id_editor_bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: 'iD Editor: Bug'
description: You found an issue with iD Editor on openstreetmap.org/edit.
# title:
# labels:
# assignees:
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: url
attributes:
label: URL
description: Please share the URL where the issue can be seen.
placeholder: https://www.openstreetmap.org/edit#map=…
validations:
required: false
- type: textarea
id: steps-reproduce
attributes:
label: How to reproduce the issue?
description: Please share the steps to reproduce the issue.
placeholder: 1. …, 2. …, 3. …
validations:
required: false
- type: textarea
attributes:
label: Screenshot(s) or anything else?
description: Please add screenshots or additional information to help us understand your issue.
placeholder:
validations:
required: false
- type: dropdown
id: environment-variant
attributes:
label: Which deployed environments do you see the issue in?
description: "If possible, please test this issue in the development version (here: https://ideditor.netlify.app) as well, to make sure it is not already fixed."
multiple: true
options:
- Released version at openstreetmap.org/edit
- Development version at ideditor.netlify.app
- RapiD version at mapwith.ai/rapid
validations:
required: false
- type: input
id: version
attributes:
label: What version numbers does this issue effect?
description: This can be found in the bottom right corner, next to the 'Help translate' button.
placeholder: "For example: 2.20.3, 2.21.0, etc."
validations:
required: false
- type: dropdown
id: browsers
attributes:
label: Which browsers are you seeing this problem on?
multiple: true
options:
- Chrome
- Firefox
- Microsoft Edge
- Opera
- Safari
- Vivaldi
- Other (please specify)
validations:
required: false
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/id_editor_feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'iD Editor: Feature, Idea, Question'
description: You want to request a feature, share an idea or have a question.
# title:
# labels:
# assignees:
body:
- type: textarea
id: idea
attributes:
label: Description
description: Please describe you feature request, idea or question.
placeholder:
validations:
required: false
- type: textarea
attributes:
label: Screenshots
description: Please add screenshots if they can help us understand your request/idea/question.
placeholder:
validations:
required: false
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
labels:
- "chore-dependabot"
ignore:
- dependency-name: "sinon"
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: build

on:
push:
branches: [ main, develop ]
pull_request:
branches: [ main, develop ]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: ['18', '20']

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: npm clean-install
env:
FORCE_COLOR: 2
- run: npm run all
env:
FORCE_COLOR: 2
- run: npm run test
env:
FORCE_COLOR: 2
21 changes: 21 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# GitHub Action to automate the identification of common misspellings in text files.
# https://github.com/codespell-project/actions-codespell
# https://github.com/codespell-project/codespell
name: codespell
on: [push, pull_request]
permissions:
contents: read

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: codespell-project/actions-codespell@master
with:
check_filenames: true
skip: ./.git,./data/territory_languages.json,./data/imagery.json,./data/languages.json,./data/address_formats.json,./dist/locales,./docs/img,./dist/img,./css
ignore_words_list: "auxilary,casette,cemetary,chancel,childs,extentions,falsy,files',froms,generat,guerilla,inflight,kindergarden,nd,ot,pavillion,specialties,tos,vias,visibles"
exclude_file: .codespellignorelines
only_warn: 1
30 changes: 30 additions & 0 deletions .github/workflows/transifex.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# This workflow will push the iD source strings to transifex
# - requires TX_TOKEN secret to be set on GitHub
# - you can generate a token at https://www.transifex.com/user/settings/api/
# - job does not run if no token provided

name: transifex

on:
push:
branches:
- develop

permissions:
contents: read

jobs:
transifex:
runs-on: ubuntu-latest
environment: workflows

steps:
- uses: actions/checkout@v3
- name: Install Transifex client
run: |
curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
- name: Push source strings to Transifex
env:
TX_TOKEN: ${{secrets.TX_TOKEN}}
if: env.TX_TOKEN != null
run: ./tx push --source --use-git-timestamps --skip id-editor.core
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
.DS_Store
.esm-cache
.vscode/
.idea/
/node_modules/
/.tx/tmp/
npm-debug.log
package-lock.json
.env

the_noun_project.auth
transifex.auth

/dist/*.js
/dist/*.css
/dist/*.map
/dist/esbuild.json
/dist/data/
/dist/img/*.svg
/dist/locales/en.min.json
/dist/mapillary-js/
/dist/pannellum-streetside/
/dist/pannellum/

/coverage/

# autogenerated symlinks
land.html
/img
/css/img
/test/css
/test/img
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ transifex.auth

/docs/
/test/

/coverage/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

26 changes: 14 additions & 12 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
[main]
host = https://www.transifex.com
minimum_perc = 1

[id-editor.community]
[o:openstreetmap:p:id-editor:r:community]
file_filter = .tx/tmp/community/<lang>.yaml
source_file = .tx/tmp/community/en.yaml
source_lang = en
type = YAML
type = YAML

[id-editor.core]
[o:openstreetmap:p:id-editor:r:core]
file_filter = .tx/tmp/core/<lang>.yaml
source_file = data/core.yaml
source_lang = en
type = YAML
type = YAML

[id-editor.presets]
file_filter = .tx/tmp/presets/<lang>.yaml
source_file = data/presets.yaml
[o:openstreetmap:p:id-editor:r:imagery]
file_filter = .tx/tmp/imagery/<lang>.yaml
source_file = .tx/tmp/imagery/en.yaml
source_lang = en
type = YAML
type = YAML

[id-editor.imagery]
file_filter = .tx/tmp/imagery/<lang>.yaml
[o:openstreetmap:p:id-editor:r:presets]
file_filter = .tx/tmp/presets/<lang>.yaml
source_file = .tx/tmp/presets/en.yaml
source_lang = en
type = YAML
type = YAML

Loading

0 comments on commit a95c38f

Please sign in to comment.