Closes geosolutions-it#1639

kappu72 · Sep 11, 2017 · aa17ef1 · aa17ef1
1 parent 60015c8
commit aa17ef1
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 25 deletions.
diff --git a/web/client/components/map/leaflet/Map.jsx b/web/client/components/map/leaflet/Map.jsx
@@ -90,7 +90,7 @@ class LeafletMap extends React.Component {
             doubleClickZoom: false,
             boxZoom: false,
             tap: false
-        }, this.props.mapOptions, this.crs ? {crs: this.crs} : {});
+        }, {maxZoom: 23}, this.props.mapOptions, this.crs ? {crs: this.crs} : {});
 
         const map = L.map(this.props.id, assign({zoomControl: this.props.zoomControl}, mapOptions) ).setView([this.props.center.y, this.props.center.x],
           Math.round(this.props.zoom));

diff --git a/web/client/components/map/leaflet/plugins/BingLayer.js b/web/client/components/map/leaflet/plugins/BingLayer.js
@@ -50,7 +50,9 @@ Layers.registerType('bing', {
             type: options.name,
             attribution: 'Bing',
             culture: '',
-            onError: options.onError
+            onError: options.onError,
+            maxNativeZoom: options.maxNativeZoom || 19,
+            maxZoom: options.maxZoom || 23
         };
         if (options.zoomOffset) {
             layerOptions = assign({}, layerOptions, {

diff --git a/web/client/components/map/leaflet/plugins/GoogleLayer.js b/web/client/components/map/leaflet/plugins/GoogleLayer.js
@@ -8,7 +8,10 @@
 
 var Layers = require('../../../../utils/leaflet/Layers');
 var Google = require('leaflet-plugins/layer/tile/Google');
-
+Google.prototype._checkZoomLevels = function() {
+    // Avoid map zoom setting when current zoom is greatr then  the google's max zoom
+};
 Layers.registerType('google', (options) => {
-    return new Google(options.name, {zoomOffset: options.zoomOffset || 0});
+    return new Google(options.name, {zoomOffset: options.zoomOffset || 0, maxNativeZoom: options.maxNativeZoom || 18,
+        maxZoom: options.maxZoom || 20});
 });
diff --git a/web/client/components/map/leaflet/plugins/MapQuest.js b/web/client/components/map/leaflet/plugins/MapQuest.js
@@ -12,7 +12,8 @@ const MQ = require('../../../../libs/mapquest');
 Layers.registerType('mapquest', {
     create: (options) => {
         if (MQ) {
-            return MQ.mapLayer(options);
+            return MQ.mapLayer({
+            maxZoom: 23, ...options});
         }
         if (options && options.onError) {
             options.onError();

diff --git a/web/client/components/map/leaflet/plugins/OSMLayer.js b/web/client/components/map/leaflet/plugins/OSMLayer.js
@@ -12,6 +12,8 @@ var L = require('leaflet');
 Layers.registerType('osm', (options) => {
     return L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
         attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors',
-        zoomOffset: options.zoomOffset || 0
+        zoomOffset: options.zoomOffset || 0,
+        maxNativeZoom: options.maxNativeZoom || 19,
+        maxZoom: options.maxZoom || 23
     });
 });
diff --git a/web/client/components/map/leaflet/plugins/TileProviderLayer.js b/web/client/components/map/leaflet/plugins/TileProviderLayer.js
@@ -11,6 +11,6 @@ var L = require('leaflet');
 var TileProvider = require('../../../../utils/TileConfigProvider');
 
 Layers.registerType('tileprovider', (options) => {
-    let [url, opt] = TileProvider.getLayerConfig(options.provider, options);
+    let [url, opt] = TileProvider.getLayerConfig(options.provider, {maxZoom: 23, ...options});
     return L.tileLayer(url, opt);
 });
diff --git a/web/client/components/map/leaflet/plugins/WMSLayer.js b/web/client/components/map/leaflet/plugins/WMSLayer.js
@@ -31,14 +31,12 @@ L.TileLayer.MultipleUrlWMS = L.TileLayer.WMS.extend({
         } else {
             wmsParams.width = wmsParams.height = tileSize;
         }
-
         for (let i in options) {
             // all keys that are not TileLayer options go to WMS params
-            if (!this.options.hasOwnProperty(i) && i.toUpperCase() !== 'CRS') {
+            if (!this.options.hasOwnProperty(i) && i.toUpperCase() !== 'CRS' && i !== "maxNativeZoom") {
                 wmsParams[i] = options[i];
             }
         }
-
         this.wmsParams = wmsParams;
 
         L.setOptions(this, options);
@@ -83,9 +81,10 @@ function wmsToLeafletOptions(options) {
         version: options.version || "1.3.0",
         SRS: CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS),
         CRS: CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS),
-        tileSize: options.tileSize || 256
+        tileSize: options.tileSize || 256,
+        maxZoom: options.maxZoom || 23,
+        maxNativeZoom: options.maxNativeZoom || 18
     }, objectAssign(
-        {},
         (options._v_ ? {_v_: options._v_} : {}),
         (options.params || {})
     ));

diff --git a/web/client/components/map/leaflet/plugins/WMTSLayer.js b/web/client/components/map/leaflet/plugins/WMTSLayer.js
@@ -29,7 +29,9 @@ function wmtsToLeafletOptions(options) {
         tileMatrixSet: tileMatrixSet,
         version: options.version || "1.0.0",
         tileSize: options.tileSize || 256,
-        CRS: CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS)
+        CRS: CoordinatesUtils.normalizeSRS(options.srs || 'EPSG:3857', options.allowedSRS),
+        maxZoom: options.maxZoom || 23,
+        maxNativeZoom: options.maxNativeZoom || 18
     }, options.params || {});
 }