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

diff --combined app/views/layouts/_header.html.erb
index e9e88c1e0391a512637f2cd592c5bad4958f5405,0171752ff4a4e23966852ff99484028a21bde906..904665ca78451a533901b4cb77aca1e9bd87a793
--- 1/app/views/layouts/_header.html.erb
--- 2/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -50,9 -50,6 +50,9 @@@
        <li class="compact-hide nav-item <%= current_page_class(diary_entries_path) %>">
          <%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "nav-link" %>
        </li>
 +      <li class="compact-hide nav-item <%= current_page_class(communities_path) %>">
 +        <%= link_to t("layouts.communities"), communities_path, :class => "nav-link" %>
 +      </li>
        <li class="compact-hide nav-item <%= current_page_class(copyright_path) %>">
          <%= link_to t("layouts.copyright"), copyright_path, :class => "nav-link" %>
        </li>
@@@ -75,7 -72,6 +75,7 @@@
            <% end %>
            <li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
 +          <li class="<%= current_page_class(communities_path) %>"><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
            <li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
@@@ -85,7 -81,7 +85,7 @@@
      <% if current_user && current_user.id %>
        <div class='d-inline-flex dropdown user-menu logged-in clearfix'>
          <a class='dropdown-toggle btn btn-outline-secondary pl-2 py-1 flex-grow-1' data-toggle='dropdown' href="#">
-           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
+           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-sm") %>
            <%= render :partial => "layouts/inbox" %>
            <span class="user-button">
              <span class='username'>

diff --combined config/locales/en.yml
index 183e68a90c0ff3c5b3e40e005441e92474c8b7eb,df3ae37f560513ddef3b1af79b0c5babb9ef64fc..f3bde72d7e970000b569cec144c4336f77525125
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -504,7 -504,9 +504,9 @@@ en
          title: "OpenStreetMap diary entries"
          description: "Recent diary entries from users of OpenStreetMap"
      comments:
-       has_commented_on: "%{display_name} has commented on the following diary entries"
+       title: "Diary Comments added by %{user}"
+       heading: "%{user}'s Diary Comments"
+       subheading_html: "Diary Comments added by %{user}"
        no_comments: "No diary comments"
        post: Post
        when: When
@@@ -781,7 -783,6 +783,6 @@@
            siren: "Emergency Siren"
            suction_point: "Emergency Suction Point"
            water_tank: "Emergency Water Tank"
-           "yes": "Emergency"
          highway:
            abandoned: "Abandoned Highway"
            bridleway: "Bridleway"
@@@ -828,6 -829,7 +829,7 @@@
            trailhead: "Trailhead"
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
+           turning_circle: "Turning Circle"
            turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
            "yes" : "Road"
@@@ -1457,7 -1459,6 +1459,7 @@@
      help: Help
      about: About
      copyright: Copyright
 +    communities: Communities
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@@ -2223,30 -2224,6 +2225,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)"
@@@ -2648,6 -2625,7 +2650,7 @@@
        no_authorization_code: No authorization code
        unknown_signature_algorithm: Unknown signature algorithm
        invalid_scope: Invalid scope
+       unknown_error: Authentication failed
      auth_association:
        heading: Your ID is not associated with a OpenStreetMap account yet.
        option_1: |

diff --combined package.json
index bf8881668482a79c684374f006282cb915f528bf,5a50c3c21ddae14a1185d4f402fe2c8ec5ccbf86..944ac1ba9d2bc014fe6ba6b83b7c19cd80feee24
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -3,12 -3,10 +3,11 @@@
    "private": true,
    "dependencies": {
      "bs-custom-file-input": "^1.3.4",
-     "html5shiv": "^3.7.3",
      "jquery-simulate": "^1.0.2",
      "js-cookie": "^3.0.0",
      "leaflet": "^1.6.0",
-     "leaflet.locatecontrol": "^0.74.0",
+     "leaflet.locatecontrol": "^0.75.0",
 +    "osm-community-index": "^5.1.3",
      "qs": "^6.9.4"
    },
    "devDependencies": {

diff --combined yarn.lock
index e876bffd45f32d504314e3b88be06562098cead3,c13ba694214e3c02467376e9c79fa08c1148f400..385a1b33a6844d3477fc732e432a3f6f0eecff42
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -2,34 -2,34 +2,34 @@@
  # yarn lockfile v1
  
  
- "@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==
+ "@eslint/eslintrc@^1.0.5":
+   version "1.0.5"
+   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
+   integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
    dependencies:
      ajv "^6.12.4"
      debug "^4.3.2"
-     espree "^9.0.0"
+     espree "^9.2.0"
      globals "^13.9.0"
      ignore "^4.0.6"
      import-fresh "^3.2.1"
-     js-yaml "^3.13.1"
+     js-yaml "^4.1.0"
      minimatch "^3.0.4"
      strip-json-comments "^3.1.1"
  
- "@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==
+ "@humanwhocodes/config-array@^0.9.2":
+   version "0.9.2"
+   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
+   integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
    dependencies:
-     "@humanwhocodes/object-schema" "^1.2.0"
+     "@humanwhocodes/object-schema" "^1.2.1"
      debug "^4.1.1"
      minimatch "^3.0.4"
  
- "@humanwhocodes/object-schema@^1.2.0":
-   version "1.2.0"
-   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
-   integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+ "@humanwhocodes/object-schema@^1.2.1":
+   version "1.2.1"
+   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
  
  "@types/color-name@^1.1.1":
    version "1.1.1"
@@@ -41,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@^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==
+ acorn@^8.6.0:
+   version "8.6.0"
+   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+   integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
  
  ajv@^6.10.0, ajv@^6.12.4:
    version "6.12.4"
@@@ -61,7 -61,7 +61,7 @@@ ansi-colors@^3.2.1
    resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
    integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
  
- ansi-regex@^5.0.0:
+ ansi-regex@^5.0.1:
    version "5.0.1"
    resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
    integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@@ -74,13 -74,6 +74,6 @@@ ansi-styles@^4.1.0
      "@types/color-name" "^1.1.1"
      color-convert "^2.0.1"
  
- argparse@^1.0.7:
-   version "1.0.10"
-   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-   dependencies:
-     sprintf-js "~1.0.2"
- 
  argparse@^2.0.1:
    version "2.0.1"
    resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@@ -163,11 -156,6 +156,11 @@@ deep-is@^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"
@@@ -187,10 -175,10 +180,10 @@@ escape-string-regexp@^4.0.0
    resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
    integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
  
- 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==
+ eslint-scope@^7.1.0:
+   version "7.1.0"
+   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
+   integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
    dependencies:
      esrecurse "^4.3.0"
      estraverse "^5.2.0"
@@@ -207,18 -195,18 +200,18 @@@ eslint-visitor-keys@^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-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-visitor-keys@^3.1.0:
+   version "3.1.0"
+   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
+   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
  
  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==
+   version "8.4.0"
+   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.0.tgz#2fa01b271cafc28addc2719e551acff5e89f5230"
+   integrity sha512-kv0XQcAQJL/VD9THQKhTQZVqkJKA+tIj/v2ZKNaIHRAADcJWFb+B/BAewUYuF6UVg1s2xC5qXVoDk0G8sKGeTA==
    dependencies:
-     "@eslint/eslintrc" "^1.0.3"
-     "@humanwhocodes/config-array" "^0.6.0"
+     "@eslint/eslintrc" "^1.0.5"
+     "@humanwhocodes/config-array" "^0.9.2"
      ajv "^6.10.0"
      chalk "^4.0.0"
      cross-spawn "^7.0.2"
@@@ -226,10 -214,10 +219,10 @@@
      doctrine "^3.0.0"
      enquirer "^2.3.5"
      escape-string-regexp "^4.0.0"
-     eslint-scope "^6.0.0"
+     eslint-scope "^7.1.0"
      eslint-utils "^3.0.0"
-     eslint-visitor-keys "^3.0.0"
-     espree "^9.0.0"
+     eslint-visitor-keys "^3.1.0"
+     espree "^9.2.0"
      esquery "^1.4.0"
      esutils "^2.0.2"
      fast-deep-equal "^3.1.3"
@@@ -251,24 -239,19 +244,19 @@@
      progress "^2.0.0"
      regexpp "^3.2.0"
      semver "^7.2.1"
-     strip-ansi "^6.0.0"
+     strip-ansi "^6.0.1"
      strip-json-comments "^3.1.0"
      text-table "^0.2.0"
      v8-compile-cache "^2.0.3"
  
- 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==
+ espree@^9.2.0:
+   version "9.2.0"
+   resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
+   integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
    dependencies:
-     acorn "^8.5.0"
+     acorn "^8.6.0"
      acorn-jsx "^5.3.1"
-     eslint-visitor-keys "^3.0.0"
- 
- esprima@^4.0.0:
-   version "4.0.1"
-   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+     eslint-visitor-keys "^3.1.0"
  
  esquery@^1.4.0:
    version "1.4.0"
@@@ -401,11 -384,6 +389,6 @@@ has@^1.0.3
    dependencies:
      function-bind "^1.1.1"
  
- html5shiv@^3.7.3:
-   version "3.7.3"
-   resolved "https://registry.yarnpkg.com/html5shiv/-/html5shiv-3.7.3.tgz#d78a84a367bcb9a710100d57802c387b084631d2"
-   integrity sha1-14qEo2e8uacQEA1XgCw4ewhGMdI=
- 
  ignore@^4.0.6:
    version "4.0.6"
    resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@@ -464,14 -442,6 +447,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-yaml@^3.13.1:
-   version "3.13.1"
-   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-   dependencies:
-     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"
@@@ -489,10 -459,10 +464,10 @@@ json-stable-stringify-without-jsonify@^
    resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
    integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
  
- leaflet.locatecontrol@^0.74.0:
-   version "0.74.0"
-   resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.74.0.tgz#a62153a0de5e05ef7efd73df7247a23060330fd7"
-   integrity sha512-Rs4u2ZH9SeEB4IBLhBT3yPWaN81CtFq4XWT6gTCZeqVOImMJKpwqkVn9FKxge9Z5JFBRJHFFquYEdwR3mxgHxg==
+ leaflet.locatecontrol@^0.75.0:
+   version "0.75.0"
+   resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.75.0.tgz#8c7996de4425380660431fbfa548d5fe3a3595d8"
+   integrity sha512-Mz/+4dgmUoBVxy7BN+Rtf76XcIJw2qK+S41FnejS/AC88Ec5hpaFnI5gYcS+W6zcQ90sAKxqu1rXii+c01ot5g==
  
  leaflet@^1.6.0:
    version "1.7.1"
@@@ -553,13 -523,6 +528,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"
@@@ -593,9 -556,9 +568,9 @@@ punycode@^2.1.0
    integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
  
  qs@^6.9.4:
-   version "6.10.1"
-   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+   version "6.10.2"
+   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
+   integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
    dependencies:
      side-channel "^1.0.4"
  
@@@ -642,17 -605,12 +617,12 @@@ side-channel@^1.0.4
      get-intrinsic "^1.0.2"
      object-inspect "^1.9.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=
- 
- strip-ansi@^6.0.0:
-   version "6.0.0"
-   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-   integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+ strip-ansi@^6.0.1:
+   version "6.0.1"
+   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
    dependencies:
-     ansi-regex "^5.0.0"
+     ansi-regex "^5.0.1"
  
  strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
    version "3.1.1"