just don't close viewer...

ref #5829

css/80_app.css

@@ -264,8 +264,7 @@ div.hide,
 form.hide,
 button.hide,
 a.hide,
-li.hide,
-canvas.hide {
+li.hide {
     display: none;
 }
 

modules/services/mapillary.js

@@ -376,8 +376,7 @@ export default {
         var wrap = d3_select('#photoviewer')
             .classed('hide', false);
 
-        var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size() ||
-            wrap.selectAll('.photo-wrapper.mly-wrapper .hide').size();
+        var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
 
         if (isHidden && _mlyViewer) {
             wrap
@@ -388,14 +387,6 @@ export default {
                 .selectAll('.photo-wrapper.mly-wrapper')
                 .classed('hide', false);
 
-            wrap
-                .selectAll('.mapillary-js-interactive')
-                .classed('hide', false);
-
-            wrap
-                .selectAll('.mapillary-js-dom')
-                .classed('hide', false);
-            
             _mlyViewer.resize();
         }
 
@@ -413,16 +404,10 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        viewer.select('.mapillary-js-interactive')
-              .classed('hide', true);
-
-        viewer.select('.mapillary-js-dom')
-              .classed('hide', true);
-        
-        // viewer
-        //     .classed('hide', true)
-        //     .selectAll('.photo-wrapper')
-        //     .classed('hide', true);
+        viewer
+            .classed('hide', true)
+            .selectAll('.photo-wrapper')
+            .classed('hide', true);
 
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')
             .classed('currentView', false);
@@ -430,8 +415,6 @@ export default {
         return this.setStyles(null, true);
     },
 
-    removeViewer: function() {
-    },
 
     parsePagination: parsePagination,
 

modules/services/openstreetcam.js

@@ -384,8 +384,6 @@ export default {
 
             viewer
                 .selectAll('.photo-wrapper.osc-wrapper')
-                .classed('hide', false)
-                .selectAll('div')
                 .classed('hide', false);
         }
 
@@ -399,15 +397,11 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        // viewer
-        //     .classed('hide', true)
-        //     .selectAll('.photo-wrapper')
-        //     .classed('hide', true);
-
         viewer
-            .selectAll('.osc-wrapper > div')
+            .classed('hide', true)
+            .selectAll('.photo-wrapper')
             .classed('hide', true);
-            
+
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')
             .classed('currentView', false);
 

modules/services/streetside.js

@@ -722,29 +722,16 @@ export default {
         var wrap = d3_select('#photoviewer')
             .classed('hide', false);
 
-        var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size() ||
-                       wrap.selectAll('.photo-wrapper.ms-wrapper > div.hide').size();
+        var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
 
         if (isHidden) {
             wrap
                 .selectAll('.photo-wrapper:not(.ms-wrapper)')
                 .classed('hide', true);
 
-            var msWrap = wrap.selectAll('.photo-wrapper.ms-wrapper');
-                
-            msWrap
-                .classed('hide', false)
-                .selectAll('.pnlm-container')
+            wrap
+                .selectAll('.photo-wrapper.ms-wrapper')
                 .classed('hide', false);
-
-            msWrap
-                .select('.photo-controls-wrap')
-                .classed('hide', false);
-
-            msWrap
-                .selectAll('#divForCanvasWork > canvas')
-                .classed('hide', false);
-
         }
 
         return this;
@@ -757,18 +744,9 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        var msWrap = viewer.selectAll('.photo-wrapper.ms-wrapper');
-
-        msWrap
-            .select('.photo-controls-wrap')
-            .classed('hide', true);
-        
-        msWrap
-            .selectAll('.pnlm-container')
-            .classed('hide', true);
-
-        msWrap
-            .selectAll('#divForCanvasWork > canvas')
+        viewer
+            .classed('hide', true)
+            .selectAll('.photo-wrapper')
             .classed('hide', true);
 
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')

modules/svg/mapillary_images.js

@@ -65,9 +65,6 @@ export function svgMapillaryImages(projection, context, dispatch) {
 
     function hideLayer() {
         var service = getService();
-        if (service) {
-            service.hideViewer();
-        }
 
         throttledRedraw.cancel();
 

modules/svg/mapillary_signs.js

@@ -41,9 +41,6 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
     function hideLayer() {
         var service = getService();
-        if (service) {
-            service.hideViewer();
-        }
 
         throttledRedraw.cancel();
         editOff();

modules/svg/streetside.js

@@ -62,9 +62,6 @@ export function svgStreetside(projection, context, dispatch) {
      */
     function hideLayer() {
         var service = getService();
-        if (service) {
-            service.hideViewer();
-        }
 
         throttledRedraw.cancel();