leaflet 1.3 => 1.6

diff --git a/package.json b/package.json
index 138e70915f822baa48f8a3aae17afe76e0f70491..9c4ac6997d42ab1736a0d7554ac8690795af2d88 100644 (file)
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "grunt": "^1.0.2",
     "handlebars": "4.5.3",
     "jquery": "3.4.1",
-    "leaflet": "1.3.1",
+    "leaflet": "1.6.0",
     "leaflet-minimap": "3.6.1"
   }
 }

diff --git a/src/assets/js/searchpage.js b/src/assets/js/searchpage.js
index 44e7a7941068550b0179b8907d3df7aeea63160b..a0a8a1732fd5207b64a8ec0b84239cfd8cd06ff6 100755 (executable)
--- a/src/assets/js/searchpage.js
+++ b/src/assets/js/searchpage.js
@@ -269,7 +269,7 @@ jQuery(document).ready(function(){
             // lon: typeof(search_params.get('lon') !== 'undefined') ? search_params.get('lon') : get_config_value('Map_Default_Lon'),
             lat: search_params.get('lat'),
             lon: search_params.get('lon'),
-            zoom: (search_params.get('zoom') !== '' ? search_params.get('zoom') : get_config_value('Reverse_Default_Search_Zoom')),
+            zoom: (search_params.get('zoom') !== null ? search_params.get('zoom') : get_config_value('Reverse_Default_Search_Zoom')),
             format: 'jsonv2'
         }
 
@@ -277,7 +277,7 @@ jQuery(document).ready(function(){
             // aPlace: aPlace,
             fLat: api_request_params.lat,
             fLon: api_request_params.lon,
-            iZoom: (search_params.get('zoom') !== '' ? api_request_params.zoom : get_config_value('Reverse_Default_Search_Zoom'))
+            iZoom: (search_params.get('zoom') !== null ? api_request_params.zoom : get_config_value('Reverse_Default_Search_Zoom'))
         };
 
 

diff --git a/yarn.lock b/yarn.lock
index b659e8dee0792541da8f01f04669c12db4836ce2..944a80861c7494befacee0b920e16ff5f0c23de1 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -392,10 +392,10 @@ leaflet-minimap@3.6.1:
   resolved "https://registry.yarnpkg.com/leaflet-minimap/-/leaflet-minimap-3.6.1.tgz#2a43ff3b3d947a45a0acf4bdefc96505b673a6c6"
   integrity sha1-KkP/Oz2UekWgrPS978llBbZzpsY=
 
-leaflet@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
-  integrity sha512-adQOIzh+bfdridLM1xIgJ9VnJbAUY3wqs/ueF+ITla+PLQ1z47USdBKUf+iD9FuUA8RtlT6j6hZBfZoA6mW+XQ==
+leaflet@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.6.0.tgz#aecbb044b949ec29469eeb31c77a88e2f448f308"
+  integrity sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ==
 
 load-json-file@^1.0.0:
   version "1.1.0"