Fixed projection switching in WMS layers

geosolutions-it · Mar 10, 2017 · d504ad9 · d504ad9
1 parent 679ca32
commit d504ad9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/web/client/components/map/openlayers/Layer.jsx b/web/client/components/map/openlayers/Layer.jsx
@@ -92,7 +92,8 @@ const OpenlayersLayer = React.createClass({
         }
     },
     generateOpts(options, position, srs) {
-        return assign({}, options, position ? {zIndex: position, srs} : null, {
+        return assign({}, options, _.isNumber(position) ? {zIndex: position} : null, {
+            srs,
             onError: () => {
                 this.props.onInvalid(this.props.type, options);
             }
@@ -120,8 +121,8 @@ const OpenlayersLayer = React.createClass({
         Layers.updateLayer(
             this.props.type,
             this.layer,
-            this.generateOpts(newProps.options, newProps.position, newProps.srs),
-            this.generateOpts(oldProps.options, oldProps.position, oldProps.srs),
+            this.generateOpts(newProps.options, newProps.position, newProps.projection),
+            this.generateOpts(oldProps.options, oldProps.position, oldProps.projection),
             this.props.map,
             this.props.mapId);
     },

diff --git a/web/client/components/map/openlayers/plugins/WMSLayer.js b/web/client/components/map/openlayers/plugins/WMSLayer.js
@@ -98,7 +98,15 @@ Layers.registerType('wms', {
                 }
                 return found;
             }, false);
-
+            if (oldOptions.srs !== newOptions.srs) {
+                const extent = ol.proj.get(CoordinatesUtils.normalizeSRS(newOptions.srs, newOptions.allowedSRS)).getExtent();
+                layer.getSource().tileGrid = new ol.tilegrid.TileGrid({
+                    extent: extent,
+                    resolutions: mapUtils.getResolutions(),
+                    tileSize: newOptions.tileSize ? newOptions.tileSize : 256,
+                    origin: newOptions.origin ? newOptions.origin : [extent[0], extent[1]]
+                });
+            }
             if (changed) {
                 layer.getSource().updateParams(objectAssign(newParams, newOptions.params));
             }