Removed canceled map "OpenStreetMap Black and white style" (leaflet-e…

…xtras/leaflet-providers#316).
Daniel-KM · Apr 13, 2020 · 70d02e7 · 70d02e7
1 parent 6736624
commit 70d02e7
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 208 deletions.
diff --git a/README.md b/README.md
@@ -131,7 +131,6 @@ var ign = new L.TileLayer.WMTS(url, {
 
 baseMaps = {
  'Streets': L.tileLayer.provider('OpenStreetMap.Mapnik'),
- 'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
  'Satellite': L.tileLayer.provider('Esri.WorldImagery'),
  'Terrain': L.tileLayer.provider('Esri.WorldShadedRelief'),
  'IGN': ign,

diff --git a/asset/js/cartography.js b/asset/js/cartography.js
@@ -2200,7 +2200,7 @@ var initLocate = function() {
  if (typeof baseMaps !== 'object' || $.isEmptyObject(baseMaps)) {
  baseMaps = {
  'Streets': L.tileLayer.provider('OpenStreetMap.Mapnik'),
- 'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
+ /* 'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'), // Removed from OpenStreetMap https://github.com/leaflet-extras/leaflet-providers/issues/316 */
  'Satellite': L.tileLayer.provider('Esri.WorldImagery'),
  'Terrain': L.tileLayer.provider('Esri.WorldShadedRelief'),
  };
@@ -2348,7 +2348,7 @@ var initGeobrowse = function() {
  if (typeof baseMaps !== 'object' || $.isEmptyObject(baseMaps)) {
  baseMaps = {
  'Streets': L.tileLayer.provider('OpenStreetMap.Mapnik'),
- 'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
+ /* 'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'), // Removed from OpenStreetMap https://github.com/leaflet-extras/leaflet-providers/issues/316 */
  'Satellite': L.tileLayer.provider('Esri.WorldImagery'),
  'Terrain': L.tileLayer.provider('Esri.WorldShadedRelief'),
  };

diff --git a/asset/vendor/leaflet-tilelayer-wmts/LICENCE b/asset/vendor/leaflet-tilelayer-wmts/LICENCE
diff --git a/asset/vendor/leaflet-tilelayer-wmts/README.md b/asset/vendor/leaflet-tilelayer-wmts/README.md
diff --git a/asset/vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts-src.js b/asset/vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts-src.js
diff --git a/asset/vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts.js b/asset/vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts.js
diff --git a/data/scripts/upgrade.php b/data/scripts/upgrade.php
@@ -26,3 +26,16 @@
  'To upgrade to Cartography 3.1.0, you must follow the steps described in upgrade_from_alpha.md.' // @translate
  ));
 }
+
+if (version_compare($oldVersion, '3.1.3.2', '<')) {
+ $locate = $settings->get('cartography_js_locate', '');
+ $replace = <<<JS
+'Grayscale': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
+JS;
+ $locate = str_replace($replace, '', $locate);
+ $replace = <<<JS
+'Grayscale':L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
+JS;
+ $locate = str_replace($replace, '', $locate);
+ $settings->set('cartography_js_locate', $locate);
+}
diff --git a/gulpfile.js b/gulpfile.js
@@ -53,11 +53,11 @@ const bundle = [
  // 'source': 'node_modules/leaflet-styleeditor/dist/**',
  // 'dest': 'asset/vendor/leaflet-styleeditor',
  // },
- // TODO Check if original works.
- // {
- //  'source': 'node_modules/leaflet-tilelayer-wmts/dist/**',
- //  'dest': 'asset/vendor/leaflet-tilelayer-wmts',
- // },
+ {
+  'source': 'node_modules/leaflet-tilelayer-wmts/dist/leaflet-tilelayer-wmts.js',
+ 'dest': 'asset/vendor/leaflet-tilelayer-wmts',
+ 'rename': true,
+ },
 ];
 
 const hack_leaflet_draw = function (done) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
  "leaflet-fullscreen": "^1.0.2",
  "leaflet-geosearch": "^2.7.0",
  "leaflet-groupedlayercontrol": "^0.6.1",
- "leaflet-providers": "^1.5.0",
- "leaflet-styleeditor": "^0.1.10-beta",
+ "leaflet-providers": "^1.9.1",
+ "leaflet-styleeditor": "=0.1.10-beta",
  "leaflet-tilelayer-wmts": "^1.0.0",
  "leaflet.markercluster": "^1.4.1"
  },

diff --git a/src/View/Helper/Cartography.php b/src/View/Helper/Cartography.php
@@ -212,10 +212,8 @@ protected function prepareHeaders(AbstractResourceEntityRepresentation $resource
 
  if ($js = $view->setting('cartography_js_locate')) {
  // Add wmts layers if needed.
- // $headScript->appendFile($assetUrl('vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts.js', 'Cartography'));
- $headScript
- ->appendFile($assetUrl('vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts-src.js', 'Cartography'), 'text/javascript', ['defer' => 'defer']);
  $headScript
+ ->appendFile($assetUrl('vendor/leaflet-tilelayer-wmts/leaflet-tilelayer-wmts.min.js', 'Cartography'), 'text/javascript', ['defer' => 'defer'])
  ->appendScript('$(document).ready( function() { ' . $js . ' });');
  }