Update leaflet libraries:

- Leaflet 1.6.0 - Leaflet.markercluster 1.4.1 - leaflet-providers 1.9.1 Removes the grayscale OSM base layer option.
omeka · Apr 16, 2020 · 6e15ec4 · 6e15ec4
1 parent b3a0f1a
commit 6e15ec4
Show file tree

Hide file tree

Showing 15 changed files with 15,230 additions and 820 deletions.
diff --git a/GeolocationPlugin.php b/GeolocationPlugin.php
@@ -118,6 +118,10 @@ public function hookUpgrade($args)
         }
         if (version_compare($args['old_version'], '3.1', '<')) {
             set_option('geolocation_geocoder', self::DEFAULT_GEOCODER);
+
+            if (get_option('geolocation_basemap') == 'OpenStreetMap.BlackAndWhite') {
+                set_option('geolocation_basemap', self::DEFAULT_BASEMAP);
+            }
         }
     }
 

diff --git a/config_form.php b/config_form.php
@@ -42,7 +42,6 @@
         echo $view->formSelect('basemap', get_option('geolocation_basemap'), array(), array(
             __('OpenStreetMap') => array(
                 'OpenStreetMap' => __('Standard'),
-                'OpenStreetMap.BlackAndWhite' => __('Grayscale'),
                 'OpenStreetMap.HOT' => __('Humanitarian'),
             ),
             __('OpenTopoMap') => array(

diff --git a/views/shared/javascripts/leaflet-markercluster/WhereAreTheJavascriptFiles.txt b/views/shared/javascripts/leaflet-markercluster/WhereAreTheJavascriptFiles.txt
diff --git a/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster-src.js b/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster-src.js
diff --git a/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster-src.js.map b/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster-src.js.map
diff --git a/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster.js b/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster.js
diff --git a/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster.js.map b/views/shared/javascripts/leaflet-markercluster/leaflet.markercluster.js.map