From ce8d16a2208fc55f1ab17201c247b1d0c7286f6b Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 11:49:30 -0500 Subject: [PATCH 1/4] 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(); } From d89452114341562a8d9c76437587563b84b8b239 Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 13:55:10 -0500 Subject: [PATCH 2/4] just don't close viewer... ref #5829 --- css/80_app.css | 3 +-- modules/services/mapillary.js | 27 +++++------------------- modules/services/openstreetcam.js | 12 +++-------- modules/services/streetside.js | 34 ++++++------------------------- modules/svg/mapillary_images.js | 3 --- modules/svg/mapillary_signs.js | 3 --- modules/svg/streetside.js | 3 --- 7 files changed, 15 insertions(+), 70 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index bf67d5349..530e7cf64 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -264,8 +264,7 @@ div.hide, form.hide, button.hide, a.hide, -li.hide, -canvas.hide { +li.hide { display: none; } diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index e5b53bf7f..0cc6b650e 100644 --- a/modules/services/mapillary.js +++ b/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, diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js index b901a907d..d4963a1f3 100644 --- a/modules/services/openstreetcam.js +++ b/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); diff --git a/modules/services/streetside.js b/modules/services/streetside.js index c7873404e..da7181172 100644 --- a/modules/services/streetside.js +++ b/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') diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index 7b43840b4..d1914e962 100644 --- a/modules/svg/mapillary_images.js +++ b/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(); diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js index 2a764873a..12a885227 100644 --- a/modules/svg/mapillary_signs.js +++ b/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(); diff --git a/modules/svg/streetside.js b/modules/svg/streetside.js index 89b9883dc..a1fa1ffde 100644 --- a/modules/svg/streetside.js +++ b/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(); From ec1a42ad39af48e62d5773a2284cf32679e996ad Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 13:59:04 -0500 Subject: [PATCH 3/4] clean up & remove hideViewer for openstreetcam ref #5829 --- modules/svg/mapillary_signs.js | 2 -- modules/svg/openstreetcam_images.js | 5 ----- 2 files changed, 7 deletions(-) diff --git a/modules/svg/mapillary_signs.js b/modules/svg/mapillary_signs.js index 12a885227..c282d5363 100644 --- a/modules/svg/mapillary_signs.js +++ b/modules/svg/mapillary_signs.js @@ -40,8 +40,6 @@ export function svgMapillarySigns(projection, context, dispatch) { function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); editOff(); } diff --git a/modules/svg/openstreetcam_images.js b/modules/svg/openstreetcam_images.js index 254897169..a94bc5174 100644 --- a/modules/svg/openstreetcam_images.js +++ b/modules/svg/openstreetcam_images.js @@ -49,11 +49,6 @@ export function svgOpenstreetcamImages(projection, context, dispatch) { function hideLayer() { - var service = getService(); - if (service) { - service.hideViewer(); - } - throttledRedraw.cancel(); layer From 7f837c7e0c81311573ff67831e229a9943f5fca6 Mon Sep 17 00:00:00 2001 From: Max Grossman Date: Fri, 1 Feb 2019 14:01:17 -0500 Subject: [PATCH 4/4] no need to generate service variable ref #5929 --- modules/svg/mapillary_images.js | 2 -- modules/svg/streetside.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/modules/svg/mapillary_images.js b/modules/svg/mapillary_images.js index d1914e962..96b56a5f6 100644 --- a/modules/svg/mapillary_images.js +++ b/modules/svg/mapillary_images.js @@ -64,8 +64,6 @@ export function svgMapillaryImages(projection, context, dispatch) { function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); layer diff --git a/modules/svg/streetside.js b/modules/svg/streetside.js index a1fa1ffde..9d5b43e06 100644 --- a/modules/svg/streetside.js +++ b/modules/svg/streetside.js @@ -61,8 +61,6 @@ export function svgStreetside(projection, context, dispatch) { * hideLayer(). */ function hideLayer() { - var service = getService(); - throttledRedraw.cancel(); layer