Commit 8c181b3c authored by Patrick's avatar Patrick
Browse files

Update Tiles

parent ec76ac4c
...@@ -847,7 +847,7 @@ ...@@ -847,7 +847,7 @@
"url": "./datasource-data/f02945f6-7978-4abc-940b-4c47af169b12/tileset.json", "url": "./datasource-data/f02945f6-7978-4abc-940b-4c47af169b12/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings", "type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "zECwoSwXppPMrqfbt", "datasourceId": "zECwoSwXppPMrqfbt",
"activeOnStartup": true, "activeOnStartup": false,
"exclusive": false, "exclusive": false,
"allowPicking": true, "allowPicking": true,
"screenSpaceError": 16, "screenSpaceError": 16,
...@@ -879,7 +879,7 @@ ...@@ -879,7 +879,7 @@
"url": "./datasource-data/Stuttgart/tileset.json", "url": "./datasource-data/Stuttgart/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings", "type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "zECwoSwXppPMrqfLoc", "datasourceId": "zECwoSwXppPMrqfLoc",
"activeOnStartup": false, "activeOnStartup": true,
"exclusive": false, "exclusive": false,
"allowPicking": true, "allowPicking": true,
"screenSpaceError": 16, "screenSpaceError": 16,
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
"url": "./datasource-data/Stockach/tileset.json", "url": "./datasource-data/Stockach/tileset.json",
"type": "vcs.vcm.layer.cesium.Buildings", "type": "vcs.vcm.layer.cesium.Buildings",
"datasourceId": "orpdK9eKzTLaDmYC9", "datasourceId": "orpdK9eKzTLaDmYC9",
"activeOnStartup": true, "activeOnStartup": false,
"exclusive": false, "exclusive": false,
"allowPicking": true, "allowPicking": true,
"screenSpaceError": 16, "screenSpaceError": 16,
...@@ -983,6 +983,48 @@ ...@@ -983,6 +983,48 @@
}, },
"featureInfo": null, "featureInfo": null,
"opacity": "" "opacity": ""
},{
"name": "B",
"url": "./templates/AreaB.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},{
"name": "C1",
"url": "./templates/AreaC1.geojson",
"type": "vcs.vcm.layer.GeoJSON",
"datasourceId": "...",
"activeOnStartup": false,
"exclusive": false,
"projection": {
"epsg": "4326",
"proj4": ""
},
"altitudeMode": "relativeToGround",
"style": {
"image": {
"icon": {
"src": "",
"scale": 0.5
}
}
},
"heightAboveGround": 0
},{ },{
"name": "ProjektOne", "name": "ProjektOne",
"url": "./templates/ProjektOne.geojson", "url": "./templates/ProjektOne.geojson",
......
{"id": "ugLFnuu9ThYTEZWks", "type": "FeatureCollection", "features":[{"state":"dynamic","layerId":"ugLFnuu9ThYTEZWks","featureType":"simple","type":"Feature","geometry":{"type":"Polygon","coordinates":[[[9.193560687451232,48.80277144741456,-0.043338399870612006],[9.192306167803343,48.80223106552256,-0.017355614048707894],[9.19302430225468,48.80189676872146,-0.02346769343046631],[9.193866491909562,48.8012221682782,-0.02300783850795337],[9.194651121626315,48.80043351535028,-0.02342050694613137],[9.195019603391751,48.79971509372575,-0.015720272847753677],[9.19514689354882,48.79890431024381,-0.015340059653179677],[9.194996095198073,48.79758938648047,-0.01756365394907193],[9.19472889616915,48.79639041046019,-0.01464997709591272],[9.1943598699936,48.79525910042426,-0.01623923969003077],[9.193781838791896,48.79413682617195,-0.01247527461338765],[9.192975839383053,48.793171178514115,-0.01293973029077101],[9.191810357800234,48.79240766880122,-0.012879374839076065],[9.190768184852653,48.79189401947917,-0.014276489936623346],[9.189542112232143,48.791272610110525,-0.01752942714510332],[9.188041243116984,48.79059426766679,-0.017485295680481027],[9.189125337570076,48.789892580612104,-0.01778128545269888],[9.190393676147307,48.79051732636549,-0.017370610869777547],[9.191309927733743,48.791010670661734,-0.012274734130510796],[9.192113355676533,48.79152447900705,-0.01732442806591012],[9.193101843562108,48.79214754282975,-0.013212558912718445],[9.194143543705861,48.792834205504136,-0.012904794693570403],[9.195209752280887,48.79345323283269,-0.017534406282655218],[9.195919054306145,48.793919340154616,-0.017662635384810825],[9.196723028772757,48.794406422242275,-0.017266113405788232],[9.197634692503165,48.79499777226195,-0.0144605981977541],[9.198427099366086,48.79552376292895,-0.01443458458442979],[9.199371919865063,48.79613729242587,-0.014587197799349104],[9.200161041531338,48.796617314755764,-0.014711444591421697],[9.201415756985508,48.79739399765893,-0.014524423407042674],[9.202085713729785,48.797759119814685,-0.013177174169335143],[9.202648683520614,48.79801660955562,-0.012678443580230578],[9.203688589589536,48.79838233041315,-0.012891033392638656],[9.203888177618719,48.798572043108976,-0.012828774126077755],[9.204057633974635,48.79893313989422,-0.02867784000014127],[9.199294376579628,48.80132910230088,-0.023982722544252127],[9.193560687451232,48.80277144741456,-0.043338399870612006]]]},"properties":{},"vcsMeta":{"style":{"type":"vector","fill":{"color":[255,0,0,0.27]},"stroke":{"color":[255,0,0,0.27],"width":1.25,"lineDash":null}}},"id":"yzDYBjDvXX5fXfYPKiMtdBqY"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround","style":{"type":"vector","fill":{"color":[255,0,0,0.25]},"stroke":{"color":[255,0,0,0.25],"width":1.25,"lineDash":null},"text":{"font":"bold 18px sans-serif","fill":{"color":[51,51,51,1]},"textBaseline":"bottom","offsetY":-15,"offsetX":0},"image":{"scale":1,"fill":{"color":[255,0,0,0.25]},"radius":5,"stroke":{"color":[0,0,0,1],"width":1,"lineDash":null}}}}}
\ No newline at end of file
{"id": "rDEamsSKMnTCXXPaT", "type": "FeatureCollection", "features":[{"state":"dynamic","layerId":"rDEamsSKMnTCXXPaT","featureType":"simple","type":"Feature","geometry":{"type":"Polygon","coordinates":[[[9.182896679235178,48.79842459288875,-0.012682950450465438],[9.18467954507435,48.79943050293065,-0.03492326961695598],[9.18467954507435,48.79943050293065,-0.03492326961695598],[9.186139359288378,48.80053605355934,-0.023269838863461224],[9.1871173754024,48.79999630320762,-0.022939602446509364],[9.185459862014556,48.79856357586374,-0.018986962677174216],[9.185644179487529,48.79854925353402,-0.02490989642289116],[9.186703180603123,48.798461966023694,-0.012819347669840823],[9.186648320954859,48.7982174925921,-0.012654723150237046],[9.188045759291278,48.79762537009907,-0.01257767672469614],[9.18855620931668,48.79719334091001,-0.012750186680850636],[9.18899328406098,48.79675386003612,-0.013983836353367146],[9.189007351737578,48.797321151866186,-0.013624554206485857],[9.189420861643196,48.79733171379678,-0.01386726787625814],[9.189436931496571,48.79784710313129,-0.013529897301903739],[9.189448713962772,48.79896760776313,-0.014692639019859127],[9.18942181488256,48.79982735406179,-0.014380437148869999],[9.18934810388418,48.80044007849855,-0.023361233538074056],[9.18904702359251,48.801306353560136,-0.022216664410832174],[9.188742948613594,48.80217981190111,-0.01624169584492402],[9.185974839051545,48.80222934965096,-0.023375917685750914],[9.185942832935922,48.80184260276732,-0.03490045428094396],[9.185787393594913,48.80132578209472,-0.034607145358189186],[9.185570377651958,48.80084876439793,-0.0185875279184783],[9.18520006091183,48.80046718752811,-0.024308562060381504],[9.184595957890831,48.79993258417943,-0.033836495234693315],[9.183836205388948,48.79928845988542,-0.034868646385841154],[9.182897284696624,48.798796698411195,-0.01310922672858972],[9.182896679235178,48.79842459288875,-0.012682950450465438]]]},"properties":{},"vcsMeta":{},"id":"xrnpDfMhaMuwse8oGAC7AMk2"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround","style":{"type":"vector","fill":{"color":[255,0,0,0.27]},"stroke":{"color":[255,0,0,0.27],"width":1.25,"lineDash":null},"text":{"font":"bold 18px sans-serif","fill":{"color":[51,51,51,1]},"textBaseline":"bottom","offsetY":-15,"offsetX":0},"image":{"scale":1,"fill":{"color":[255,0,0,0.25]},"radius":5,"stroke":{"color":[0,0,0,1],"width":1,"lineDash":null}}}}}
\ No newline at end of file
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
// // document.body.style.msTransform = scale; // IE 9 // // document.body.style.msTransform = scale; // IE 9
// // document.body.style.transform = scale; // General // // document.body.style.transform = scale; // General
$("#tour-button").hide(); $("#tour-button").hide();
removebuildings();
}; };
...@@ -233,5 +234,5 @@ function NordbahnhofText() { ...@@ -233,5 +234,5 @@ function NordbahnhofText() {
document.getElementById("NordbahnhofInfo").style.display = "block"; document.getElementById("NordbahnhofInfo").style.display = "block";
showTour(); showTour();
showgraph(); showgraph();
} }
\ No newline at end of file
...@@ -3,6 +3,107 @@ var heatdemVal02 = 200 ...@@ -3,6 +3,107 @@ var heatdemVal02 = 200
var heatdemVal03 = 300 var heatdemVal03 = 300
var heatdemVal04 = 400 var heatdemVal04 = 400
function removebuildings() {
var layerIndexStuttgartTotal
var layerIndexStuttgartBahnhof
var layernameStuttgartTotal = ["StuttgartLocal"]
var layernameStuttgartBahnhof = ["StuttgartPart"]
var frameworkSTU = vcs.vcm.Framework.getInstance();
var layersSTU = frameworkSTU.getLayers();
for (var i = 0; i< layersSTU.length; i++) {
var layerst = layersSTU[i];
if(layernameStuttgartTotal.indexOf(layerst.getName()) >= 0) {
layerIndexStuttgartTotal = i
}}
for (var i = 0; i< layersSTU.length; i++) {
var layerst = layersSTU[i];
if(layernameStuttgartBahnhof.indexOf(layerst.getName()) >= 0) {
layerIndexStuttgartBahnhof = i
}}
var layerBAHN = layersSTU[layerIndexStuttgartBahnhof];
var layerSTU = layersSTU[layerIndexStuttgartTotal];
var tilesetSTU = layerSTU.getCesium3DTileset();
var tilesetBAHN = layerBAHN.getCesium3DTileset();
if( tilesetSTU ) {
tilesetSTU.style = new Cesium.Cesium3DTileStyle({
color: {
conditions: [
["regExp('DEBW522AA0000ee8d').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000c4d8').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000c4d6').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000c4d7').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0002bef8').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0003afbd').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0004327e').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA000345f7').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000d2c3').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00001bf2').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00013824').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00013825').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00001bf3').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001fc97').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00037c31').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0002bef9').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00014e93').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00042cff').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00033a36').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00033d46').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00038caf').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA000183c1').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00006db1').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0002bab2').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00021f4a').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001f8b2').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00013b9e').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001f8b2').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00022dcd').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00041629').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00038b0e').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0003bf3c').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00022bdd').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00001d01').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000976b').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001374b').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001fc98').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000c4d4').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000c4d5').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00026ca1').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00023f8f').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA000014c4').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA000426e5').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0001566f').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000db38').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA0000ef56').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00027ddb').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA000039fd').test(${gml_id})","color('#38943d','0')"],
// ["(${gml_id} === 'DEBW522AA0000ee8d')", "color('#38943d','0.5')"],
// ["(${gml_parent_id} === 'DEBW522AA0000ee8c')", "color('#38943d','0.5')"],
["true", "color('#FFFFFF')"],
],
},
});
}
if( tilesetBAHN ) {
tilesetBAHN.style = new Cesium.Cesium3DTileStyle({
color: {
conditions: [
["regExp('DEBW522AA0001fd8a').test(${gml_id})","color('#38943d','0')"],
["regExp('DEBW522AA00016448').test(${gml_id})","color('#38943d','0')"],
["true", "color('#FFFFFF')"],
],
},
});
}
};
function oldZust(){ function oldZust(){
...@@ -99,6 +200,7 @@ function oldZust(){ ...@@ -99,6 +200,7 @@ function oldZust(){
// } // }
} }
}; };
...@@ -132,7 +234,21 @@ function oldZust(){ ...@@ -132,7 +234,21 @@ function oldZust(){
layerIndexStockach = i layerIndexStockach = i
}} }}
highlightBuildings(layerIndexStockach,["DEBW522AA00022dcc", "DEBW522AA0003bf3b","DEBW522AA0000976a","DEBW522AA00001d00"]); highlightBuildings(layerIndexStockach,["DEBW522AA00022dcc", "DEBW522AA0003bf3b","DEBW522AA0000976a","DEBW522AA00001d00"]);
var layerNamesToActivate = ["C1"]
var layerNamesToActivate2 = ["B"]
var layers = framework.getLayers();
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layerNamesToActivate.indexOf(layer.getName()) >= 0) {
layer.activate(true);
}
if(layerNamesToActivate2.indexOf(layer.getName()) >= 0) {
layer.activate(true);
}
} }
}
function highlightBuildings(layerIndex, id){ function highlightBuildings(layerIndex, id){
...@@ -259,6 +375,20 @@ function oldZust(){ ...@@ -259,6 +375,20 @@ function oldZust(){
// ], // ],
// }, // },
// }); // });
var layerNamesToActivate = ["C1"]
var layerNamesToActivate2 = ["B"]
var layerss = framework.getLayers();
for (var i = 0; i< layerss.length; i++) {
var layero = layerss[i];
if(layerNamesToActivate.indexOf(layero.getName()) >= 0) {
layero.activate(false);
}
if(layerNamesToActivate2.indexOf(layero.getName()) >= 0) {
layero.activate(false);
}
}
} }
......
...@@ -33,6 +33,9 @@ unconstrainedSlider.noUiSlider.on('update', function (values) { ...@@ -33,6 +33,9 @@ unconstrainedSlider.noUiSlider.on('update', function (values) {
value05html.innerHTML = values[3] + " - max"; value05html.innerHTML = values[3] + " - max";
var chk_ceil= document.getElementById("chxboxDemand"); var chk_ceil= document.getElementById("chxboxDemand");
if (typeof chk_ceil === 'undefined'|| chk_ceil === null) {
// the variable is defined
}else{
if(chk_ceil.checked == true){ if(chk_ceil.checked == true){
heatdemVal01 = values[0]; heatdemVal01 = values[0];
...@@ -42,8 +45,7 @@ unconstrainedSlider.noUiSlider.on('update', function (values) { ...@@ -42,8 +45,7 @@ unconstrainedSlider.noUiSlider.on('update', function (values) {
highlightEnergy(); highlightEnergy();
} }}
}); });
// var testingslider = document.getElementById('slider-color'); // var testingslider = document.getElementById('slider-color');
......
Markdown is supported
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