From ce8d16a2208fc55f1ab17201c247b1d0c7286f6b Mon Sep 17 00:00:00 2001
From: Max Grossman <m.grossman1813@gmail.com>
Date: Fri, 1 Feb 2019 11:49:30 -0500
Subject: [PATCH] initial commit...hide parts, not entire viewer

ref #5829
---
 css/80_app.css                    |  3 ++-
 modules/services/mapillary.js     | 27 +++++++++++++++++++-----
 modules/services/openstreetcam.js | 14 +++++++++----
 modules/services/streetside.js    | 34 +++++++++++++++++++++++++------
 modules/svg/mapillary_signs.js    |  5 +++++
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 530e7cf64..bf67d5349 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -264,7 +264,8 @@ div.hide,
 form.hide,
 button.hide,
 a.hide,
-li.hide {
+li.hide,
+canvas.hide {
     display: none;
 }
 
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index 0cc6b650e..e5b53bf7f 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -376,7 +376,8 @@ export default {
         var wrap = d3_select('#photoviewer')
             .classed('hide', false);
 
-        var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
+        var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size() ||
+            wrap.selectAll('.photo-wrapper.mly-wrapper .hide').size();
 
         if (isHidden && _mlyViewer) {
             wrap
@@ -387,6 +388,14 @@ 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();
         }
 
@@ -404,10 +413,16 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        viewer
-            .classed('hide', true)
-            .selectAll('.photo-wrapper')
-            .classed('hide', true);
+        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);
 
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')
             .classed('currentView', false);
@@ -415,6 +430,8 @@ export default {
         return this.setStyles(null, true);
     },
 
+    removeViewer: function() {
+    },
 
     parsePagination: parsePagination,
 
diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js
index d4963a1f3..b901a907d 100644
--- a/modules/services/openstreetcam.js
+++ b/modules/services/openstreetcam.js
@@ -384,6 +384,8 @@ export default {
 
             viewer
                 .selectAll('.photo-wrapper.osc-wrapper')
+                .classed('hide', false)
+                .selectAll('div')
                 .classed('hide', false);
         }
 
@@ -397,11 +399,15 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        viewer
-            .classed('hide', true)
-            .selectAll('.photo-wrapper')
-            .classed('hide', true);
+        // viewer
+        //     .classed('hide', true)
+        //     .selectAll('.photo-wrapper')
+        //     .classed('hide', true);
 
+        viewer
+            .selectAll('.osc-wrapper > div')
+            .classed('hide', true);
+            
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')
             .classed('currentView', false);
 
diff --git a/modules/services/streetside.js b/modules/services/streetside.js
index da7181172..c7873404e 100644
--- a/modules/services/streetside.js
+++ b/modules/services/streetside.js
@@ -722,16 +722,29 @@ export default {
         var wrap = d3_select('#photoviewer')
             .classed('hide', false);
 
-        var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
+        var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size() ||
+                       wrap.selectAll('.photo-wrapper.ms-wrapper > div.hide').size();
 
         if (isHidden) {
             wrap
                 .selectAll('.photo-wrapper:not(.ms-wrapper)')
                 .classed('hide', true);
 
-            wrap
-                .selectAll('.photo-wrapper.ms-wrapper')
+            var msWrap = wrap.selectAll('.photo-wrapper.ms-wrapper');
+                
+            msWrap
+                .classed('hide', false)
+                .selectAll('.pnlm-container')
                 .classed('hide', false);
+
+            msWrap
+                .select('.photo-controls-wrap')
+                .classed('hide', false);
+
+            msWrap
+                .selectAll('#divForCanvasWork > canvas')
+                .classed('hide', false);
+
         }
 
         return this;
@@ -744,9 +757,18 @@ export default {
         var viewer = d3_select('#photoviewer');
         if (!viewer.empty()) viewer.datum(null);
 
-        viewer
-            .classed('hide', true)
-            .selectAll('.photo-wrapper')
+        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')
             .classed('hide', true);
 
         d3_selectAll('.viewfield-group, .sequence, .icon-sign')
diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js
index c282d5363..2a764873a 100644
--- a/modules/svg/mapillary_signs.js
+++ b/modules/svg/mapillary_signs.js
@@ -40,6 +40,11 @@ export function svgMapillarySigns(projection, context, dispatch) {
 
 
     function hideLayer() {
+        var service = getService();
+        if (service) {
+            service.hideViewer();
+        }
+
         throttledRedraw.cancel();
         editOff();
     }