Fix #4055 ZoomToMaxExtent button switch CRS (#4135) (#4137)

vlt1 · Tobia Di Pisa · commit 324891dc87c2 · 2019-09-02T16:54:11.000+02:00
* Changed zoomToInitialExtent to use current CRS * Updated tests to use different projections (cherry picked from commit c4a96ae)
diff --git a/web/client/components/buttons/ZoomToMaxExtentButton.jsx b/web/client/components/buttons/ZoomToMaxExtentButton.jsx
@@ -120,7 +120,7 @@ class ZoomToMaxExtentButton extends React.Component {
         // zooming to the initial extent based on initial map configuration
         var mapConfig = this.props.mapInitialConfig;
         let bbox = mapUtils.getBbox(mapConfig.center, mapConfig.zoom, this.props.mapConfig.size);
-        this.props.changeMapView(mapConfig.center, mapConfig.zoom, bbox, this.props.mapConfig.size, null, mapConfig.projection);
+        this.props.changeMapView(mapConfig.center, mapConfig.zoom, bbox, this.props.mapConfig.size, null, this.props.mapConfig.projection);
     };
 }
 
diff --git a/web/client/components/buttons/__tests__/ZoomToMaxExtentButton-test.jsx b/web/client/components/buttons/__tests__/ZoomToMaxExtentButton-test.jsx
@@ -145,7 +145,7 @@ describe('This test for ZoomToMaxExtentButton', () => {
 
     it('test zoom to initial extent', () => {
 
-        let genericTest = function(btnType) {
+        let genericTest = function(btnType, projection) {
             let actions = {
                 changeMapView: (c, z, mb, ms) => {
                     return {c, z, mb, ms};
@@ -160,7 +160,8 @@ describe('This test for ZoomToMaxExtentButton', () => {
                         size: {
                             height: 100,
                             width: 100
-                        }
+                        },
+                        projection: projection
                     }}
                     mapInitialConfig={{
                         zoom: 10,
@@ -194,10 +195,12 @@ describe('This test for ZoomToMaxExtentButton', () => {
             expect(actionsSpy.calls[0].arguments[2]).toNotExist();
             expect(actionsSpy.calls[0].arguments[3]).toExist();
             expect(actionsSpy.calls[0].arguments[4]).toNotExist();
-            expect(actionsSpy.calls[0].arguments[5]).toExist();
+            expect(actionsSpy.calls[0].arguments[5]).toEqual(projection);
         };
 
-        genericTest("normal");
-        genericTest("image");
+        genericTest("normal", "EPSG:900913");
+        genericTest("normal", "EPSG:4326");
+        genericTest("image", "EPSG:900913");
+        genericTest("image", "EPSG:4326");
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ class ZoomToMaxExtentButton extends React.Component {`
`120`	`120`	`// zooming to the initial extent based on initial map configuration`
`121`	`121`	`var mapConfig = this.props.mapInitialConfig;`
`122`	`122`	`let bbox = mapUtils.getBbox(mapConfig.center, mapConfig.zoom, this.props.mapConfig.size);`
`123`		`- this.props.changeMapView(mapConfig.center, mapConfig.zoom, bbox, this.props.mapConfig.size, null, mapConfig.projection);`
	`123`	`+ this.props.changeMapView(mapConfig.center, mapConfig.zoom, bbox, this.props.mapConfig.size, null, this.props.mapConfig.projection);`
`124`	`124`	`};`
`125`	`125`	`}`
`126`	`126`