Merge branch '273-overlays-in-submaps' into 'devel_11.0.x'

when opening a window that was already opened, overlays are not repainted (so…

See merge request piotr.gawron/minerva!183

frontend-js/src/main/js/map/CustomMap.js

@@ -389,22 +389,22 @@ CustomMap.prototype.openSubmap = function (id) {
 
     // we have to perform it on top map, because on submaps id is different
     return this.openDataOverlay(self.getGoogleMap().getMapTypeId()).then(function () {
-      // now we have to visualize layouts
-      var layouts = [];
+      if (!wasInitialized) {
+        // now we have to visualize layouts
+        var layouts = [];
 
-      // get list of layouts
-      for (var key in self._selectedOverlays) {
-        if (self._selectedOverlays.hasOwnProperty(key) && self._selectedOverlays[key] === true) {
-          layouts.push(key);
+        // get list of layouts
+        for (var key in self._selectedOverlays) {
+          if (self._selectedOverlays.hasOwnProperty(key) && self._selectedOverlays[key] === true) {
+            layouts.push(key);
+          }
         }
-      }
 
-      // show layouts that should be visualized (resize or show them)
-      for (var i = 0; i < layouts.length; i++) {
-        var layoutId = layouts[i];
-        submap._showSelectedLayout(layoutId, i, layouts.length);
-      }
-      if (!wasInitialized) {
+        // show layouts that should be visualized (resize or show them)
+        for (var i = 0; i < layouts.length; i++) {
+          var layoutId = layouts[i];
+          submap._showSelectedLayout(layoutId, i, layouts.length);
+        }
         return self.refreshMarkers(true);
       }
     });

frontend-js/src/test/js/map/CustomMap-test.js

@@ -189,6 +189,28 @@ describe('CustomMap', function() {
       });
     });
 
+    it("with submap double opened", function () {
+      var projectId = "complex_model_with_submaps";
+      helper.setUrl("http://test/?id=" + projectId);
+      var customMap, filledSubmap ;
+      var filledSubmodelId = 16731;
+      var overlayId = 18083;
+
+      return ServerConnector.getProject(projectId).then(function (project) {
+        customMap = helper.createCustomMap(project);
+        return customMap.openSubmap(filledSubmodelId);
+      }).then(function () {
+        filledSubmap = customMap.getSubmapById(filledSubmodelId);
+        return customMap.openDataOverlay(overlayId);
+      }).then(function () {
+        assert.equal(1, filledSubmap.selectedLayoutOverlays[overlayId].length);
+        return customMap.openSubmap(filledSubmodelId);
+      }).then(function () {
+        //after opening submap nothing should change
+        assert.equal(1, filledSubmap.selectedLayoutOverlays[overlayId].length);
+      });
+    });
+
   });
 
   it("removeSelectedLayout", function() {