Merge remote-tracking branch 'upstream/pull/3301'

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc package.json
index 7f78ab6ccaae0ddd67a604032d4411aa040c2e3e,07df29859ca847cf86546a83def21e9f8f0050ff..4de2e943e5451e4df0763e15c2e6c21fe306f8e3
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -6,7 -6,8 +6,8 @@@
      "jquery-simulate": "^1.0.2",
      "js-cookie": "^3.0.0",
      "leaflet": "^1.8.0",
 -    "leaflet.locatecontrol": "^0.76.0",
 +    "leaflet.locatecontrol": "^0.78.0",
+     "osm-community-index": "^5.2.0",
      "qs": "^6.9.4"
    },
    "devDependencies": {

diff --cc yarn.lock
index 4d848697e794e4629ec7c328672544eb02cae1af,3ed0c35dd201bd703010dfa60631974aed0c32e3..65d2c5afbf11bc33d9b902b65aa33420531ad790
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -364,9 -411,16 +387,9 @@@ get-intrinsic@^1.0.2
    dependencies:
      function-bind "^1.1.1"
      has "^1.0.3"
-     has-symbols "^1.0.1"
+     has-symbols "^1.0.3"
  
 -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==
 -  dependencies:
 -    is-glob "^4.0.1"
 -
 -glob-parent@^6.0.1:
 +glob-parent@^6.0.2:
    version "6.0.2"
    resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
    integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@@ -448,9 -514,9 +471,9 @@@ inherits@2
  is-extglob@^2.1.1:
    version "2.1.1"
    resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
  
 -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
 +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==
@@@ -497,17 -558,17 +520,17 @@@ json-schema-traverse@^0.4.1
  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"
-   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
  
 -leaflet.locatecontrol@^0.76.0:
 -  version "0.76.1"
 -  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.76.1.tgz#03eb8e98e0c54fee457f930a63624479a6177de0"
 -  integrity sha512-qA92Mxs2N1jgVx+EdmxtDrdzFD+f2llPJbqaKvmW1epZMSIvD6KNsBjpQYUIxz4XtJkOleqRSwWQcrm5P5NnYw==
 +leaflet.locatecontrol@^0.78.0:
 +  version "0.78.0"
 +  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.78.0.tgz#fa87ac57fa79d2797f8f3e673d9eb3f104688310"
 +  integrity sha512-3cElL7dBPOMkzHTOWUA/SLogrWrmfqYkbIXAikbRD0QcEef4jJRYYVhkcUUTprS2cOQzg2UiR475v8jemJiXRg==
  
  leaflet@^1.8.0:
 -  version "1.8.0"
 -  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e"
 -  integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==
 +  version "1.9.3"
 +  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
 +  integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==
  
  levn@^0.4.1:
    version "0.4.1"
@@@ -700,8 -796,15 +743,8 @@@ supports-color@^7.1.0
  text-table@^0.2.0:
    version "0.2.0"
    resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
  
 -to-regex-range@^5.0.1:
 -  version "5.0.1"
 -  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
 -  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
 -  dependencies:
 -    is-number "^7.0.0"
 -
  type-check@^0.4.0, type-check@~0.4.0:
    version "0.4.0"
    resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"