Merge iD v2.19.5 into main!

.eslintrc

@@ -15,58 +15,92 @@
         "sourceType": "module"
     },
     "rules": {
+        "accessor-pairs": "error",
+        "array-callback-return": "warn",
+        "arrow-spacing": "warn",
+        "block-scoped-var": "error",
+        "class-methods-use-this": "error",
+        "complexity": ["warn", 50],
+        "default-case-last": "error",
+        "default-param-last": "error",
         "dot-notation": "error",
         "eqeqeq": ["error", "smart"],
+        "grouped-accessor-pairs": "error",
         "indent": ["off", 4],
         "keyword-spacing": "error",
         "linebreak-style": ["error", "unix"],
+        "no-await-in-loop": "error",
         "no-caller": "error",
         "no-catch-shadow": "error",
         "no-console": "warn",
+        "no-constructor-return": "error",
         "no-div-regex": "error",
+        "no-duplicate-imports": "warn",
+        "no-eq-null": "error",
+        "no-eval": "error",
         "no-extend-native": "error",
         "no-extra-bind": "error",
+        "no-extra-label": "error",
         "no-floating-decimal": "error",
         "no-global-assign": "error",
+        "no-implicit-coercion": ["warn", { "boolean": false, "number": false }],
         "no-implied-eval": "error",
         "no-invalid-this": "off",
         "no-iterator": "error",
         "no-labels": "error",
         "no-label-var": "error",
         "no-lone-blocks": "error",
         "no-loop-func": "error",
+        "no-loss-of-precision": "error",
         "no-multi-str": "error",
         "no-new": "error",
         "no-new-func": "error",
         "no-new-wrappers": "error",
         "no-octal": "error",
         "no-octal-escape": "error",
         "no-process-env": "error",
+        "no-promise-executor-return": "error",
         "no-proto": "error",
         "no-prototype-builtins": "off",
+        "no-restricted-properties": "error",
         "no-return-assign": "off",
+        "no-return-await": "error",
         "no-script-url": "error",
         "no-self-compare": "error",
         "no-sequences": "error",
         "no-shadow": "off",
         "no-shadow-restricted-names": "error",
+        "no-template-curly-in-string": "warn",
         "no-throw-literal": "error",
+        "no-trailing-spaces": "warn",
         "no-undef": "error",
+        "no-undef-init": "warn",
+        "no-unexpected-multiline": "error",
         "no-unneeded-ternary": "error",
+        "no-unmodified-loop-condition": "error",
+        "no-unreachable": "warn",
+        "no-unreachable-loop": "warn",
         "no-unused-expressions": "error",
-        "no-unexpected-multiline": "error",
         "no-unused-vars": "warn",
-        "no-unreachable": "warn",
+        "no-use-before-define": ["off", "nofunc"],
+        "no-useless-backreference": "warn",
+        "no-useless-call": "warn",
+        "no-useless-computed-key": "warn",
+        "no-useless-concat": "warn",
+        "no-useless-constructor": "warn",
         "no-useless-escape": "off",
+        "no-useless-rename": "warn",
         "no-void": "error",
         "no-warning-comments": "warn",
+        "no-whitespace-before-property": "warn",
         "no-with": "error",
-        "no-use-before-define": ["off", "nofunc"],
+        "quotes": ["error", "single"],
         "radix": ["error", "always"],
+        "require-atomic-updates": "error",
+        "require-await": "error",
         "semi": ["error", "always"],
         "semi-spacing": "error",
         "space-unary-ops": "error",
-        "wrap-regex": "off",
-        "quotes": ["error", "single"]
+        "wrap-regex": "off"
     }
 }

.github/workflows/codespell.yml

@@ -0,0 +1,17 @@
+# 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]
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: codespell-project/actions-codespell@master
+        with:
+          check_filenames: true
+          skip: ./.git,./data/territory_languages.json,./data/imagery.json,./data/languages.json,./data/locales.json,./data/address_formats.json,./dist/locales,./docs/img,./dist/img,./data/presets/categories.json,./data/presets/fields.json,./data/presets/presets.json,./data/presets.yaml,./data/taginfo.json,./data/deprecated.json
+          ignore_words_list: "auxilary,casette,cemetary,chancel,childs,extentions,files',froms,generat,guerilla,kindergarden,nd,specialties,vias,visibles,tos"
+          only_warn: 1

.gitignore

@@ -1,12 +1,12 @@
 .DS_Store
 .esm-cache
 .vscode/
+.idea/
 /node_modules/
 /.tx/tmp/
 npm-debug.log
 package-lock.json
 
-the_noun_project.auth
 transifex.auth
 
 /dist/*.js

ACCESSIBILITY.md

@@ -110,7 +110,7 @@ such as opening the edit menu via long-pressing instead of right-clicking.
 |   | Icon | Input Setup | Notes | Issues |
 |---|---|---|---|---|
 | ✅ | 🖱⌨️ | [Mouse](https://en.wikipedia.org/wiki/Computer_mouse) + [keyboard](https://en.wikipedia.org/wiki/Computer_keyboard) | iD's original input paradigm. Any mouse-like device such as a [trackpad](https://en.wikipedia.org/wiki/Touchpad), [trackball](https://en.wikipedia.org/wiki/Trackball), or [pointing stick](https://en.wikipedia.org/wiki/Pointing_stick) is grouped into "mouse" for this table |
-| ❌ | ⌨️   | Keyboard only | Not all elements can necessarily be keyed to. Key traps may exists. Geometry editing isn't possible | [#7770](https://github.com/openstreetmap/iD/issues/7770) |
+| 🟠 | ⌨️   | Keyboard only | iD hasn't been optimized for keyboard-only navigation, but some is possible. Geometry editing isn't possible | [#8004](https://github.com/openstreetmap/iD/issues/8004) |
 | 🟠 | 🖱  | Mouse only | The primary [mouse button](https://en.wikipedia.org/wiki/Mouse_button) (e.g. left click) alone is sufficient. Multiselection and disabling of node-snapping aren't possible |
 | 🟠 | 🖐  | [Multi-touch](https://en.wikipedia.org/wiki/Multi-touch) on a [touchscreen](https://en.wikipedia.org/wiki/Touchscreen) | Moving and rotating selections isn't possible | [#7599](https://github.com/openstreetmap/iD/issues/7599) |
 | 🟠 | ✍️   | [Stylus](https://en.wikipedia.org/wiki/Stylus_(computing)) on a touchscreen | Moving and rotating selections isn't possible, nor is selecting multiple features |
@@ -163,12 +163,14 @@ for more info.
 |   | Multilingual Feature | Notes | Issues |
 |---|---|---|---|
 | ✅ | Browser language preference | iD tries to use the language set in the browser |
-| ❌ | Base language fallback | E.g. if `pt_BR` is incomplete, `pt` should be tried before `en` |
-| ❌ | Custom fallback language | If the preferred language is incomplete, a user-specified one should be tried before `en` (e.g. `kk` → `ru`) |
-| ❌ | [`lang` HTML attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang) | Helps with text-to-speech, text formatting, and auto-transliteration, particularly when iD mixes strings from different languages |
+| ✅ | Base language fallback | E.g. if `pt_BR` is incomplete, `pt` should be tried before `en` | [#7996](https://github.com/openstreetmap/iD/issues/7996)
+| ✅ | Custom fallback languages | If the preferred language is incomplete, user-specified ones should be tried before `en` (e.g. `kk` → `ru`) | [#7996](https://github.com/openstreetmap/iD/issues/7996)
+| 🟠 | [`lang` HTML attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang) | Helps with text-to-speech, text formatting, and auto-transliteration, particularly when iD mixes strings from different languages | [#7963](https://github.com/openstreetmap/iD/issues/7963)
 | ✅ | Locale URL parameters | `locale` and `rtl` can be used to manually set iD's locale preferences. See the [API](API.md#url-parameters) |
 | ❌ | Language selection in UI | The mapper should be able to view and change iD's language in the interface at any time. Useful for public computers with fixed browser languages | [#3120](https://github.com/openstreetmap/iD/issues/3120) |
 | 🟩 | Right-to-left layouts | The [`dir` HTML attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/dir) is properly set for languages like Hebrew and Arabic |
+| ✅ | [Language-specific plurals](https://docs.transifex.com/localization-tips-workflows/plurals-and-genders#how-pluralized-strings-are-handled-by-transifex) | English has two plural forms, but some languages need more to be grammatically correct | [#597](https://github.com/openstreetmap/iD/issues/597), [#7991](https://github.com/openstreetmap/iD/issues/7991) |
+| 🟠 | [Localized number formats](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat) | Most in-text numbers are localized. Numeric fields are not | [#3615](https://github.com/openstreetmap/iD/issues/3615), [#7993](https://github.com/openstreetmap/iD/issues/7993) |
 | 🟠 | Label icons | Icons should accompany text labels to illustrate the meaning of untranslated terms |
 
 ### Translatability
@@ -209,7 +211,8 @@ are kept close to 100% coverage, while most languages have less than 50% coverag
 |---|---|---|---|
 | 🤷 | [Screen reader support](https://en.wikipedia.org/wiki/Screen_reader) | | |
 | 🟠 | [Browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_page-zoom) | Scrolling-to-pan the map may react oddly on some browsers | |
-| 🟠 | [Text-only browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_text-zoom) | Enlarged text can overflow containers that have fixed dimensions | |
+| 🟠 | [Text-only browser zoom](https://support.mozilla.org/en-US/kb/accessibility-features-firefox-make-firefox-and-we#w_text-zoom) | Interface elements scale to compensate larger text sizes. Map labels don't scale | [#7965](https://github.com/openstreetmap/iD/issues/7965) |
+| ✅ | Browser zoom keyboard shortcuts | The <kbd>Cmd</kbd><kbd>+</kbd> and <kbd>Cmd</kbd><kbd>–</kbd> shortcuts used by major browsers are supported | [#7976](https://github.com/openstreetmap/iD/issues/7976) |
 | 🟠 | [Don't rely on color alone](https://www.wuhcag.com/use-of-colour/) | Some classes of map data are indistinguishable except for their colors | |
 | 🤷 | [High-contrast text colors](https://www.wuhcag.com/contrast-enhanced/) | | |
 | ❌ | [Dark mode](https://en.wikipedia.org/wiki/Light-on-dark_color_scheme) | Many people find light-on-dark UIs easier to read under certain conditions | |

API.md

@@ -5,7 +5,7 @@ This file documents efforts toward establishing a public API for iD.
 ##### iD Standalone
 
 iD supports several URL parameters. When constructing a URL to a standalone instance
-of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters are available
+of iD (e.g. `https://ideditor-release.netlify.app`), the following parameters are available
 **in the hash portion of the URL**:
 
 * __`background`__ - The value from a `sourcetag` property in iD's
@@ -31,8 +31,8 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
   _Example:_ `hashtags=%23hotosm-task-592,%23MissingMaps`
 * __`id`__ - The character 'n', 'w', or 'r', followed by the OSM ID of a node, way or relation, respectively. Selects the specified entity, and, unless a `map` parameter is also provided, centers the map on it.<br/>
   _Example:_ `id=n1207480649`
-* __`locale`__ - A code specifying the localization to use, affecting the language, layout, and keyboard shortcuts. The default locale is set by the browser.<br/>
-  _Example:_ `locale=en-US`, `locale=de`<br/>
+* __`locale`__ - A code specifying the localization to use, affecting the language, layout, and keyboard shortcuts. Multiple codes may be specified in order of preference. The first valid code will be the locale, while the rest will be used as fallbacks if certain text hasn't been translated. The default locale preferences are set by the browser.<br/>
+  _Example:_ `locale=ja`, `locale=pt-BR`, `locale=nl,fr,de`<br/>
   _Available values:_ Any of the [supported locales](https://github.com/openstreetmap/iD/tree/develop/dist/locales).
 * __`map`__ - A slash-separated `zoom/latitude/longitude`.<br/>
   _Example:_ `map=20.00/38.90085/-77.02271`
@@ -43,6 +43,13 @@ of iD (e.g. `http://preview.ideditor.com/release/`), the following parameters ar
 * __`photo_overlay`__ - The street-level photo overlay layers to enable.<br/>
   _Example:_ `photo_overlay=streetside,mapillary,openstreetcam`<br/>
   _Available values:_ `streetside` (Microsoft Bing), `mapillary`, `mapillary-signs`, `mapillary-map-features`, `openstreetcam`
+* __`photo_dates`__ - The range of capture dates by which to filter street-level photos. Dates are given in YYYY-MM-DD format and separated by `_`. One-sided ranges are supported.<br/>
+  _Example:_ `photo_dates=2019-01-01_2020-12-31`, `photo_dates=2019-01-01_`, `photo_dates=_2020-12-31`<br/>
+* __`photo_username`__ - The Mapillary or OpenStreetCam username by which to filter street-level photos. Multiple comma-separated usernames are supported.<br/>
+  _Example:_ `photo_user=quincylvania`, `photo_user=quincylvania,chrisbeddow`<br/>
+* __`photo`__ - The service and ID of the street-level photo to show.<br/>
+  _Example:_ `photo=streetside/718514589`<br/>
+  _Available prefixes:_ `streetside/`, `mapillary/`, `openstreetcam/`
 * __`presets`__ - A comma-separated list of preset IDs. These will be the only presets the user may select.<br/>
   _Example:_ `presets=building,highway/residential,highway/unclassified`
 * __`rtl=true`__ - Force iD into right-to-left mode (useful for testing).
@@ -177,7 +184,7 @@ iD is written in a modular style and bundled with [rollup.js](http://rollupjs.or
 which makes hot code replacement tricky.  (ES6 module exports are
 [immutable live bindings](http://www.2ality.com/2015/07/es6-module-exports.html)).
 Because of this, the parts of iD which are designed for customization are exported
-as live bound objects that can be overriden at runtime _before initializing the iD context_.
+as live bound objects that can be overridden at runtime _before initializing the iD context_.
 
 ### Services
 
@@ -219,7 +226,7 @@ iD.fileFetcher.cache().imagery = [{
 ```
 
 Each imagery source should have the following properties:
-* `id` - Unique identifier for this source (also used as a url paramater)
+* `id` - Unique identifier for this source (also used as a url parameter)
 * `name` - Display name for the source
 * `type` - Source type, currently only `tms` is supported
 * `template` - Url template, valid replacement tokens include:

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [1.1.1](https://github.com/facebookincubator/RapiD/releases/tag/rapid-v1.1.1)
+#### 2021-Jan-15th
+#### :bug: Bugfixes:
+#195, #196, and #197.
+#### :trumpet:
+This is a 'refresh' release, based off iD version 2.19.5.
 
 # [1.1.0](https://github.com/facebookincubator/RapiD/releases/tag/rapid-v1.1.0)
 #### 2020-Dec-7th

RELEASING.md

@@ -43,15 +43,15 @@ $  git tag vA.B.C
 $  git push origin -f release vA.B.C
 ```
 - Open https://github.com/openstreetmap/iD/tags
-- Click `•••` –> `Create Release` and link to `CHANGELOG.md` in `Describe this release`
+- Click `•••` –> `Create Release` and link to [`CHANGELOG.md`](https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md) in `Describe this release`
 
 #### Prepare `develop` branch for further development
 
 ```bash
 $  git checkout develop
 ```
 
-- Increment version number and add `-dev` suffix in `modules/core/context.js` and `package.json`
+- Increment version number and add `-dev` suffix in `modules/core/context.js` and `package.json`, e.g. `2.18.5-dev`
 
 ```bash
 $  git add . && git commit -m 'Set development version number'
@@ -81,7 +81,13 @@ $  git push osmlab master
 $  git checkout -b iD-A.B.C
 $  bundle install
 $  rm -rf vendor/assets/iD/* && vendorer
+```
+
+- If there have been any changes to iD's [URL parameters](https://github.com/openstreetmap/iD/blob/develop/API.md#url-parameters), make sure they're reflected in [app/assets/javascripts/edit/id.js.erb](https://github.com/osmlab/openstreetmap-website/blob/master/app/assets/javascripts/edit/id.js.erb).
+
+```bash
 $  git add . && git commit -m 'Update to iD vA.B.C'
 $  git push osmlab
 ```
-- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/develop...osmlab:develop) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/release/CHANGELOG.md) as the comment
+
+- [Open a pull request](https://github.com/openstreetmap/openstreetmap-website/compare/master...osmlab:master) using the [markdown text from the changelog](https://raw.githubusercontent.com/openstreetmap/iD/release/CHANGELOG.md) as the comment

babel.config.json

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env", {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ],
+  "compact": false
+}

config/rollup.config.legacy.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import buble from '@rollup/plugin-buble';
+import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
 import includePaths from 'rollup-plugin-includepaths';
 import json from '@rollup/plugin-json';
@@ -28,7 +28,11 @@ export default {
     nodeResolve({ dedupe: ['object-inspect'] }),
     commonjs(),
     json({ indent: '' }),
-    buble()
+    babel({
+      babelHelpers: 'bundled',
+      // avoid circular dependencies due to `useBuiltIns: usage` option
+      exclude: [/\/core-js\//]
+    })
   ]
 };
 

css/00_reset.css

@@ -67,13 +67,17 @@ textarea {
 
 button,
 input {
-    line-height: normal;
+    line-height: inherit;
+	letter-spacing: inherit;
 }
 
 /* Hide default number spinner controls */
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
-display: none;
+	display: none;
+}
+input[type=number] {
+    -moz-appearance: textfield;
 }
 
 /*

css/30_highways.css

@@ -241,6 +241,12 @@ path.line.stroke.tag-highway-track,
 path.line.stroke.tag-highway-road {
     stroke-width: 5;
 }
+path.line.casing.tag-highway-service.tag-service-driveway {
+    stroke-width: 6.25;
+}
+path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke-width: 4.25;
+}
 
 path.line.shadow.tag-highway-path,
 path.line.shadow.tag-highway-footway,
@@ -288,6 +294,12 @@ path.line.stroke.tag-highway-steps {
 .low-zoom path.line.stroke.tag-highway-road {
     stroke-width: 3;
 }
+.low-zoom  path.line.casing.tag-highway-service.tag-service-driveway {
+    stroke-width: 4.25;
+}
+.low-zoom  path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke-width: 2.25;
+}
 
 .low-zoom path.line.shadow.tag-highway-path,
 .low-zoom path.line.shadow.tag-highway-footway,
@@ -412,6 +424,16 @@ path.line.casing.tag-service.tag-service {
     stroke: #666;
 }
 
+path.line.stroke.tag-highway-service.tag-service-parking_aisle {
+    stroke: #cccac7;
+}
+path.line.stroke.tag-highway-service.tag-service-driveway {
+    stroke: #fff6e4;
+}
+path.line.stroke.tag-highway-service.tag-service-emergency_access {
+    stroke: #ddb2aa;
+}
+
 /* unmaintained track roads */
 path.line.stroke.tag-highway-track,
 path.line.stroke.tag-track {

css/50_misc.css

@@ -1,5 +1,5 @@
 
-/* narrow width miscellanous things */
+/* narrow width miscellaneous things */
 path.line.shadow.tag-aerialway,
 path.line.shadow.tag-attraction-summer_toboggan,
 path.line.shadow.tag-attraction-water_slide,