diff --git a/examples/js/GUI/GuiTools.js b/examples/js/GUI/GuiTools.js index 53c122ef67..711813b7dd 100644 --- a/examples/js/GUI/GuiTools.js +++ b/examples/js/GUI/GuiTools.js @@ -41,7 +41,8 @@ function GuiTools(domId, view, w) { viewerDiv.appendChild(this.gui.domElement); this.colorGui = this.gui.addFolder('Color Layers'); this.elevationGui = this.gui.addFolder('Elevation Layers'); - + this.elevationGui.hide(); + this.colorGui.hide(); if (view) { this.view = view; view.addEventListener('layers-order-changed', (function refreshColorGui() { @@ -75,6 +76,7 @@ GuiTools.prototype.addLayersGUI = function fnAddLayersGUI() { GuiTools.prototype.addImageryLayerGUI = function addImageryLayerGUI(layer) { if (this.colorGui.hasFolder(layer.id)) { return; } + this.colorGui.show(); var folder = this.colorGui.addFolder(layer.id); folder.add({ visible: layer.visible }, 'visible').onChange((function updateVisibility(value) { layer.visible = value; @@ -92,6 +94,7 @@ GuiTools.prototype.addImageryLayerGUI = function addImageryLayerGUI(layer) { GuiTools.prototype.addElevationLayerGUI = function addElevationLayerGUI(layer) { if (this.elevationGui.hasFolder(layer.id)) { return; } + this.elevationGui.show(); var folder = this.elevationGui.addFolder(layer.id); folder.add({ frozen: layer.frozen }, 'frozen').onChange(function refreshFrozenGui(value) { layer.frozen = value; diff --git a/examples/source_file_geojson_raster.html b/examples/source_file_geojson_raster.html index a15b07c4b7..13c3802124 100644 --- a/examples/source_file_geojson_raster.html +++ b/examples/source_file_geojson_raster.html @@ -12,6 +12,7 @@
+ diff --git a/examples/source_file_gpx_raster.html b/examples/source_file_gpx_raster.html index cd4fbaff2a..c38df53e2f 100644 --- a/examples/source_file_gpx_raster.html +++ b/examples/source_file_gpx_raster.html @@ -12,6 +12,7 @@
+ diff --git a/examples/source_file_kml_raster.html b/examples/source_file_kml_raster.html index 3472691e26..37fee6fb1d 100644 --- a/examples/source_file_kml_raster.html +++ b/examples/source_file_kml_raster.html @@ -12,6 +12,7 @@
+ diff --git a/examples/source_file_shapefile.html b/examples/source_file_shapefile.html index 8dd3aed5ea..e5e23a0982 100644 --- a/examples/source_file_shapefile.html +++ b/examples/source_file_shapefile.html @@ -59,9 +59,10 @@ } }}); - view.addLayer(velibLayer); + view.addLayer(velibLayer).then(menuGlobe.addLayerGUI.bind(menuGlobe)); new FeatureToolTip(view, { filterAll: false }); + debug.createTileDebugUI(menuGlobe.gui, view); }); diff --git a/examples/source_stream_wfs_3d.html b/examples/source_stream_wfs_3d.html index a72a26b49d..a7a0695acd 100644 --- a/examples/source_stream_wfs_3d.html +++ b/examples/source_stream_wfs_3d.html @@ -199,8 +199,8 @@ console.info('Globe initialized'); view.controls.setTilt(45); }); - var d = new debug.Debug(view, menuGlobe.gui); - debug.createTileDebugUI(menuGlobe.gui, view, view.tileLayer, d); + + debug.createTileDebugUI(menuGlobe.gui, view); function picking(event) { if(view.controls.isPaused()) { diff --git a/examples/vector_tile_raster_2d.html b/examples/vector_tile_raster_2d.html index 4132d31c07..dcb770969b 100644 --- a/examples/vector_tile_raster_2d.html +++ b/examples/vector_tile_raster_2d.html @@ -7,10 +7,14 @@ +
+
+ + diff --git a/examples/vector_tile_raster_3d.html b/examples/vector_tile_raster_3d.html index 24cb1fcde8..b4df4b681e 100644 --- a/examples/vector_tile_raster_3d.html +++ b/examples/vector_tile_raster_3d.html @@ -106,10 +106,7 @@ }).catch(console.error); }); - if (view.isDebugMode) { - const d = new debug.Debug(view, menuGlobe.gui); - debug.createTileDebugUI(menuGlobe.gui, view, view.tileLayer, d); - } + debug.createTileDebugUI(menuGlobe.gui, view); diff --git a/examples/view_25d_map.html b/examples/view_25d_map.html index 2f3e19e170..bdf55c5959 100644 --- a/examples/view_25d_map.html +++ b/examples/view_25d_map.html @@ -108,8 +108,7 @@ menuGlobe = new GuiTools('menuDiv', view); menuGlobe.addImageryLayersGUI(view.getLayers(function gui(l) { return l.isColorLayer; })); menuGlobe.addElevationLayerGUI(wmsElevationLayer); - d = new debug.Debug(view, menuGlobe.gui); - debug.createTileDebugUI(menuGlobe.gui, view, view.tileLayer, d); + debug.createTileDebugUI(menuGlobe.gui, view); } diff --git a/examples/view_3d_map.html b/examples/view_3d_map.html index 0f4a66cf2c..b1ee6bf7d5 100644 --- a/examples/view_3d_map.html +++ b/examples/view_3d_map.html @@ -113,6 +113,8 @@ view.controls.addEventListener(itowns.CONTROL_EVENTS.RANGE_CHANGED, () => { updateScaleWidget(); }); + + debug.createTileDebugUI(menuGlobe.gui, view); diff --git a/utils/debug/TileDebug.js b/utils/debug/TileDebug.js index eb2dc3570a..bdd78d9e73 100644 --- a/utils/debug/TileDebug.js +++ b/utils/debug/TileDebug.js @@ -7,6 +7,7 @@ import ObjectRemovalHelper from 'Process/ObjectRemovalHelper'; import TileObjectChart from './charts/TileObjectChart'; import TileVisibilityChart from './charts/TileVisibilityChart'; import GeometryDebug from './GeometryDebug'; +import Debug from './Debug'; import OBBHelper from './OBBHelper'; function applyToNodeFirstMaterial(view, root, layer, cb) { @@ -50,7 +51,12 @@ function selectTileAt(view, mouseOrEvt, showInfo = true) { return selectedNode; } -export default function createTileDebugUI(datDebugTool, view, layer, debugInstance) { +export default function createTileDebugUI(datDebugTool, view, layer, debugInstance, force = false) { + if (!view.isDebugMode && !force) { + return; + } + debugInstance = debugInstance || new Debug(view, datDebugTool); + layer = layer || view.tileLayer; const gui = GeometryDebug.createGeometryDebugUI(datDebugTool, view, layer); const objectChardId = `${layer.id}-nb-objects`;