update SimStadt results

--> may need some updates for the legend

vcm/config.json

@@ -458,14 +458,14 @@
             "</div><br></div>",
             "<div class='box-3'>",
             "<p>Highlight &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </p><div class='switch'>",
-            "<input type='checkbox' name='toggle' id='chxboxHighlight' onclick='checkboxHighlight();'>",
+            "<input type='checkbox' name='toggle' id='chxboxHighlight' onclick='checkboxHighlight(true);'>",
             "<label for='toggle'><i></i></label>",
             "<span></span>",
             "</div>",
             "</div>",
             "<div class='box-3'>",
             "<p>EnergyDemand</p><div class='switch'>",
-            "<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemand();'>",
+            "<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemand(true);'>",
             "<label for='toggle'><i></i></label>",
             "<span></span>",
             

vcm/datasource-data/Rosenstein/tileset.json

@@ -3,6 +3,10 @@
 		"version" : "0.0"
 	},
 	"properties" : {
+		"Specificspaceheatingdemand" : {
+			"minimum" : 21.9,
+			"maximum" : 35.1
+		},
 		"gml_id" : {},
 		"gml_parent_id" : {},
 		"citygml_target_uri" : {},
@@ -51,7 +55,70 @@
 		"footprint_area" : {},
 		"footprint_area_unit" : {},
 		"gross_floor_area" : {},
-		"gross_floor_area_unit" : {}
+		"gross_floor_area_unit" : {},
+		"_matched_records" : {},
+		"ALKIScode" : {},
+		"AprilHeatingDemand" : {},
+		"AtticHeating" : {},
+		"AugustHeatingDemand" : {},
+		"AverageStoreyHeight" : {},
+		"Basementceilingheightaboveground" : {},
+		"BasementHeating" : {},
+		"BuildingType" : {},
+		"Class" : {},
+		"DecemberHeatingDemand" : {},
+		"Eaves/meanHeight" : {},
+		"FebruaryHeatingDemand" : {},
+		"Footprintarea" : {},
+		"GMLId" : {},
+		"Grossvolume" : {},
+		"Heatedarea" : {},
+		"Heatedvolume" : {},
+		"IsGrossvolumeapproximated?" : {},
+		"JanuaryHeatingDemand" : {},
+		"JulyHeatingDemand" : {},
+		"JuneHeatingDemand" : {},
+		"Latitude" : {},
+		"LOD" : {},
+		"Longitude" : {},
+		"MarchHeatingDemand" : {},
+		"MayHeatingDemand" : {},
+		"MeanUvalue" : {},
+		"NovemberHeatingDemand" : {},
+		"Numberofhouseholds" : {},
+		"Numberofoccupants" : {},
+		"OctoberHeatingDemand" : {},
+		"ParentGMLId" : {},
+		"PrimaryUsageZoneArea" : {},
+		"PrimaryUsageZoneType" : {},
+		"RefurbishmentVariant" : {},
+		"Ridge/meanHeight" : {},
+		"SA2Vratio" : {},
+		"SecondaryUsageZoneArea" : {},
+		"SecondaryUsageZoneType" : {},
+		"SeptemberHeatingDemand" : {
+			"minimum" : 5,
+			"maximum" : 82
+		},
+		"Specificdomestichotwaterdemand" : {
+			"minimum" : 15.8,
+			"maximum" : 15.8
+		},
+		"Storeynumber" : {},
+		"Totaloutwallarea" : {},
+		"Totalroofarea" : {},
+		"Totalsharedwallarea" : {},
+		"Totalwallthermalareaaboveground" : {},
+		"Totalwallthermalareabelowground" : {},
+		"TotalYearlyHeat+DHWdemand" : {},
+		"X-coordinate" : {},
+		"Y-coordinate" : {},
+		"Yearofconstruction" : {},
+		"Yearofrefurbishment" : {},
+		"_zmin" : {
+			"minimum" : 0,
+			"maximum" : 0
+		}
 	},
 	"geometricError" : 67.45996055472642,
 	"root" : {

vcm/datasource-data/Rosenstein2/tileset.json

+{
+	"asset" : {
+		"version" : "0.0"
+	},
+	"properties" : {
+		"gml_id" : {},
+		"gml_parent_id" : {},
+		"citygml_target_uri" : {},
+		"citygml_feature_role" : {},
+		"citygml_feature_role_attr_name" : {},
+		"citygml_feature_role_attr_val" : {},
+		"gml_description" : {},
+		"gml_name" : {},
+		"citygml_creationDate" : {},
+		"citygml_terminationDate" : {},
+		"externalReference{}.externalObject.name" : {},
+		"externalReference{}.externalObject.uri" : {},
+		"externalReference{}.informationSystem" : {},
+		"citygml_generalizes_to{}.xlink_href" : {},
+		"citygml_relative_to_terrain" : {},
+		"citygml_relative_to_water" : {},
+		"citygml_appearance{}.xlink_href" : {},
+		"citygml_class" : {},
+		"citygml_class_codeSpace" : {},
+		"citygml_function{}" : {},
+		"citygml_function{}.codeSpace" : {},
+		"citygml_usage{}" : {},
+		"citygml_usage{}.codeSpace" : {},
+		"citygml_year_of_construction" : {},
+		"citygml_year_of_demolition" : {},
+		"citygml_roof_type" : {},
+		"citygml_roof_type_codeSpace" : {},
+		"citygml_measured_height" : {
+			"minimum" : 12.5,
+			"maximum" : 35
+		},
+		"citygml_measured_height_units" : {},
+		"citygml_storeys_above_ground" : {},
+		"citygml_storeys_below_ground" : {},
+		"citygml_storey_heights_above_ground" : {},
+		"citygml_storey_heights_above_ground_units" : {},
+		"citygml_storey_heights_below_ground" : {},
+		"citygml_storey_heights_below_ground_units" : {},
+		"citygml_outer_building_installation{}.xlink_href" : {},
+		"citygml_interior_building_installation{}.xlink_href" : {},
+		"citygml_bounded_by{}.xlink_href" : {},
+		"citygml_level_of_detail{}" : {},
+		"citygml_interior_room{}.xlink_href" : {},
+		"citygml_consists_of_building_part{}.xlink_href" : {},
+		"citygml_address{}.xlink_href" : {},
+		"footprint_area" : {},
+		"footprint_area_unit" : {},
+		"gross_floor_area" : {},
+		"gross_floor_area_unit" : {}
+	},
+	"geometricError" : 67.45996055472642,
+	"root" : {
+		"boundingVolume" : {
+			"box" : [ 4155348.6786887813, 672943.4777632501, 4775709.619341666, 441.7821512138471, 0, 0, 0, 473.17278632707894, 0, 0, 0, 352.48630644660443 ]
+		},
+		"refine" : "ADD",
+		"content" : {
+			"boundingVolume" : {
+				"box" : [ 4155348.6786887813, 672943.4777632501, 4775709.619341666, 441.7821512138471, 0, 0, 0, 473.17278632707894, 0, 0, 0, 352.48630644660443 ]
+			},
+			"url" : "data/data0.b3dm"
+		}
+	}
+}
\ No newline at end of file

vcm/templates/newDevBahn.js

@@ -19,7 +19,11 @@ function oldZust(){
     layerA.activate(true);
     }}
 
-    checkboxHighlight();
+
+    checkboxHighlight(false);
+    checkboxDemand(false);
+    
+    
   // var layerIndexStockach
   // var layernameStockach = ["Stöckach"]
   // var frameworkZus = vcs.vcm.Framework.getInstance();
@@ -55,7 +59,10 @@ function oldZust(){
     layerA.activate(false);
     }}
 
-    checkboxHighlight();
+    
+    checkboxHighlight(false);
+    checkboxDemand(false);
+
   // var layerIndexStockach
   // var layernameStockach = ["Stöckach"]
   // var frameworkZus = vcs.vcm.Framework.getInstance();
@@ -71,6 +78,44 @@ function oldZust(){
 
   }
 
+  function checkboxHighlight(change){
+    var chk_ceil= document.getElementById("chxboxHighlight");
+    if(chk_ceil.checked == true){
+      if(change==true){
+        document.getElementById("chxboxDemand").checked = false;
+      }
+      highlightStuff();
+    } else {
+      if( document.getElementById("chxboxDemand").checked==false){
+        unhighlightStuff();
+      }
+      // if(change==true){
+      //   document.getElementById("chxboxDemand").checked = false;
+      // }
+      
+    }
+  };
+
+
+
+  function checkboxDemand(change){
+    var chk_ceil= document.getElementById("chxboxDemand");
+    if(chk_ceil.checked == true){
+      if(change==true){
+        document.getElementById("chxboxHighlight").checked = false;
+      }
+      highlightEnergy();
+    } else {
+      if(document.getElementById("chxboxHighlight").checked == false){
+        unhighlightStuff();
+      }
+      // if(change==true){
+      //   document.getElementById("chxboxHighlight").checked = false;
+      // }
+      
+    }
+  };
+
   function highlightStuff() {
     var layerIndexStockach
     var layernameStockach = ["Stöckach"]
@@ -213,25 +258,7 @@ function oldZust(){
 
 
 
-  function checkboxHighlight(){
-    var chk_ceil= document.getElementById("chxboxHighlight");
-    if(chk_ceil.checked == true){
-      highlightStuff();
-    } else {
-      unhighlightStuff();
-    }
-  };
-
-
 
-  function checkboxDemand(){
-    var chk_ceil= document.getElementById("chxboxDemand");
-    if(chk_ceil.checked == true){
-      highlightEnergy();
-    } else {
-      unhighlightStuff();
-    }
-  };
 
 
   function highlightEnergy() {
@@ -254,7 +281,12 @@ function oldZust(){
       tileset.style = new Cesium.Cesium3DTileStyle({
         color: {
           conditions: [
-              ["true", "color('#77a1b9')"],
+            ["(${Specificspaceheatingdemand} > 0)  && (${Specificspaceheatingdemand} < 100)", "color('#38943d')"],
+            ["(${Specificspaceheatingdemand} >= 100)  && (${Specificspaceheatingdemand} < 200)", "color('#699438')"],
+            ["(${Specificspaceheatingdemand} >= 200)  && (${Specificspaceheatingdemand} < 300)", "color('#d0d40b')"],
+            ["(${Specificspaceheatingdemand} >= 300)  && (${Specificspaceheatingdemand} < 400)", "color('#db6f09')"],
+            ["(${Specificspaceheatingdemand} >= 400)  && (${Specificspaceheatingdemand} < 500)", "color('#ad0202')"],
+            ["true", "color('#77a1b9')"],
           ],
         },
       });