Merge branch 'master' into dependabot/npm_and_yarn/handlebars-4.1.2

diff --combined package.json
index 059225409ed5e253f56da1708eff2aa53b5262d3,5634f79c0e9582ec4d8d329000fb99ea7cb22ebe..982e52db4304e53d30974d6deef0afb2590a0936
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -14,8 -14,8 +14,8 @@@
      "jquery": "3.4.0",
      "leaflet": "1.3.1",
      "leaflet-minimap": "3.6.1",
 -    "handlebars": "4.0.11",
 +    "handlebars": "4.1.2",
-     "bootstrap": "3.3.5",
+     "bootstrap": "3.4.1",
      "@ungap/url-search-params": "0.1.4"
    }
  }

diff --combined yarn.lock
index ff831e72c7f59b667bdb5ab112b920d82cc402ab,1f633d2ff49fc177c068cee74d35037d860b1759..9d234bc357cda6053dc043fcf916ee209514f0fd
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -12,6 -12,20 +12,6 @@@ abbrev@1
    resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
    integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
  
 -align-text@^0.1.1, align-text@^0.1.3:
 -  version "0.1.4"
 -  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
 -  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
 -  dependencies:
 -    kind-of "^3.0.2"
 -    longest "^1.0.1"
 -    repeat-string "^1.5.2"
 -
 -amdefine@>=0.0.4:
 -  version "1.0.1"
 -  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 -  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 -
  ansi-styles@^3.2.1:
    version "3.2.1"
    resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@@ -31,7 -45,7 +31,7 @@@ array-find-index@^1.0.1
    resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
    integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
  
 -async@^1.4.0, async@~1.5.2:
 +async@~1.5.2:
    version "1.5.2"
    resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
    integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
@@@ -41,10 -55,10 +41,10 @@@ balanced-match@^1.0.0
    resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
    integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
  
- bootstrap@3.3.5:
-   version "3.3.5"
-   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.5.tgz#1777ab79299b128d87dce7cbd86fdc46ac69c0b1"
-   integrity sha1-F3ereSmbEo2H3OfL2G/cRqxpwLE=
+ bootstrap@3.4.1:
+   version "3.4.1"
+   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
+   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
  
  bower@^1.8:
    version "1.8.8"
@@@ -67,11 -81,24 +67,11 @@@ camelcase-keys@^2.0.0
      camelcase "^2.0.0"
      map-obj "^1.0.0"
  
 -camelcase@^1.0.2:
 -  version "1.2.1"
 -  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 -  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 -
  camelcase@^2.0.0:
    version "2.1.1"
    resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
    integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
  
 -center-align@^0.1.1:
 -  version "0.1.3"
 -  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
 -  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
 -  dependencies:
 -    align-text "^0.1.3"
 -    lazy-cache "^1.0.3"
 -
  chalk@~2.4.1:
    version "2.4.2"
    resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@@ -81,6 -108,15 +81,6 @@@
      escape-string-regexp "^1.0.5"
      supports-color "^5.3.0"
  
 -cliui@^2.1.0:
 -  version "2.1.0"
 -  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
 -  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
 -  dependencies:
 -    center-align "^0.1.1"
 -    right-align "^0.1.1"
 -    wordwrap "0.0.2"
 -
  coffeescript@~1.10.0:
    version "1.10.0"
    resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e"
@@@ -103,11 -139,6 +103,11 @@@ colors@~1.1.2
    resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
    integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
  
 +commander@~2.20.3:
 +  version "2.20.3"
 +  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
 +  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 +
  concat-map@0.0.1:
    version "0.0.1"
    resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@@ -128,7 -159,7 +128,7 @@@ dateformat@~1.0.12
      get-stdin "^4.0.1"
      meow "^3.3.0"
  
 -decamelize@^1.0.0, decamelize@^1.1.2:
 +decamelize@^1.1.2:
    version "1.2.0"
    resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
    integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@@ -299,16 -330,16 +299,16 @@@ grunt@^1.0.2
      path-is-absolute "~1.0.0"
      rimraf "~2.6.2"
  
 -handlebars@4.0.11:
 -  version "4.0.11"
 -  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
 -  integrity sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=
 +handlebars@4.1.2:
 +  version "4.1.2"
 +  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
 +  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
    dependencies:
 -    async "^1.4.0"
 +    neo-async "^2.6.0"
      optimist "^0.6.1"
 -    source-map "^0.4.4"
 +    source-map "^0.6.1"
    optionalDependencies:
 -    uglify-js "^2.6"
 +    uglify-js "^3.1.4"
  
  has-flag@^3.0.0:
    version "3.0.0"
@@@ -357,6 -388,11 +357,6 @@@ is-arrayish@^0.2.1
    resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
    integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
  
 -is-buffer@^1.1.5:
 -  version "1.1.6"
 -  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 -  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 -
  is-finite@^1.0.0:
    version "1.0.2"
    resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@@ -387,6 -423,18 +387,6 @@@ js-yaml@~3.13.0
      argparse "^1.0.7"
      esprima "^4.0.0"
  
 -kind-of@^3.0.2:
 -  version "3.2.2"
 -  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
 -  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
 -  dependencies:
 -    is-buffer "^1.1.5"
 -
 -lazy-cache@^1.0.3:
 -  version "1.0.4"
 -  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 -  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 -
  leaflet-minimap@3.6.1:
    version "3.6.1"
    resolved "https://registry.yarnpkg.com/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz#2a43ff3b3d947a45a0acf4bdefc96505b673a6c6"
@@@ -413,6 -461,11 +413,6 @@@ lodash@~4.17.10, lodash@~4.17.5
    resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
    integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
  
 -longest@^1.0.1:
 -  version "1.0.1"
 -  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 -  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 -
  loud-rejection@^1.0.0:
    version "1.6.0"
    resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@@ -471,11 -524,6 +471,11 @@@ mkdirp@~0.5.1
    dependencies:
      minimist "0.0.8"
  
 +neo-async@^2.6.0:
 +  version "2.6.1"
 +  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
 +  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 +
  nopt@~3.0.6:
    version "3.0.6"
    resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@@ -593,6 -641,11 +593,6 @@@ redent@^1.0.0
      indent-string "^2.1.0"
      strip-indent "^1.0.1"
  
 -repeat-string@^1.5.2:
 -  version "1.6.1"
 -  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 -  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 -
  repeating@^2.0.0:
    version "2.0.1"
    resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
@@@ -612,6 -665,13 +612,6 @@@ resolve@~1.1.0
    resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
    integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
  
 -right-align@^0.1.1:
 -  version "0.1.3"
 -  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
 -  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
 -  dependencies:
 -    align-text "^0.1.1"
 -
  rimraf@~2.6.2:
    version "2.6.3"
    resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@@ -634,10 -694,17 +634,10 @@@ signal-exit@^3.0.0
    resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
    integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
  
 -source-map@^0.4.4:
 -  version "0.4.4"
 -  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
 -  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
 -  dependencies:
 -    amdefine ">=0.0.4"
 -
 -source-map@~0.5.1:
 -  version "0.5.7"
 -  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 -  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 +source-map@^0.6.1, source-map@~0.6.1:
 +  version "0.6.1"
 +  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 +  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
  
  spdx-correct@^3.0.0:
    version "3.1.0"
@@@ -701,13 -768,20 +701,13 @@@ trim-newlines@^1.0.0
    resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
    integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
  
 -uglify-js@^2.6:
 -  version "2.8.29"
 -  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
 -  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
 +uglify-js@^3.1.4:
 +  version "3.7.1"
 +  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.1.tgz#35c7de17971a4aa7689cd2eae0a5b39bb838c0c5"
 +  integrity sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==
    dependencies:
 -    source-map "~0.5.1"
 -    yargs "~3.10.0"
 -  optionalDependencies:
 -    uglify-to-browserify "~1.0.0"
 -
 -uglify-to-browserify@~1.0.0:
 -  version "1.0.2"
 -  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 -  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 +    commander "~2.20.3"
 +    source-map "~0.6.1"
  
  underscore.string@~3.3.4:
    version "3.3.5"
@@@ -737,6 -811,16 +737,6 @@@ which@~1.3.0
    dependencies:
      isexe "^2.0.0"
  
 -window-size@0.1.0:
 -  version "0.1.0"
 -  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 -  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 -
 -wordwrap@0.0.2:
 -  version "0.0.2"
 -  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 -  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 -
  wordwrap@~0.0.2:
    version "0.0.3"
    resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@@ -746,3 -830,13 +746,3 @@@ wrappy@1
    version "1.0.2"
    resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
    integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 -
 -yargs@~3.10.0:
 -  version "3.10.0"
 -  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
 -  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
 -  dependencies:
 -    camelcase "^1.0.2"
 -    cliui "^2.1.0"
 -    decamelize "^1.0.0"
 -    window-size "0.1.0"