From da12c593cd8b47ee6691501a89d77e3709049e72 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 15:53:01 +0100 Subject: [PATCH 01/14] Initial codespell action config --- .github/codespell.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/codespell.yml diff --git a/.github/codespell.yml b/.github/codespell.yml new file mode 100644 index 000000000..f39b30505 --- /dev/null +++ b/.github/codespell.yml @@ -0,0 +1,15 @@ +# 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 From 9c5f408c7d39d4720f4e2a57ec6cb14bf3fc9025 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 15:55:15 +0100 Subject: [PATCH 02/14] Fix the workflow config location --- .github/{ => workflows}/codespell.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/codespell.yml (100%) diff --git a/.github/codespell.yml b/.github/workflows/codespell.yml similarity index 100% rename from .github/codespell.yml rename to .github/workflows/codespell.yml From ecc93014da6bb864f438cfa11b772c62b7a41207 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 16:14:05 +0100 Subject: [PATCH 03/14] Skip and ignore some stuff --- .github/workflows/codespell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index f39b30505..47ead2316 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -12,4 +12,5 @@ jobs: - uses: codespell-project/actions-codespell@master with: check_filenames: true - skip: ./.git + 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/ + ignore_words_list: "nd,chancel" From d76ab299356e6d5bad1e501fb961ae6a2d72e7e7 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 16:25:58 +0100 Subject: [PATCH 04/14] Skip some other auto-generated files --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 47ead2316..c87418bce 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -12,5 +12,5 @@ jobs: - 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/ + 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 ignore_words_list: "nd,chancel" From 977c15fe5485b085fb0405f14f0291c8d850a718 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 16:34:07 +0100 Subject: [PATCH 05/14] Work with our dodgy skip behaviour --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index c87418bce..e58540aa3 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -12,5 +12,5 @@ jobs: - 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 + 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 ignore_words_list: "nd,chancel" From 2c47a110084155abd870fe82faa07cba324b8778 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 23:06:44 +0100 Subject: [PATCH 06/14] Fix the seemingly safe spellings found by codespell Untested, only checked by inspection. --- API.md | 4 ++-- ARCHITECTURE.md | 2 +- CHANGELOG.md | 20 +++++++++---------- css/50_misc.css | 2 +- css/80_app.css | 2 +- data/presets/README.md | 4 ++-- .../presets/fields/healthcare/speciality.json | 2 +- .../presets/presets/amenity/kindergarten.json | 2 +- .../presets/building/farm_auxiliary.json | 2 +- .../presets/building/kindergarten.json | 2 +- data/presets/presets/shop/video.json | 2 +- .../presets/tourism/artwork/graffiti.json | 2 +- modules/actions/circularize.js | 10 +++++----- modules/actions/delete_multiple.js | 2 +- modules/actions/disconnect.js | 2 +- modules/behavior/draw_way.js | 2 +- modules/behavior/hash.js | 2 +- modules/core/localizer.js | 8 ++++---- modules/core/tree.js | 2 +- modules/core/validator.js | 2 +- modules/modes/drag_node.js | 2 +- modules/modes/select.js | 2 +- modules/osm/qa_item.js | 2 +- modules/presets/preset.js | 2 +- modules/renderer/map.js | 2 +- modules/services/improveOSM.js | 2 +- modules/services/mapillary.js | 2 +- modules/services/osm.js | 2 +- modules/services/osmose.js | 2 +- modules/services/wikidata.js | 2 +- modules/svg/streetside.js | 2 +- modules/svg/vertices.js | 4 ++-- modules/ui/fields/localized.js | 2 +- modules/ui/osmose_details.js | 4 ++-- modules/ui/panels/background.js | 2 +- modules/ui/preset_list.js | 2 +- modules/ui/sections/feature_type.js | 2 +- modules/ui/sections/raw_membership_editor.js | 4 ++-- modules/validations/almost_junction.js | 6 +++--- modules/validations/crossing_ways.js | 4 ++-- modules/validations/impossible_oneway.js | 6 +++--- test/spec/actions/disconnect.js | 10 +++++----- test/spec/actions/revert.js | 2 +- test/spec/actions/upgrade_tags.js | 2 +- test/spec/geo/geo.js | 2 +- test/spec/operations/straighten.js | 4 ++-- test/spec/osm/lanes.js | 8 ++++---- test/spec/services/taginfo.js | 2 +- test/spec/validations/almost_junction.js | 10 +++++----- 49 files changed, 87 insertions(+), 87 deletions(-) diff --git a/API.md b/API.md index fed82898c..eb74cea6d 100644 --- a/API.md +++ b/API.md @@ -177,7 +177,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 +219,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: diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index fb64955ca..3e0ac166c 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -440,7 +440,7 @@ A one-way line does not have a valid connection at its first or last node. ##### `incompatible_source` -The `source` tag of a feature references a data source known to have a license incompatiable with OpenStreetMap. This is very much not exhaustive and currently only flags sources containing "google". +The `source` tag of a feature references a data source known to have a license incompatible with OpenStreetMap. This is very much not exhaustive and currently only flags sources containing "google". ##### `invalid_format` diff --git a/CHANGELOG.md b/CHANGELOG.md index ee1f901d1..5ff9d2b3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -830,7 +830,7 @@ _Press G to toggle change highlighting._ * Fix error upon changing the Unsquare Building threshold ([#6690]) * Don't hide all multilingual names upon deleting one ([#6491]) * Correctly populate the Bike Lanes field with existing values ([#6141]) -* Show the correct location for coordinates in the `N DD° MM.MMM' W DD° MM.MMM'` format without a commma separator ([#6582]) +* Show the correct location for coordinates in the `N DD° MM.MMM' W DD° MM.MMM'` format without a comma separator ([#6582]) * Don't treat platforms with a `kerb` tag as primarily curbs ([#6742]) * Remove deleted features from the map immediately when undoing or redoing ([#6480]) * Properly resize Mapillary and Bing Streetside photos when resizing the viewer ([#6286]) @@ -1433,7 +1433,7 @@ _Map all the branded businesses in your town!_ [#5901]: https://github.com/openstreetmap/iD/issues/5901 #### :mortar_board: Walkthrough / Help -- Make the keyboard shorcuts viewable on narrow window sizes ([#6174]) +- Make the keyboard shortcuts viewable on narrow window sizes ([#6174]) [#6174]: https://github.com/openstreetmap/iD/issues/6174 @@ -1607,7 +1607,7 @@ _Map all the branded businesses in your town!_ [#5979]: https://github.com/openstreetmap/iD/issues/5979 #### :rocket: Presets -* Add Bar field to Restuarant, Cafe, and Hotel ([#5947], [#5970], thanks [@alphagamer7]) +* Add Bar field to Restaurant, Cafe, and Hotel ([#5947], [#5970], thanks [@alphagamer7]) * Rename Jeweler to Jewelry Store ([#5948]) * Add unsearchable generic Boundary preset ([#5975]) * Don't render roads with a "footway" tag too thin ([#5936]) @@ -1932,7 +1932,7 @@ _Click the new "zoom to" link on the sidebar under the preset icon, or press H)._ * Add Retail Building to buildings, switch Commercial icon to suitcase ([#4590]) * Change tourist attraction icon from monument to star ([#4563], [#4584], thanks [@lucymk]) * Add preset for `man_made=monitoring_station` ([#4581], thanks [@abdeldjalil09]) -* Deprectate (i.e. make non-searchable) `office=administrative` ([#4578]) +* Deprecate (i.e. make non-searchable) `office=administrative` ([#4578]) * Update transit-related presets for Public Transport v2 schema ([#3041], [#3508], [#4566], [#4585]) * Changed Marketplace preset to not default to `building=yes` ([#4559], [#4568], thanks [@tastrax]) * Add preset for `railway=miniature` ([#4555], thanks [@tastrax]) @@ -5025,7 +5025,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t ##### 2016-Mar-18 * Avoid jumpiness when dragging node markers (#3003) * Rename "Dock" -> "Wet Dock / Dry Dock" (#3030) -* Refresh lables when switching to a new GPX file (#3032) +* Refresh labels when switching to a new GPX file (#3032) * Fix bug where adding a space to a name would undo a previous edit (#3035) * Display GPX tracks immediately when loaded or toggled (#3027) * Include "Local GPX" in imagery used list when GPX loaded via url parameter (#2804) @@ -5077,13 +5077,13 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t * Add 'building' combo field for ice rink and swim facility * Building field should be combo not typeCombo (because `building=yes` is a valid tag) * Link to wiki for guidance on good changeset comments (#2923, thanks @kepta) -* Make preset fields section collapsable (#2894) +* Make preset fields section collapsible (#2894) * Make sure DrawLine mode is called with a clean pre-operation graph (#2303, thanks @tyrasd) * Default to user's language when localizing names (#2882, thanks @kepta) * Autocomplete changeset comments from previous changeset comments (#2002, thanks @jfirebaugh) * Add universal multiline text field for description, fixme (#1518) * Fix crash when selecting a category preset with enter button -* Remove overly agressive regexes for cleaning up websites and emails (#2892, thanks @kepta) +* Remove overly aggressive regexes for cleaning up websites and emails (#2892, thanks @kepta) * Correct typo "Platic" -> "Plastic" (#2925, thanks @M1dgard) * Rename "Unclassified Road" to "Minor Road" (#2916) @@ -5433,7 +5433,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t ##### 2014-Mar-28 * Disable circularize and orthogonalize operations when way is <80% contained in the viewport * Add place=neighbourhood preset -* Add denomination=* field for cemetary, graveyard, funeral home +* Add denomination=* field for cemetery, graveyard, funeral home * Add preset for shop=funeral_directors * Add icon for public_transport=stop_position * Support quartile scheme for any imagery source (#2112) @@ -5451,7 +5451,7 @@ _Map traffic signals, stop signs, benches, crossings, street lamps, fountains, t * Add amenity=nightclub * Add smoking field for many presets under amenity, building, office, tourism (#1990) * barrier=fence shouldn't be an area (fixes #2158) -* Remove building_area from hospital, school, kindergarden +* Remove building_area from hospital, school, kindergarten * Fix recycling field keys (#2140) diff --git a/css/50_misc.css b/css/50_misc.css index dde9b1fa3..a3bb8d15a 100644 --- a/css/50_misc.css +++ b/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, diff --git a/css/80_app.css b/css/80_app.css index 3af905565..74da3a2bd 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -727,7 +727,7 @@ button.add-note svg.icon { justify-content: flex-end; } -/* Hide/Toggle collapsable sections (aka Disclosure) +/* Hide/Toggle collapsible sections (aka Disclosure) ------------------------------------------------------- */ .hide-toggle .icon.pre-text { vertical-align: text-top; diff --git a/data/presets/README.md b/data/presets/README.md index ddf8efb5e..ee2e9cd30 100644 --- a/data/presets/README.md +++ b/data/presets/README.md @@ -30,7 +30,7 @@ A basic preset is of the form: ], // The geometry types for which this preset is valid. // options are point, area, line, and vertex. - // vertexes are points that are parts of lines, like the nodes in a road + // vertices are points that are parts of lines, like the nodes in a road // lines are unclosed ways, and areas are closed ways "geometry": [ "point", "area" @@ -379,7 +379,7 @@ For combo fields, spaces are replaced with underscores in the tag value if `snak ##### `caseSensitive` -For combo fields, case-sensitve field values are allowed if `caseSensitive` is `true`. The default is `false`. +For combo fields, case-sensitive field values are allowed if `caseSensitive` is `true`. The default is `false`. ##### `min_value` diff --git a/data/presets/fields/healthcare/speciality.json b/data/presets/fields/healthcare/speciality.json index 8a731b756..d3a341af0 100644 --- a/data/presets/fields/healthcare/speciality.json +++ b/data/presets/fields/healthcare/speciality.json @@ -4,5 +4,5 @@ "reference": { "key": "healthcare" }, - "label": "Specialties" + "label": "Specialities" } diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json index 5285eddf3..b90646f3b 100644 --- a/data/presets/presets/amenity/kindergarten.json +++ b/data/presets/presets/amenity/kindergarten.json @@ -30,7 +30,7 @@ "point" ], "terms": [ - "kindergarden", + "kindergarten", "pre-school" ], "tags": { diff --git a/data/presets/presets/building/farm_auxiliary.json b/data/presets/presets/building/farm_auxiliary.json index 52ca52531..a44d167a1 100644 --- a/data/presets/presets/building/farm_auxiliary.json +++ b/data/presets/presets/building/farm_auxiliary.json @@ -8,7 +8,7 @@ }, "terms": [ "agriculture", - "auxilary", + "auxiliary", "chicken coop", "farm auxiliary", "pigsty", diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json index 3bba5279f..4bfe7fb29 100644 --- a/data/presets/presets/building/kindergarten.json +++ b/data/presets/presets/building/kindergarten.json @@ -4,7 +4,7 @@ "area" ], "terms": [ - "kindergarden", + "kindergarten", "pre-school" ], "tags": { diff --git a/data/presets/presets/shop/video.json b/data/presets/presets/shop/video.json index 5283fc6a6..64dae5a52 100644 --- a/data/presets/presets/shop/video.json +++ b/data/presets/presets/shop/video.json @@ -11,7 +11,7 @@ "terms": [ "DVD", "VHS", - "video casette" + "video cassette" ], "tags": { "shop": "video" diff --git a/data/presets/presets/tourism/artwork/graffiti.json b/data/presets/presets/tourism/artwork/graffiti.json index bee56d6b1..c50772b62 100644 --- a/data/presets/presets/tourism/artwork/graffiti.json +++ b/data/presets/presets/tourism/artwork/graffiti.json @@ -19,7 +19,7 @@ }, "terms": [ "Street Artwork", - "Guerilla Artwork", + "Guerrilla Artwork", "Graffiti Artwork" ], "name": "Graffiti" diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index b388ec52b..c040f1854 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -40,7 +40,7 @@ export function actionCircularize(wayId, projection, maxAngle) { var sign = d3_polygonArea(points) > 0 ? 1 : -1; var ids, i, j, k; - // we need atleast two key nodes for the algorithm to work + // we need at least two key nodes for the algorithm to work if (!keyNodes.length) { keyNodes = [nodes[0]]; keyPoints = [points[0]]; @@ -55,8 +55,8 @@ export function actionCircularize(wayId, projection, maxAngle) { } // key points and nodes are those connected to the ways, - // they are projected onto the circle, inbetween nodes are moved - // to constant intervals between key nodes, extra inbetween nodes are + // they are projected onto the circle, in between nodes are moved + // to constant intervals between key nodes, extra in between nodes are // added if necessary. for (i = 0; i < keyPoints.length; i++) { var nextKeyNodeIndex = (i + 1) % keyNodes.length; @@ -119,7 +119,7 @@ export function actionCircularize(wayId, projection, maxAngle) { graph = graph.replace(node); } - // add new inbetween nodes if necessary + // add new in between nodes if necessary for (j = 0; j < numberNewPoints; j++) { angle = startAngle + (indexRange + j) * eachAngle; loc = projection.invert([ @@ -147,7 +147,7 @@ export function actionCircularize(wayId, projection, maxAngle) { // Check for other ways that share these keyNodes.. // If keyNodes are adjacent in both ways, - // we can add inBetween nodes to that shared way too.. + // we can add inBetweenNodes to that shared way too.. if (indexRange === 1 && inBetweenNodes.length) { var startIndex1 = way.nodes.lastIndexOf(startNode.id); var endIndex1 = way.nodes.lastIndexOf(endNode.id); diff --git a/modules/actions/delete_multiple.js b/modules/actions/delete_multiple.js index c9208d8c1..904d712ca 100644 --- a/modules/actions/delete_multiple.js +++ b/modules/actions/delete_multiple.js @@ -13,7 +13,7 @@ export function actionDeleteMultiple(ids) { var action = function(graph) { ids.forEach(function(id) { - if (graph.hasEntity(id)) { // It may have been deleted aready. + if (graph.hasEntity(id)) { // It may have been deleted already. graph = actions[graph.entity(id).type](id)(graph); } }); diff --git a/modules/actions/disconnect.js b/modules/actions/disconnect.js index 433ea8ed1..262a02826 100644 --- a/modules/actions/disconnect.js +++ b/modules/actions/disconnect.js @@ -1,7 +1,7 @@ import { osmNode } from '../osm/node'; -// Disconect the ways at the given node. +// Disconnect the ways at the given node. // // Optionally, disconnect only the given ways. // diff --git a/modules/behavior/draw_way.js b/modules/behavior/draw_way.js index 2afdfbf56..48eb679f6 100644 --- a/modules/behavior/draw_way.js +++ b/modules/behavior/draw_way.js @@ -167,7 +167,7 @@ export function behaviorDrawWay(context, wayID, mode, startGraph) { if (includeDrawNode) { if (parentWay.isClosed()) { // don't test the last segment for closed ways - #4655 - // (still test the first segement) + // (still test the first segment) nodes.pop(); } } else { // discount the draw node diff --git a/modules/behavior/hash.js b/modules/behavior/hash.js index d68bb6c22..e81ea9354 100644 --- a/modules/behavior/hash.js +++ b/modules/behavior/hash.js @@ -156,7 +156,7 @@ export function behaviorHash(context) { var maxdist = 500; // Don't allow the hash location to change too much while drawing - // This can happen if the user accidently hit the back button. #3996 + // This can happen if the user accidentally hit the back button. #3996 if (mode && mode.id.match(/^draw/) !== null && dist > maxdist) { context.enter(modeBrowse(context)); return; diff --git a/modules/core/localizer.js b/modules/core/localizer.js index b1f07fc70..c4add5d01 100644 --- a/modules/core/localizer.js +++ b/modules/core/localizer.js @@ -60,7 +60,7 @@ export function coreLocalizer() { if (_loadPromise) return _loadPromise; return _loadPromise = Promise.all([ - // load the list of langauges + // load the list of languages fileFetcher.get('languages'), // load the list of supported locales fileFetcher.get('locales') @@ -237,7 +237,7 @@ export function coreLocalizer() { localizer.languageName = (code, options) => { - if (_languageNames[code]) { // name in locale langauge + if (_languageNames[code]) { // name in locale language // e.g. "German" return _languageNames[code]; } @@ -252,9 +252,9 @@ export function coreLocalizer() { return localizer.t('translate.language_and_code', { language: langInfo.nativeName, code: code }); } else if (langInfo.base && langInfo.script) { - const base = langInfo.base; // the code of the langauge this is based on + const base = langInfo.base; // the code of the language this is based on - if (_languageNames[base]) { // base language name in locale langauge + if (_languageNames[base]) { // base language name in locale language const scriptCode = langInfo.script; const script = _scriptNames[scriptCode] || scriptCode; // e.g. "Serbian (Cyrillic)" diff --git a/modules/core/tree.js b/modules/core/tree.js index 0520f2e6f..44496d420 100644 --- a/modules/core/tree.js +++ b/modules/core/tree.js @@ -26,7 +26,7 @@ export function coreTree(head) { function segmentBBox(segment) { var extent = segment.extent(head); - // extent can be null if the node entites aren't in the graph for some reason + // extent can be null if the node entities aren't in the graph for some reason if (!extent) return null; var bbox = extent.bbox(); diff --git a/modules/core/validator.js b/modules/core/validator.js index b209d6000..603642a1c 100644 --- a/modules/core/validator.js +++ b/modules/core/validator.js @@ -413,7 +413,7 @@ export function coreValidator(context) { .on('redone.validator', validator.validate); // redo // but not on 'change' (e.g. while drawing) - // When user chages editing modes: + // When user changes editing modes: context .on('exit.validator', validator.validate); diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js index 33d81ac83..dca967c4a 100644 --- a/modules/modes/drag_node.js +++ b/modules/modes/drag_node.js @@ -324,7 +324,7 @@ export function modeDragNode(context) { for (k = 0; k < rings.length; k++) { if (k === activeIndex) continue; - // make sure active ring doesnt cross passive rings + // make sure active ring doesn't cross passive rings if (geoHasLineIntersections(rings[activeIndex].nodes, rings[k].nodes, entity.id)) { return 'multipolygonRing'; } diff --git a/modules/modes/select.js b/modules/modes/select.js index e595e0178..a7146c43f 100644 --- a/modules/modes/select.js +++ b/modules/modes/select.js @@ -92,7 +92,7 @@ export function modeSelect(context, selectedIDs) { for (var i = 0; i < selectedIDs.length; i++) { var entity = context.hasEntity(selectedIDs[i]); if (!entity || entity.geometry(graph) !== 'vertex') { - return []; // selection includes some not vertexes + return []; // selection includes some not vertices } var currParents = graph.parentWays(entity).map(function(w) { return w.id; }); diff --git a/modules/osm/qa_item.js b/modules/osm/qa_item.js index ccf1df0fe..323a65480 100644 --- a/modules/osm/qa_item.js +++ b/modules/osm/qa_item.js @@ -20,7 +20,7 @@ export class QAItem { } update(props) { - // You can't override this inital information + // You can't override this initial information const { loc, service, itemType, id } = this; Object.keys(props).forEach(prop => this[prop] = props[prop]); diff --git a/modules/presets/preset.js b/modules/presets/preset.js index 840ab8e83..d6370dbad 100644 --- a/modules/presets/preset.js +++ b/modules/presets/preset.js @@ -91,7 +91,7 @@ export function presetPreset(presetID, preset, addable, allFields, allPresets) { if (_this.suggestion) { let path = presetID.split('/'); path.pop(); // remove brand name - // NOTE: insert an en-dash, not a hypen (to avoid conflict with fr - nl names in Brussels etc) + // NOTE: insert an en-dash, not a hyphen (to avoid conflict with fr - nl names in Brussels etc) return _this.originalName + ' – ' + t('presets.presets.' + path.join('/') + '.name'); } return _this.t('name', { 'default': _this.originalName }); diff --git a/modules/renderer/map.js b/modules/renderer/map.js index 7ed26a2cb..f900acccb 100644 --- a/modules/renderer/map.js +++ b/modules/renderer/map.js @@ -500,7 +500,7 @@ export function rendererMap(context) { ); // On Firefox Windows and Linux we always get +/- the scroll line amount (default 3) - // There doesn't seem to be any scroll accelleration. + // There doesn't seem to be any scroll acceleration. // This multiplier increases the speed a little bit - #5512 if (detected.os !== 'mac') { dY *= 5; diff --git a/modules/services/improveOSM.js b/modules/services/improveOSM.js index 4022817f4..9b139bff1 100644 --- a/modules/services/improveOSM.js +++ b/modules/services/improveOSM.js @@ -104,7 +104,7 @@ function cardinalDirection(bearing) { return t(`QA.improveOSM.directions.${compass[dir]}`); } -// Errors shouldn't obscure eachother +// Errors shouldn't obscure each other function preventCoincident(loc, bumpUp) { let coincident = false; do { diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index 7d0c560eb..251fe4d5d 100644 --- a/modules/services/mapillary.js +++ b/modules/services/mapillary.js @@ -519,7 +519,7 @@ export default { // // There is some logic here to batch up clicks into a _mlyClicks array // because the user might click on a lot of markers quickly and nodechanged - // may be called out of order asychronously. + // may be called out of order asynchronously. // // Clicks are added to the array in `selectedImage` and removed here. // diff --git a/modules/services/osm.js b/modules/services/osm.js index ff292c63e..c0c3654b2 100644 --- a/modules/services/osm.js +++ b/modules/services/osm.js @@ -949,7 +949,7 @@ export default { // Calls `status` and dispatches an `apiStatusChange` event if the returned // status differs from the cached status. reloadApiStatus: function() { - // throttle to avoid unncessary API calls + // throttle to avoid unnecessary API calls if (!this.throttledReloadApiStatus) { var that = this; this.throttledReloadApiStatus = _throttle(function() { diff --git a/modules/services/osmose.js b/modules/services/osmose.js index 13e9c5a39..b142a3e55 100644 --- a/modules/services/osmose.js +++ b/modules/services/osmose.js @@ -49,7 +49,7 @@ function updateRtree(item, replace) { } } -// Issues shouldn't obscure eachother +// Issues shouldn't obscure each other function preventCoincident(loc) { let coincident = false; do { diff --git a/modules/services/wikidata.js b/modules/services/wikidata.js index 7e6ea2b3d..d81ec0d5d 100644 --- a/modules/services/wikidata.js +++ b/modules/services/wikidata.js @@ -33,7 +33,7 @@ export default { type: 'item', // the language to search language: lang, - // the langauge for the label and description in the result + // the language for the label and description in the result uselang: lang, limit: 10, origin: '*' diff --git a/modules/svg/streetside.js b/modules/svg/streetside.js index 023d333e0..95b5e082d 100644 --- a/modules/svg/streetside.js +++ b/modules/svg/streetside.js @@ -262,7 +262,7 @@ export function svgStreetside(projection, context, dispatch) { /** * drawImages() - * drawImages is the method that is returned (and that runs) everytime 'svgStreetside()' is called. + * drawImages is the method that is returned (and that runs) every time 'svgStreetside()' is called. * 'svgStreetside()' is called from index.js */ function drawImages(selection) { diff --git a/modules/svg/vertices.js b/modules/svg/vertices.js index 27aa49148..73fbcfe50 100644 --- a/modules/svg/vertices.js +++ b/modules/svg/vertices.js @@ -304,7 +304,7 @@ export function svgVertices(projection, context) { function addChildVertices(entity) { - // avoid redunant work and infinite recursion of circular relations + // avoid redundant work and infinite recursion of circular relations if (seenIds[entity.id]) return; seenIds[entity.id] = true; @@ -368,7 +368,7 @@ export function svgVertices(projection, context) { } // Collect important vertices from the `entities` list.. - // (during a paritial redraw, it will not contain everything) + // (during a partial redraw, it will not contain everything) for (var i = 0; i < entities.length; i++) { var entity = entities[i]; var geometry = entity.geometry(graph); diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 66f7e3f14..3906b494f 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -304,7 +304,7 @@ export function uiFieldLocalized(field, context) { } // Remove whatever is after the last ' – ' - // NOTE: split/join on en-dash, not a hypen (to avoid conflict with fr - nl names in Brussels etc) + // NOTE: split/join on en-dash, not a hyphen (to avoid conflict with fr - nl names in Brussels etc) function cleanName(name) { var parts = name.split(' – '); if (parts.length > 1) { diff --git a/modules/ui/osmose_details.js b/modules/ui/osmose_details.js index f88a1014d..739252187 100644 --- a/modules/ui/osmose_details.js +++ b/modules/ui/osmose_details.js @@ -65,7 +65,7 @@ export function uiOsmoseDetails(context) { .append('div') .attr('class', 'qa-details-subsection'); - // Suggested Fix (musn't exist for every issue type) + // Suggested Fix (mustn't exist for every issue type) if (issueString(_qaItem, 'fix')) { const div = detailsEnter .append('div') @@ -83,7 +83,7 @@ export function uiOsmoseDetails(context) { .attr('target', '_blank'); } - // Common Pitfalls (musn't exist for every issue type) + // Common Pitfalls (mustn't exist for every issue type) if (issueString(_qaItem, 'trap')) { const div = detailsEnter .append('div') diff --git a/modules/ui/panels/background.js b/modules/ui/panels/background.js index 820f70029..e5c52a2d5 100644 --- a/modules/ui/panels/background.js +++ b/modules/ui/panels/background.js @@ -128,7 +128,7 @@ export function uiPanelBackground(context) { .selectAll('.background-info-span-vintage') .text(metadata.vintage); - // update other metdata + // update other metadata metadataKeys.forEach(function(k) { if (k === 'zoom' || k === 'vintage') return; // done already var val = result[k]; diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js index 8e6aa8629..fa4f3b396 100644 --- a/modules/ui/preset_list.js +++ b/modules/ui/preset_list.js @@ -386,7 +386,7 @@ export function uiPresetList(context) { .append('div') .attr('class', 'label-inner'); - // NOTE: split/join on en-dash, not a hypen (to avoid conflict with fr - nl names in Brussels etc) + // NOTE: split/join on en-dash, not a hyphen (to avoid conflict with fr - nl names in Brussels etc) label.selectAll('.namepart') .data(preset.name().split(' – ')) .enter() diff --git a/modules/ui/sections/feature_type.js b/modules/ui/sections/feature_type.js index a43ff335d..10ce49a09 100644 --- a/modules/ui/sections/feature_type.js +++ b/modules/ui/sections/feature_type.js @@ -95,7 +95,7 @@ export function uiSectionFeatureType(context) { .preset(_presets.length === 1 ? _presets[0] : presetManager.item('point')) ); - // NOTE: split on en-dash, not a hypen (to avoid conflict with hyphenated names) + // NOTE: split on en-dash, not a hyphen (to avoid conflict with hyphenated names) var names = _presets.length === 1 ? _presets[0].name().split(' – ') : [t('inspector.multiple_types')]; var label = selection.select('.label-inner'); diff --git a/modules/ui/sections/raw_membership_editor.js b/modules/ui/sections/raw_membership_editor.js index 476603c01..ee2a8b846 100644 --- a/modules/ui/sections/raw_membership_editor.js +++ b/modules/ui/sections/raw_membership_editor.js @@ -63,7 +63,7 @@ export function uiSectionRawMembershipEditor(context) { function changeRole(d) { - if (d === 0) return; // called on newrow (shoudn't happen) + if (d === 0) return; // called on newrow (shouldn't happen) if (_inChange) return; // avoid accidental recursive call #5731 var oldRole = d.member.role; @@ -107,7 +107,7 @@ export function uiSectionRawMembershipEditor(context) { function deleteMembership(d) { this.blur(); // avoid keeping focus on the button - if (d === 0) return; // called on newrow (shoudn't happen) + if (d === 0) return; // called on newrow (shouldn't happen) // remove the hover-highlight styling utilHighlightEntities([d.relation.id], false, context); diff --git a/modules/validations/almost_junction.js b/modules/validations/almost_junction.js index 866b0ed2e..96a0b165a 100644 --- a/modules/validations/almost_junction.js +++ b/modules/validations/almost_junction.js @@ -170,11 +170,11 @@ export function validationAlmostJunction(context) { return false; } - let occurences = 0; + let occurrences = 0; for (const index in way.nodes) { if (way.nodes[index] === node.id) { - occurences += 1; - if (occurences > 1) { + occurrences += 1; + if (occurrences > 1) { return false; } } diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js index 5b9acaec9..dce2c3642 100644 --- a/modules/validations/crossing_ways.js +++ b/modules/validations/crossing_ways.js @@ -453,12 +453,12 @@ export function validationCrossingWays(context) { } else if (context.graph().geometry(this.entityIds[0]) === 'line' && context.graph().geometry(this.entityIds[1]) === 'line') { - // don't recommend adding bridges to waterways since they're uncommmon + // don't recommend adding bridges to waterways since they're uncommon if (allowsBridge(selectedFeatureType) && selectedFeatureType !== 'waterway') { fixes.push(makeAddBridgeOrTunnelFix('add_a_bridge', 'temaki-bridge', 'bridge')); } - // don't recommend adding tunnels under waterways since they're uncommmon + // don't recommend adding tunnels under waterways since they're uncommon var skipTunnelFix = otherFeatureType === 'waterway' && selectedFeatureType !== 'waterway'; if (allowsTunnel(selectedFeatureType) && !skipTunnelFix) { fixes.push(makeAddBridgeOrTunnelFix('add_a_tunnel', 'temaki-tunnel', 'tunnel')); diff --git a/modules/validations/impossible_oneway.js b/modules/validations/impossible_oneway.js index 66443757a..1f1bd634e 100644 --- a/modules/validations/impossible_oneway.js +++ b/modules/validations/impossible_oneway.js @@ -46,11 +46,11 @@ export function validationImpossibleOneway() { } function nodeOccursMoreThanOnce(way, nodeID) { - var occurences = 0; + var occurrences = 0; for (var index in way.nodes) { if (way.nodes[index] === nodeID) { - occurences += 1; - if (occurences > 1) return true; + occurrences += 1; + if (occurrences > 1) return true; } } return false; diff --git a/test/spec/actions/disconnect.js b/test/spec/actions/disconnect.js index 703ffef88..e3fa6ede7 100644 --- a/test/spec/actions/disconnect.js +++ b/test/spec/actions/disconnect.js @@ -210,7 +210,7 @@ describe('iD.actionDisconnect', function () { }); it('replaces later occurrences in a self-intersecting way', function() { - // Situtation: + // Situation: // a --- b // \ / // \ / @@ -233,7 +233,7 @@ describe('iD.actionDisconnect', function () { }); it('disconnects a way with multiple intersection points', function() { - // Situtation: + // Situation: // a == b -- c // | | // e -- d @@ -264,7 +264,7 @@ describe('iD.actionDisconnect', function () { }); it('disconnects a shared non-closing node in an area', function() { - // Situtation: + // Situation: // a -- b -- c // | | // e -- d @@ -291,7 +291,7 @@ describe('iD.actionDisconnect', function () { }); it('disconnects the closing node of an area without breaking the area', function() { - // Situtation: + // Situation: // a --- b --- d // \ / \ / // \ / \ / @@ -324,7 +324,7 @@ describe('iD.actionDisconnect', function () { }); it('disconnects multiple closing nodes of multiple areas without breaking the areas', function() { - // Situtation: + // Situation: // a --- b --- d // \ / \ / // \ / \ / diff --git a/test/spec/actions/revert.js b/test/spec/actions/revert.js index 3433d9bf7..d3d2eebad 100644 --- a/test/spec/actions/revert.js +++ b/test/spec/actions/revert.js @@ -28,7 +28,7 @@ describe('iD.actionRevert', function() { describe('reverting way child nodes', function () { it('removes new node, updates parent way nodelist', function() { - // note: test with a 3 node way so w1 doesnt go degenerate.. + // note: test with a 3 node way so w1 doesn't go degenerate.. var n1 = iD.osmNode({id: 'n1'}), n2 = iD.osmNode({id: 'n2'}), n3 = iD.osmNode({id: 'n-3'}), diff --git a/test/spec/actions/upgrade_tags.js b/test/spec/actions/upgrade_tags.js index ae6ea1a8a..6c07dfbcc 100644 --- a/test/spec/actions/upgrade_tags.js +++ b/test/spec/actions/upgrade_tags.js @@ -64,7 +64,7 @@ describe('iD.actionUpgradeTags', function () { expect(graph.entity(entity.id).tags).to.eql({ shop: 'supermarket', name: 'Foo' }); }); - it('upgrades a tag with a wildcard replacement and replaces the exisiting "no" value', function () { + it('upgrades a tag with a wildcard replacement and replaces the existing "no" value', function () { var oldTags = { amenity: 'shop' }, newTags = { shop: '*' }, entity = iD.osmEntity({ tags: { amenity: 'shop', shop: 'no', name: 'Foo' }}), diff --git a/test/spec/geo/geo.js b/test/spec/geo/geo.js index 76c77ca09..be9929b23 100644 --- a/test/spec/geo/geo.js +++ b/test/spec/geo/geo.js @@ -104,7 +104,7 @@ describe('iD.geo - geography', function() { var b = [0, 0]; expect(iD.geoSphericalDistance(a, b)).to.eql(0); }); - it('a straight 1 degree line at the equator is aproximately 111 km', function() { + it('a straight 1 degree line at the equator is approximately 111 km', function() { var a = [0, 0]; var b = [1, 0]; expect(iD.geoSphericalDistance(a, b)).to.be.closeTo(110946, 10); diff --git a/test/spec/operations/straighten.js b/test/spec/operations/straighten.js index f3ac89d85..678aafdd1 100644 --- a/test/spec/operations/straighten.js +++ b/test/spec/operations/straighten.js @@ -91,12 +91,12 @@ describe('iD.operationStraighten', function () { expect(result).to.be.ok; }); - it('is available for 2 selected nodes in non-adjacent ways, providing inbetween ways are selected', function () { + it('is available for 2 selected nodes in non-adjacent ways, providing in between ways are selected', function () { var result = iD.operationStraighten(fakeContext, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2']).available(); expect(result).to.be.ok; }); - it('is available for 2 selected nodes in non-adjacent, non-same-directional ways, providing inbetween ways are selected', function () { + it('is available for 2 selected nodes in non-adjacent, non-same-directional ways, providing in between ways are selected', function () { var result = iD.operationStraighten(fakeContext, ['n2', 'n7', 'w4', 'w1', 'w3', 'w2-2']).available(); expect(result).to.be.ok; }); diff --git a/test/spec/osm/lanes.js b/test/spec/osm/lanes.js index 214a25da4..4d7a69e94 100644 --- a/test/spec/osm/lanes.js +++ b/test/spec/osm/lanes.js @@ -419,7 +419,7 @@ describe('iD.Lanes', function() { expect(bothways.length).to.eql(0); }); - it('should have corrent number of direction elements', function() { + it('should have correct number of direction elements', function() { var lanes = iD.osmWay({tags: { highway: 'residential', lanes: 5, 'lanes:backward': 1, 'lanes:both_ways': 1 }}).lanes().lanes; var forward = lanes.filter(function(l) { return l.direction === 'forward'; @@ -1018,7 +1018,7 @@ describe('iD.Lanes', function() { highway: 'residential', lanes: 5, maxspeed: '30kmh', - 'maxspeed:lanes': '30|40|fourty|40|40' + 'maxspeed:lanes': '30|40|forty|40|40' } }).lanes().metadata.maxspeedLanes; expect(maxspeedLanes.unspecified).to.deep.equal([ @@ -1029,7 +1029,7 @@ describe('iD.Lanes', function() { highway: 'residential', lanes: 5, maxspeed: '30kmh', - 'maxspeed:lanes': '30|40|fourty|40|random' + 'maxspeed:lanes': '30|40|forty|40|random' } }).lanes().metadata.maxspeedLanes; @@ -1057,7 +1057,7 @@ describe('iD.Lanes', function() { highway: 'residential', lanes: 5, maxspeed: '30kmh', - 'maxspeed:lanes': '30|40|fourty|40|40' + 'maxspeed:lanes': '30|40|forty|40|40' } }).lanes().lanes; var maxspeedLanes = lanes.unspecified.map(function (l) { diff --git a/test/spec/services/taginfo.js b/test/spec/services/taginfo.js index 80d46cd7f..0207fa0bd 100644 --- a/test/spec/services/taginfo.js +++ b/test/spec/services/taginfo.js @@ -261,7 +261,7 @@ describe('iD.serviceTaginfo', function() { server.respondWith('GET', /\/key\/values/, [200, { 'Content-Type': 'application/json' }, '{"data":[{"value":"parking","description":"A place for parking cars", "fraction":0.2},' - + '{"value":"PArking","description":"A common mispelling", "fraction":0.2},' + + '{"value":"PArking","description":"A common misspelling", "fraction":0.2},' + '{"value":"parking;partying","description":"A place for parking cars *and* partying", "fraction":0.2},' + '{"value":"parking, partying","description":"A place for parking cars *and* partying", "fraction":0.2},' + '{"value":"*","description":"", "fraction":0.2}]}'] diff --git a/test/spec/validations/almost_junction.js b/test/spec/validations/almost_junction.js index 89334b08f..e9a6a2fc4 100644 --- a/test/spec/validations/almost_junction.js +++ b/test/spec/validations/almost_junction.js @@ -17,7 +17,7 @@ describe('iD.validations.almost_junction', function () { iD.actionAddEntity(w1) ); - // vertical road to the west of w1 by 0.00001 logitude degree + // vertical road to the west of w1 by 0.00001 longitude degree // 5th digit after decimal point has a resolution of ~1 meter var n3 = iD.osmNode({id: 'n-3', loc: [22.42356, 0.001]}); var n4 = iD.osmNode({id: 'n-4', loc: [22.42356, -0.001]}); @@ -42,7 +42,7 @@ describe('iD.validations.almost_junction', function () { iD.actionAddEntity(w1) ); - // tilted road to the west of w1 by 0.00001 logitude degree + // tilted road to the west of w1 by 0.00001 longitude degree var n3 = iD.osmNode({id: 'n-3', loc: [22.423555, 0.001]}); var n4 = iD.osmNode({id: 'n-4', loc: [22.423565, -0.001]}); var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }}); @@ -66,7 +66,7 @@ describe('iD.validations.almost_junction', function () { iD.actionAddEntity(w1) ); - // vertical road to the west of w1 by 0.00007 logitude degree + // vertical road to the west of w1 by 0.00007 longitude degree var n3 = iD.osmNode({id: 'n-3', loc: [22.42350, 0.001]}); var n4 = iD.osmNode({id: 'n-4', loc: [22.42350, -0.001]}); var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }}); @@ -114,7 +114,7 @@ describe('iD.validations.almost_junction', function () { iD.actionAddEntity(w1) ); - // vertical road to the west of w1 by 0.00001 logitude degree + // vertical road to the west of w1 by 0.00001 longitude degree var n3 = iD.osmNode({id: 'n-3', loc: [22.42356, 0.001]}); var n4 = iD.osmNode({id: 'n-4', loc: [22.42356, -0.001]}); var w2 = iD.osmWay({id: 'w-2', nodes: ['n-3', 'n-4'], tags: { highway: 'residential' }}); @@ -194,7 +194,7 @@ describe('iD.validations.almost_junction', function () { } function closeEndNodesBothSmallAngle() { - // Square path with both endpoints near eachother + // Square path with both endpoints near each other var n1 = iD.osmNode({id: 'n-1', loc: [0, 22.4427453]}); var n2 = iD.osmNode({id: 'n-2', loc: [0, 22.4429810]}); var n3 = iD.osmNode({id: 'n-3', loc: [0.0000063, 22.4429810]}); From e92c54134ed7c973da66a937257803d487994208 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 23:19:17 +0100 Subject: [PATCH 07/14] Re-add the typos as alternative terms to aid people searching --- data/presets/presets/amenity/kindergarten.json | 1 + data/presets/presets/building/farm_auxiliary.json | 1 + data/presets/presets/building/kindergarten.json | 1 + data/presets/presets/shop/video.json | 1 + data/presets/presets/tourism/artwork/graffiti.json | 1 + 5 files changed, 5 insertions(+) diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json index b90646f3b..9d0ca7710 100644 --- a/data/presets/presets/amenity/kindergarten.json +++ b/data/presets/presets/amenity/kindergarten.json @@ -31,6 +31,7 @@ ], "terms": [ "kindergarten", + "kindergarden", "pre-school" ], "tags": { diff --git a/data/presets/presets/building/farm_auxiliary.json b/data/presets/presets/building/farm_auxiliary.json index a44d167a1..9290a9958 100644 --- a/data/presets/presets/building/farm_auxiliary.json +++ b/data/presets/presets/building/farm_auxiliary.json @@ -9,6 +9,7 @@ "terms": [ "agriculture", "auxiliary", + "auxilary", "chicken coop", "farm auxiliary", "pigsty", diff --git a/data/presets/presets/building/kindergarten.json b/data/presets/presets/building/kindergarten.json index 4bfe7fb29..dfe6d3b51 100644 --- a/data/presets/presets/building/kindergarten.json +++ b/data/presets/presets/building/kindergarten.json @@ -5,6 +5,7 @@ ], "terms": [ "kindergarten", + "kindergarden", "pre-school" ], "tags": { diff --git a/data/presets/presets/shop/video.json b/data/presets/presets/shop/video.json index 64dae5a52..a9da32f8e 100644 --- a/data/presets/presets/shop/video.json +++ b/data/presets/presets/shop/video.json @@ -12,6 +12,7 @@ "DVD", "VHS", "video cassette" + "video casette" ], "tags": { "shop": "video" diff --git a/data/presets/presets/tourism/artwork/graffiti.json b/data/presets/presets/tourism/artwork/graffiti.json index c50772b62..fc6718ebd 100644 --- a/data/presets/presets/tourism/artwork/graffiti.json +++ b/data/presets/presets/tourism/artwork/graffiti.json @@ -20,6 +20,7 @@ "terms": [ "Street Artwork", "Guerrilla Artwork", + "Guerilla Artwork", "Graffiti Artwork" ], "name": "Graffiti" From aa192657b8c9010d98088996dcdfb5b7887676c0 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 28 Jun 2020 23:22:00 +0100 Subject: [PATCH 08/14] Fix the JSON I broke --- data/presets/presets/shop/video.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/presets/shop/video.json b/data/presets/presets/shop/video.json index a9da32f8e..3a7000d55 100644 --- a/data/presets/presets/shop/video.json +++ b/data/presets/presets/shop/video.json @@ -11,7 +11,7 @@ "terms": [ "DVD", "VHS", - "video cassette" + "video cassette", "video casette" ], "tags": { From 80fbc720267896eb22438c2dada1804e0370b0dd Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:23:03 +0100 Subject: [PATCH 09/14] Add another exception and only warn on typos --- .github/workflows/codespell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index e58540aa3..790fc5273 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,4 +13,5 @@ jobs: 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 - ignore_words_list: "nd,chancel" + ignore_words_list: "chancel,nd,specialties" + only_warn: 1 From 2c0556691d75ac8b15ad82a36ca2f0461c13ceee Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:25:41 +0100 Subject: [PATCH 10/14] Don't translate US words to British Undo an errant edit --- data/presets/fields/healthcare/speciality.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/fields/healthcare/speciality.json b/data/presets/fields/healthcare/speciality.json index d3a341af0..8a731b756 100644 --- a/data/presets/fields/healthcare/speciality.json +++ b/data/presets/fields/healthcare/speciality.json @@ -4,5 +4,5 @@ "reference": { "key": "healthcare" }, - "label": "Specialities" + "label": "Specialties" } From abae59953eba616dda70cc36dae50c202886cb79 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:33:33 +0100 Subject: [PATCH 11/14] Skip deprecated because it will be full of typos by definition --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 790fc5273..61da06bc8 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -12,6 +12,6 @@ jobs: - 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 + 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: "chancel,nd,specialties" only_warn: 1 From b7cbeda12e8b49edaeaf9fe0c9e1bcc3b766ebee Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:38:09 +0100 Subject: [PATCH 12/14] Skip more typos we've deliberately left in --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 61da06bc8..c5ceb4336 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,5 +13,5 @@ jobs: 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: "chancel,nd,specialties" + ignore_words_list: "casette,cemetary,chancel,guerilla,nd,specialties" only_warn: 1 From 31cb41ac94a18b72b3a27d4452a0bbb7ef55cde0 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:42:40 +0100 Subject: [PATCH 13/14] Ignore more deliberate typos, preemptively skip some others --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index c5ceb4336..3fc680762 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,5 +13,5 @@ jobs: 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: "casette,cemetary,chancel,guerilla,nd,specialties" + ignore_words_list: "auxilary,casette,cemetary,chancel,files',froms,generat,guerilla,kindergarden,nd,specialties,vias,tos" only_warn: 1 From acc0563f0ae6b04bd540d7f1e23419da41bc56b8 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Oct 2020 16:45:52 +0100 Subject: [PATCH 14/14] Skip even more words that aren't actually typos --- .github/workflows/codespell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 3fc680762..486847524 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,5 +13,5 @@ jobs: 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,files',froms,generat,guerilla,kindergarden,nd,specialties,vias,tos" + ignore_words_list: "auxilary,casette,cemetary,chancel,childs,files',froms,generat,guerilla,kindergarden,nd,specialties,vias,visibles,tos" only_warn: 1