diff --git a/public/HFT.html b/public/HFT.html index ae3427ed3c6ec8b0ec86fb773d6e6f037cbb8813..1d28297b7f36d2ef1bd2b66c22a7391eec06d6d7 100644 --- a/public/HFT.html +++ b/public/HFT.html @@ -58,6 +58,8 @@ <div class="backdrop mainbackdrop" id="DCMO" style="display:show"> <h2> Layer selection </h2> + <div class="backdrop mainbackdrop"> + <h3> Pointclouds </h3> <table> <tbody> <tr> @@ -76,25 +78,36 @@ </label> </td> </tr> + </tbody> + </table> + </div> + + <div class="backdrop mainbackdrop"> + <h3>Building models </h3> +<table> +<tbody> + <tr> - <td style=" padding-bottom: 10px;"><strong>Buildings </strong> </td> + <td style=" padding-bottom: 10px;"><strong>LOD1 Buildings </strong> </td> <td style=" padding-bottom: 10px; padding-left: 15px;"><label class="switch"> - <input type="checkbox" onclick="toggleBuildingTiles()" checked> + <input id="simpleBuildingsCheckbox" type="checkbox" onclick="toggleBuildingTiles()" unchecked> <span class="slider round"></span> </label> </td> </tr> </tr> <tr> - <td style=" padding-bottom: 10px;"><strong>Pretty Buildings </strong> </td> + <td style=" padding-bottom: 10px;"><strong>LOD3 Buildings </strong> </td> <td style=" padding-bottom: 10px; padding-left: 15px;"><label class="switch"> - <input type="checkbox" onclick="togglePrettyBuildingTiles()" checked> + <input id="prettyBuildingsCheckbox" type="checkbox" onclick="togglePrettyBuildingTiles()" checked> <span class="slider round"></span> </label> </td> </tr> - </tbody> - </table> + </tbody> + </table> + + </div> </div> diff --git a/public/HFT.js b/public/HFT.js index 2ac13d9ca1a1649b5c0be4f0b28f08f5303a439a..01ed0b524084eadc2ebfe420d024c5c0eacb668f 100644 --- a/public/HFT.js +++ b/public/HFT.js @@ -117,6 +117,7 @@ var zoomAll = function (tileset) { return zoomAll(tileset); // zoom or rather go to the translated tileset }); + tileset.show = false; //////////////////////////////////////////////////////////////////////////////////// @@ -199,11 +200,32 @@ var toggleRGBPC = function () { } var toggleBuildingTiles = function () { - tileset.show = tileset.show ? false : true; + if (tileset.show === true) { + tileset.show = false + } + else { + tileset.show = true + if (tilesetLOD1.show === true){ + $('#prettyBuildingsCheckbox').prop('checked', false); + tilesetLOD1.show = false + } + } } var togglePrettyBuildingTiles = function () { - tilesetLOD1.show = tilesetLOD1.show ? false : true; + // tilesetLOD1.show = tilesetLOD1.show ? false : true; + if (tilesetLOD1.show === true) { + tilesetLOD1.show = false + } + else { + tilesetLOD1.show = true + if (tileset.show === true){ + $('#simpleBuildingsCheckbox').prop('checked', false); + tileset.show = false + } + } + // $('#prettyBuildingsCheckbox').prop('checked', true); // Checks it +//$('#myCheckbox').prop('checked', false); // Unchecks it }