From a4a25209bb815283ccdbf5fede57ccd13d86e40c Mon Sep 17 00:00:00 2001 From: JOE XMG <thunyathep.s@outlook.com> Date: Mon, 22 Aug 2022 19:44:29 +0200 Subject: [PATCH] update --- public/dashboard/assets/js/cesium_00_Main.js | 30 ++++++++++---------- public/dashboard/index.html | 5 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/public/dashboard/assets/js/cesium_00_Main.js b/public/dashboard/assets/js/cesium_00_Main.js index 63322b9..0931d5a 100644 --- a/public/dashboard/assets/js/cesium_00_Main.js +++ b/public/dashboard/assets/js/cesium_00_Main.js @@ -52,7 +52,7 @@ if ($("#PVSpecificYield-legend").length > 0) { Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkZTkyOTcyNC0yMGFkLTQ2ZjktODA5YS0xYjY1N2QwM2Y2ZmMiLCJpZCI6NDM2NDUsImlhdCI6MTYxMjkyNDgwNX0.12Xvbhtt_c2Y2RGA6J_J906Vdn1iOKZKPur0SASh-gk'; var viewer = new Cesium.Viewer('cesiumContainer', { terrainProvider: Cesium.createWorldTerrain(), - baseLayerPicker: false, + baseLayerPicker: true, vrButton: false, geocoder: true, navigationHelpButton: false, @@ -63,21 +63,21 @@ var viewer = new Cesium.Viewer('cesiumContainer', { homeButton: false, fullscreenButton: true, infoBox: true, - imageryProvider: new Cesium.MapboxStyleImageryProvider({ - // check style ID at https://docs.mapbox.com/api/maps/styles/ - // styleId: 'dark-v10', - styleId: 'light-v10', - // styleId: 'navigation-day-v1', - accessToken: 'pk.eyJ1IjoidGh1bnlhdGhlcCIsImEiOiJjamFpOWV4a2gxd21vMndxdXd2M3VoY3hmIn0.jLlCscei0yH-ZHwcfxF_ug' - }) + // imageryProvider: new Cesium.MapboxStyleImageryProvider({ + // // check style ID at https://docs.mapbox.com/api/maps/styles/ + // // styleId: 'dark-v10', + // styleId: 'light-v10', + // // styleId: 'navigation-day-v1', + // accessToken: 'pk.eyJ1IjoidGh1bnlhdGhlcCIsImEiOiJjamFpOWV4a2gxd21vMndxdXd2M3VoY3hmIn0.jLlCscei0yH-ZHwcfxF_ug' + // }) // terrainExaggeration: 1.5, }); -var tileset = viewer.scene.primitives.add( - new Cesium.Cesium3DTileset({ - url: Cesium.IonResource.fromAssetId(75343), - }) -); +// var tileset = viewer.scene.primitives.add( +// new Cesium.Cesium3DTileset({ +// url: Cesium.IonResource.fromAssetId(75343), +// }) +// ); viewer.camera.setView({ "destination": { @@ -263,8 +263,8 @@ var addBuilding = function () { } }); - // tileset_3Dbuildings.style = building_style["AllWhite"]; - tileset_3Dbuildings.style = building_style["height"]; + tileset_3Dbuildings.style = building_style["AllWhite"]; + // tileset_3Dbuildings.style = building_style["height"]; }; addBuilding(); diff --git a/public/dashboard/index.html b/public/dashboard/index.html index 6520541..19fc83b 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -134,8 +134,9 @@ <select class="form-select" id="BuildingStyleSelector"> <option value="AllWhite" selected>Default</option> <option value="transparent">Transparent</option> - <option value="PVPotential">PV Potential</option> - <option value="PVSpecificYield">PV Specific Yield</option> + <option value="height">Building Height</option> + <!-- <option value="PVPotential">PV Potential</option> + <option value="PVSpecificYield">PV Specific Yield</option> --> </select> <div class="form-check pt-2"> <input class="form-check-input" type="checkbox" value="" id="shadow_check"> -- GitLab