Commit c2e4b4ef authored by Patrick's avatar Patrick
Browse files

Test update +

Update wärmebedarf
parent cb4149b8
...@@ -1692,27 +1692,6 @@ ...@@ -1692,27 +1692,6 @@
} }
}, },
"heightAboveGround": 0 "heightAboveGround": 0
},{
"name": "NoiseLocation29212",
"url": "./datasource-data/NoiseData/NoisePoint29212.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "./datasource-data/NoiseData/noise.png",
"scale": 1
}
}
},
"heightAboveGround": 0
},{ },{
"name": "NoiseLocation53627", "name": "NoiseLocation53627",
"url": "./datasource-data/NoiseData/NoisePoint53627.geojson", "url": "./datasource-data/NoiseData/NoisePoint53627.geojson",
......
{"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.15884470936,48.77543604444,-0.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}} {"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.15884470936,48.77543604444,20.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}}
\ No newline at end of file \ No newline at end of file
{"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.178,48.770,-0.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}} {"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.178,48.770,20.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}}
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
...@@ -730,7 +730,7 @@ function buildingSeeThroughfalse(set){ ...@@ -730,7 +730,7 @@ function buildingSeeThroughfalse(set){
} }
// console.log("") // console.log("")
removebuildings();
clearInterval(timeout); clearInterval(timeout);
}, 1000); }, 1000);
......
...@@ -163,7 +163,7 @@ function addcont(content){ ...@@ -163,7 +163,7 @@ function addcont(content){
"</div>"+ "</div>"+
"</div>"+ "</div>"+
"<div onclick='document.getElementById('chxboxDemand').click()' class='box-3'>"+ "<div onclick='document.getElementById('chxboxDemand').click()' class='box-3'>"+
"<p>EnergyDemand</p><div class='switch'>"+ "<p>Wärmebedarf &nbsp;</p><div class='switch'>"+
"<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemand(true);'>"+ "<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemand(true);'>"+
"<label for='toggle'><i></i></label>"+ "<label for='toggle'><i></i></label>"+
"<span></span>"+ "<span></span>"+
......
...@@ -125,6 +125,8 @@ function mouseOut2() { ...@@ -125,6 +125,8 @@ function mouseOut2() {
console.log("StuffEnded") console.log("StuffEnded")
vcs.vcm.Framework.getInstance().unsubscribeByKey(subscription); vcs.vcm.Framework.getInstance().unsubscribeByKey(subscription);
} }
});
var subscription2 = vcs.vcm.Framework.getInstance().subscribe("LAYER_ACTIVATED", function(layer) {
if(layer.name === "Streetnight") { if(layer.name === "Streetnight") {
layer.cesium3DTileset.readyPromise.then(function(tileset) { layer.cesium3DTileset.readyPromise.then(function(tileset) {
var boundingSphere = tileset.boundingSphere; var boundingSphere = tileset.boundingSphere;
...@@ -134,7 +136,7 @@ function mouseOut2() { ...@@ -134,7 +136,7 @@ function mouseOut2() {
var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3()); var translation = Cesium.Cartesian3.subtract(offset, surface, new Cesium.Cartesian3());
tileset.modelMatrix = Cesium.Matrix4.fromTranslation(translation); tileset.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
}); });
vcs.vcm.Framework.getInstance().unsubscribeByKey(subscription); vcs.vcm.Framework.getInstance().unsubscribeByKey(subscription2);
} }
}); });
......
...@@ -492,7 +492,7 @@ function oldZust(){ ...@@ -492,7 +492,7 @@ function oldZust(){
curve: 'straight' curve: 'straight'
}, },
title: { title: {
text: 'Heating Demand by Month', text: 'Wärmebedarf pro Monat',
align: 'left' align: 'left'
}, },
grid: { grid: {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment