Merge branch 'master' into feature/add-communities-page

diff --combined config/locales/en.yml
index b2592c1c252c165d97d02a7df83f82af743a614f,7a2aba1aa055e0da4352a3e6c2145ac56969eb67..183e68a90c0ff3c5b3e40e005441e92474c8b7eb
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1457,7 -1457,6 +1457,7 @@@ en
      help: Help
      about: About
      copyright: Copyright
 +    communities: Communities
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@@ -1865,9 -1864,8 +1865,8 @@@
          credit_3_1_html: |
            The map tiles in the “standard style” at www.openstreetmap.org are a
            Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
-           under the Open Database License. If you are using these tiles please use
-           the following attribution:
-           “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
+           under the Open Database License. When using this map style, the same attribution is
+           required as for the map data.
          credit_4_html: |
            For a browsable electronic map, the credit should appear in the corner of the map.
            For example:
@@@ -2224,30 -2222,6 +2223,30 @@@
            Just go to <a href='%{map_url}'>the map</a> and click the note icon:
            <span class='icon note'></span>. This will add a marker to the map, which you can move
            by dragging. Add your message, then click save, and other mappers will investigate.
 +    communities:
 +      title: Communities
 +      lede_text: |
 +        People from all over the world contribute to or use OpenStreetMap.
 +        Whilst some are content to participate as individuals, others have formed communities.
 +        These groups come in a range of sizes and represent geographies from small towns to large multi-country regions.
 +        They can also be formal or informal.
 +      local_chapters:
 +        title: Local Chapters
 +        about_text: |
 +          Local Chapters are country-level or region-level groups that have taken the formal step of
 +          establishing not-for-profit legal entities. They represent the area's map and mappers when
 +          dealing with local government, business, and media. They have also formed an affiliation
 +          with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright
 +          governing body.
 +        list_text: |
 +          So far we have the following formally established foundation Local Chapters:
 +      other_groups:
 +        title: Other Groups
 +        about_html: |
 +          There is no need to formally establish a group to the same extent as the Local Chapters.
 +          Indeed many groups exist very sucessfully as an informal gathering of people or as a
 +          community group. Anyone can set up or join these. Read more on the
 +          <a href="https://wiki.openstreetmap.org/wiki/User_group">Communities wiki page</a>.
    traces:
      visibility:
        private: "Private (only shared as anonymous, unordered points)"
@@@ -2393,6 -2367,8 +2392,8 @@@
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
+       read_email: Read user email address
+       skip_authorization: Auto approve application
    oauth_clients:
      new:
        title: "Register a new application"

diff --combined package.json
index 201e433d1ae2288347de99cbf55f06a42051156e,c663c6f12e7757d8ddba2c14ab9d83941ce8ea28..bf8881668482a79c684374f006282cb915f528bf
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -8,10 -8,9 +8,10 @@@
      "js-cookie": "^3.0.0",
      "leaflet": "^1.6.0",
      "leaflet.locatecontrol": "^0.74.0",
 +    "osm-community-index": "^5.1.3",
      "qs": "^6.9.4"
    },
    "devDependencies": {
-     "eslint": "^7.3.1"
+     "eslint": "^8.0.0"
    }
  }

diff --combined yarn.lock
index d69e8135697414b738fa276e95556e7bbc3525c3,e41ecf2ddc9fef835b1d85efdb9aa1919a56fd24..e876bffd45f32d504314e3b88be06562098cead3
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -2,35 -2,14 +2,14 @@@
  # yarn lockfile v1
  
  
- "@babel/code-frame@7.12.11":
-   version "7.12.11"
-   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-   integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-   dependencies:
-     "@babel/highlight" "^7.10.4"
- 
- "@babel/helper-validator-identifier@^7.12.11":
-   version "7.12.11"
-   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-   integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
- 
- "@babel/highlight@^7.10.4":
-   version "7.12.13"
-   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
-   integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
-   dependencies:
-     "@babel/helper-validator-identifier" "^7.12.11"
-     chalk "^2.0.0"
-     js-tokens "^4.0.0"
- 
- "@eslint/eslintrc@^0.4.3":
-   version "0.4.3"
-   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-   integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+ "@eslint/eslintrc@^1.0.3":
+   version "1.0.3"
+   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.3.tgz#41f08c597025605f672251dcc4e8be66b5ed7366"
+   integrity sha512-DHI1wDPoKCBPoLZA3qDR91+3te/wDSc1YhKg3jR8NxKKRJq2hwHwcWv31cSwSYvIBrmbENoYMWcenW8uproQqg==
    dependencies:
      ajv "^6.12.4"
-     debug "^4.1.1"
-     espree "^7.3.0"
+     debug "^4.3.2"
+     espree "^9.0.0"
      globals "^13.9.0"
      ignore "^4.0.6"
      import-fresh "^3.2.1"
@@@ -38,10 -17,10 +17,10 @@@
      minimatch "^3.0.4"
      strip-json-comments "^3.1.1"
  
- "@humanwhocodes/config-array@^0.5.0":
-   version "0.5.0"
-   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-   integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+ "@humanwhocodes/config-array@^0.6.0":
+   version "0.6.0"
+   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.6.0.tgz#b5621fdb3b32309d2d16575456cbc277fa8f021a"
+   integrity sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==
    dependencies:
      "@humanwhocodes/object-schema" "^1.2.0"
      debug "^4.1.1"
@@@ -62,10 -41,10 +41,10 @@@ acorn-jsx@^5.3.1
    resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
    integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
  
- acorn@^7.4.0:
-   version "7.4.0"
-   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+ acorn@^8.5.0:
+   version "8.5.0"
+   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
  
  ajv@^6.10.0, ajv@^6.12.4:
    version "6.12.4"
@@@ -77,39 -56,15 +56,15 @@@
      json-schema-traverse "^0.4.1"
      uri-js "^4.2.2"
  
- ajv@^8.0.1:
-   version "8.5.0"
-   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b"
-   integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==
-   dependencies:
-     fast-deep-equal "^3.1.1"
-     json-schema-traverse "^1.0.0"
-     require-from-string "^2.0.2"
-     uri-js "^4.2.2"
- 
  ansi-colors@^3.2.1:
    version "3.2.4"
    resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
    integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
  
  ansi-regex@^5.0.0:
-   version "5.0.0"
-   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
- 
- ansi-styles@^3.2.1:
-   version "3.2.1"
-   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-   dependencies:
-     color-convert "^1.9.0"
- 
- ansi-styles@^4.0.0:
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-   dependencies:
-     color-convert "^2.0.1"
+   version "5.0.1"
+   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
  
  ansi-styles@^4.1.0:
    version "4.2.1"
@@@ -126,10 -81,10 +81,10 @@@ argparse@^1.0.7
    dependencies:
      sprintf-js "~1.0.2"
  
- astral-regex@^2.0.0:
-   version "2.0.0"
-   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+ argparse@^2.0.1:
+   version "2.0.1"
+   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
  
  balanced-match@^1.0.0:
    version "1.0.0"
@@@ -162,15 -117,6 +117,6 @@@ callsites@^3.0.0
    resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
    integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
  
- chalk@^2.0.0:
-   version "2.4.2"
-   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-   dependencies:
-     ansi-styles "^3.2.1"
-     escape-string-regexp "^1.0.5"
-     supports-color "^5.3.0"
- 
  chalk@^4.0.0:
    version "4.1.0"
    resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@@ -179,13 -125,6 +125,6 @@@
      ansi-styles "^4.1.0"
      supports-color "^7.1.0"
  
- color-convert@^1.9.0:
-   version "1.9.3"
-   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-   dependencies:
-     color-name "1.1.3"
- 
  color-convert@^2.0.1:
    version "2.0.1"
    resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@@ -193,11 -132,6 +132,6 @@@
    dependencies:
      color-name "~1.1.4"
  
- color-name@1.1.3:
-   version "1.1.3"
-   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
- 
  color-name@~1.1.4:
    version "1.1.4"
    resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@@@ -217,23 -151,18 +151,23 @@@ cross-spawn@^7.0.2
      shebang-command "^2.0.0"
      which "^2.0.1"
  
- debug@^4.0.1, debug@^4.1.1:
-   version "4.1.1"
-   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ debug@^4.1.1, debug@^4.3.2:
+   version "4.3.2"
+   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
    dependencies:
-     ms "^2.1.1"
+     ms "2.1.2"
  
  deep-is@^0.1.3:
    version "0.1.3"
    resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
    integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
  
 +diacritics@^1.3.0:
 +  version "1.3.0"
 +  resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1"
 +  integrity sha1-PvqHMj67hj5mls67AILUj/PW96E=
 +
  doctrine@^3.0.0:
    version "3.0.0"
    resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@@ -241,11 -170,6 +175,6 @@@
    dependencies:
      esutils "^2.0.2"
  
- emoji-regex@^8.0.0:
-   version "8.0.0"
-   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
- 
  enquirer@^2.3.5:
    version "2.3.5"
    resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381"
@@@ -253,72 -177,66 +182,66 @@@
    dependencies:
      ansi-colors "^3.2.1"
  
- escape-string-regexp@^1.0.5:
-   version "1.0.5"
-   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
- 
  escape-string-regexp@^4.0.0:
    version "4.0.0"
    resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
    integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
  
- eslint-scope@^5.1.1:
-   version "5.1.1"
-   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+ eslint-scope@^6.0.0:
+   version "6.0.0"
+   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-6.0.0.tgz#9cf45b13c5ac8f3d4c50f46a5121f61b3e318978"
+   integrity sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==
    dependencies:
      esrecurse "^4.3.0"
-     estraverse "^4.1.1"
+     estraverse "^5.2.0"
  
- eslint-utils@^2.1.0:
-   version "2.1.0"
-   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+ eslint-utils@^3.0.0:
+   version "3.0.0"
+   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+   integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
    dependencies:
-     eslint-visitor-keys "^1.1.0"
- 
- eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
-   version "1.3.0"
-   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+     eslint-visitor-keys "^2.0.0"
  
  eslint-visitor-keys@^2.0.0:
    version "2.0.0"
    resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
    integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
  
- eslint@^7.3.1:
-   version "7.32.0"
-   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-   integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+ eslint-visitor-keys@^3.0.0:
+   version "3.0.0"
+   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz#e32e99c6cdc2eb063f204eda5db67bfe58bb4186"
+   integrity sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==
+ 
+ eslint@^8.0.0:
+   version "8.0.1"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.0.1.tgz#3610e7fe4a05c2154669515ca60835a76a19f700"
+   integrity sha512-LsgcwZgQ72vZ+SMp4K6pAnk2yFDWL7Ti4pJaRvsZ0Hsw2h8ZjUIW38a9AFn2cZXdBMlScMFYYgsSp4ttFI/0bA==
    dependencies:
-     "@babel/code-frame" "7.12.11"
-     "@eslint/eslintrc" "^0.4.3"
-     "@humanwhocodes/config-array" "^0.5.0"
+     "@eslint/eslintrc" "^1.0.3"
+     "@humanwhocodes/config-array" "^0.6.0"
      ajv "^6.10.0"
      chalk "^4.0.0"
      cross-spawn "^7.0.2"
-     debug "^4.0.1"
+     debug "^4.3.2"
      doctrine "^3.0.0"
      enquirer "^2.3.5"
      escape-string-regexp "^4.0.0"
-     eslint-scope "^5.1.1"
-     eslint-utils "^2.1.0"
-     eslint-visitor-keys "^2.0.0"
-     espree "^7.3.1"
+     eslint-scope "^6.0.0"
+     eslint-utils "^3.0.0"
+     eslint-visitor-keys "^3.0.0"
+     espree "^9.0.0"
      esquery "^1.4.0"
      esutils "^2.0.2"
      fast-deep-equal "^3.1.3"
      file-entry-cache "^6.0.1"
      functional-red-black-tree "^1.0.1"
-     glob-parent "^5.1.2"
+     glob-parent "^6.0.1"
      globals "^13.6.0"
      ignore "^4.0.6"
      import-fresh "^3.0.0"
      imurmurhash "^0.1.4"
      is-glob "^4.0.0"
-     js-yaml "^3.13.1"
+     js-yaml "^4.1.0"
      json-stable-stringify-without-jsonify "^1.0.1"
      levn "^0.4.1"
      lodash.merge "^4.6.2"
@@@ -326,22 -244,21 +249,21 @@@
      natural-compare "^1.4.0"
      optionator "^0.9.1"
      progress "^2.0.0"
-     regexpp "^3.1.0"
+     regexpp "^3.2.0"
      semver "^7.2.1"
      strip-ansi "^6.0.0"
      strip-json-comments "^3.1.0"
-     table "^6.0.9"
      text-table "^0.2.0"
      v8-compile-cache "^2.0.3"
  
- espree@^7.3.0, espree@^7.3.1:
-   version "7.3.1"
-   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-   integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+ espree@^9.0.0:
+   version "9.0.0"
+   resolved "https://registry.yarnpkg.com/espree/-/espree-9.0.0.tgz#e90a2965698228502e771c7a58489b1a9d107090"
+   integrity sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ==
    dependencies:
-     acorn "^7.4.0"
+     acorn "^8.5.0"
      acorn-jsx "^5.3.1"
-     eslint-visitor-keys "^1.3.0"
+     eslint-visitor-keys "^3.0.0"
  
  esprima@^4.0.0:
    version "4.0.1"
@@@ -362,11 -279,6 +284,6 @@@ esrecurse@^4.3.0
    dependencies:
      estraverse "^5.2.0"
  
- estraverse@^4.1.1:
-   version "4.3.0"
-   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
- 
  estraverse@^5.1.0:
    version "5.1.0"
    resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
@@@ -441,12 -353,12 +358,12 @@@ get-intrinsic@^1.0.2
      has "^1.0.3"
      has-symbols "^1.0.1"
  
- glob-parent@^5.1.2:
-   version "5.1.2"
-   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+ glob-parent@^6.0.1:
+   version "6.0.2"
+   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
    dependencies:
-     is-glob "^4.0.1"
+     is-glob "^4.0.3"
  
  glob@^7.1.3:
    version "7.1.6"
@@@ -467,11 -379,6 +384,6 @@@ globals@^13.6.0, globals@^13.9.0
    dependencies:
      type-fest "^0.20.2"
  
- has-flag@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
- 
  has-flag@^4.0.0:
    version "4.0.0"
    resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@@ -530,15 -437,10 +442,10 @@@ is-extglob@^2.1.1
    resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
    integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
  
- is-fullwidth-code-point@^3.0.0:
-   version "3.0.0"
-   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
- 
- is-glob@^4.0.0, is-glob@^4.0.1:
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+ is-glob@^4.0.0, is-glob@^4.0.3:
+   version "4.0.3"
+   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
    dependencies:
      is-extglob "^2.1.1"
  
@@@ -557,11 -459,6 +464,6 @@@ js-cookie@^3.0.0
    resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
    integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
  
- js-tokens@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
- 
  js-yaml@^3.13.1:
    version "3.13.1"
    resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@@ -570,16 -467,18 +472,18 @@@
      argparse "^1.0.7"
      esprima "^4.0.0"
  
+ js-yaml@^4.1.0:
+   version "4.1.0"
+   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+   dependencies:
+     argparse "^2.0.1"
+ 
  json-schema-traverse@^0.4.1:
    version "0.4.1"
    resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
    integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
  
- json-schema-traverse@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
- 
  json-stable-stringify-without-jsonify@^1.0.1:
    version "1.0.1"
    resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@@ -603,21 -502,11 +507,11 @@@ levn@^0.4.1
      prelude-ls "^1.2.1"
      type-check "~0.4.0"
  
- lodash.clonedeep@^4.5.0:
-   version "4.5.0"
-   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
- 
  lodash.merge@^4.6.2:
    version "4.6.2"
    resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
    integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
  
- lodash.truncate@^4.4.2:
-   version "4.4.2"
-   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
- 
  minimatch@^3.0.4:
    version "3.0.4"
    resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@@ -625,7 -514,7 +519,7 @@@
    dependencies:
      brace-expansion "^1.1.7"
  
- ms@^2.1.1:
+ ms@2.1.2:
    version "2.1.2"
    resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
    integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@@ -659,13 -548,6 +553,13 @@@ optionator@^0.9.1
      type-check "^0.4.0"
      word-wrap "^1.2.3"
  
 +osm-community-index@^5.1.3:
 +  version "5.1.3"
 +  resolved "https://registry.yarnpkg.com/osm-community-index/-/osm-community-index-5.1.3.tgz#df2bd0db2b3e43b95fa026138905dc2f3f473062"
 +  integrity sha512-kERHt/O+QFp7DB5jH/Pkh3P1GwT3vH+lYskN7EVEBcnnsW8AIcdGpmQDlLO9IZNCbzmP7YY81wlUv8AuWKUTIg==
 +  dependencies:
 +    diacritics "^1.3.0"
 +
  parent-module@^1.0.0:
    version "1.0.1"
    resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@@ -705,15 -587,10 +599,10 @@@ qs@^6.9.4
    dependencies:
      side-channel "^1.0.4"
  
- regexpp@^3.1.0:
-   version "3.1.0"
-   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
- 
- require-from-string@^2.0.2:
-   version "2.0.2"
-   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+ regexpp@^3.2.0:
+   version "3.2.0"
+   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
  
  resolve-from@^4.0.0:
    version "4.0.0"
@@@ -753,29 -630,11 +642,11 @@@ side-channel@^1.0.4
      get-intrinsic "^1.0.2"
      object-inspect "^1.9.0"
  
- slice-ansi@^4.0.0:
-   version "4.0.0"
-   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-   dependencies:
-     ansi-styles "^4.0.0"
-     astral-regex "^2.0.0"
-     is-fullwidth-code-point "^3.0.0"
- 
  sprintf-js@~1.0.2:
    version "1.0.3"
    resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
    integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
  
- string-width@^4.2.0:
-   version "4.2.0"
-   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-   integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-   dependencies:
-     emoji-regex "^8.0.0"
-     is-fullwidth-code-point "^3.0.0"
-     strip-ansi "^6.0.0"
- 
  strip-ansi@^6.0.0:
    version "6.0.0"
    resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
@@@ -788,13 -647,6 +659,6 @@@ strip-json-comments@^3.1.0, strip-json-
    resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
    integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
  
- supports-color@^5.3.0:
-   version "5.5.0"
-   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-   dependencies:
-     has-flag "^3.0.0"
- 
  supports-color@^7.1.0:
    version "7.1.0"
    resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@@ -802,18 -654,6 +666,6 @@@
    dependencies:
      has-flag "^4.0.0"
  
- table@^6.0.9:
-   version "6.7.1"
-   resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
-   integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
-   dependencies:
-     ajv "^8.0.1"
-     lodash.clonedeep "^4.5.0"
-     lodash.truncate "^4.4.2"
-     slice-ansi "^4.0.0"
-     string-width "^4.2.0"
-     strip-ansi "^6.0.0"
- 
  text-table@^0.2.0:
    version "0.2.0"
    resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"