From 6eb0bb6e4ff685611e6c0a657263066ede8257e6 Mon Sep 17 00:00:00 2001
From: Matteo Velludini <matteo.velludini@geo-solutions.it>
Date: Tue, 15 May 2018 12:23:03 +0200
Subject: [PATCH] fix #2696 map rotation disables correctly

---
 web/client/plugins/Map.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/client/plugins/Map.jsx b/web/client/plugins/Map.jsx
index cd06fd6157..2f9d30d39e 100644
--- a/web/client/plugins/Map.jsx
+++ b/web/client/plugins/Map.jsx
@@ -270,12 +270,14 @@ class MapPlugin extends React.Component {
 
     render() {
         if (this.props.map) {
+            const {mapOptions = {}} = this.props.map;
+
             return (
                 <plugins.Map id="map"
                     {...this.props.options}
-                    mapOptions={this.getMapOptions()}
                     projectionDefs={this.props.projectionDefs}
                     {...this.props.map}
+                    mapOptions={assign({}, mapOptions, this.getMapOptions())}
                     zoomControl={this.props.zoomControl}>
                     {this.renderLayers()}
                     {this.renderSupportTools()}