diff --git a/vcm/datasource-data/Rosenstein/data/data0.b3dm b/vcm/datasource-data/Rosenstein/data/data0.b3dm
index ffecf5529f6166c88e5448aa17ea0f8ffa02db52..7d968cdc720f1521418e4ef9d3d3451d6206796c 100644
Binary files a/vcm/datasource-data/Rosenstein/data/data0.b3dm and b/vcm/datasource-data/Rosenstein/data/data0.b3dm differ
diff --git a/vcm/datasource-data/Rosenstein/tileset.json b/vcm/datasource-data/Rosenstein/tileset.json
index 5139d57e9e4685c0977b2da7f9aa2763b6782888..5ee786bb97a873e0ce67e883efca144ebfa12ce8 100644
--- a/vcm/datasource-data/Rosenstein/tileset.json
+++ b/vcm/datasource-data/Rosenstein/tileset.json
@@ -1,12 +1,8 @@
{
"asset" : {
- "version" : "0.0"
+ "version" : "1.0"
},
"properties" : {
- "Specificspaceheatingdemand" : {
- "minimum" : 21.9,
- "maximum" : 35.1
- },
"gml_id" : {},
"gml_parent_id" : {},
"citygml_target_uri" : {},
@@ -34,10 +30,7 @@
"citygml_year_of_demolition" : {},
"citygml_roof_type" : {},
"citygml_roof_type_codeSpace" : {},
- "citygml_measured_height" : {
- "minimum" : 12.5,
- "maximum" : 35
- },
+ "citygml_measured_height" : {},
"citygml_measured_height_units" : {},
"citygml_storeys_above_ground" : {},
"citygml_storeys_below_ground" : {},
@@ -52,11 +45,7 @@
"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" : {},
- "_matched_records" : {},
+ "comment" : {},
"ALKIScode" : {},
"AprilHeatingDemand" : {},
"AtticHeating" : {},
@@ -69,7 +58,7 @@
"DecemberHeatingDemand" : {},
"Eaves/meanHeight" : {},
"FebruaryHeatingDemand" : {},
- "Footprintarea" : {},
+ "footprint_area" : {},
"GMLId" : {},
"Grossvolume" : {},
"Heatedarea" : {},
@@ -78,15 +67,11 @@
"JanuaryHeatingDemand" : {},
"JulyHeatingDemand" : {},
"JuneHeatingDemand" : {},
- "Latitude" : {},
"LOD" : {},
- "Longitude" : {},
"MarchHeatingDemand" : {},
"MayHeatingDemand" : {},
- "MeanUvalue" : {},
+ "meanUvalue" : {},
"NovemberHeatingDemand" : {},
- "Numberofhouseholds" : {},
- "Numberofoccupants" : {},
"OctoberHeatingDemand" : {},
"ParentGMLId" : {},
"PrimaryUsageZoneArea" : {},
@@ -96,13 +81,14 @@
"SA2Vratio" : {},
"SecondaryUsageZoneArea" : {},
"SecondaryUsageZoneType" : {},
- "SeptemberHeatingDemand" : {
- "minimum" : 5,
- "maximum" : 82
- },
+ "SeptemberHeatingDemand" : {},
"Specificdomestichotwaterdemand" : {
- "minimum" : 15.8,
- "maximum" : 15.8
+ "minimum" : 14.6,
+ "maximum" : 48.7
+ },
+ "Specificspaceheatingdemand" : {
+ "minimum" : 23.9,
+ "maximum" : 66.5
},
"Storeynumber" : {},
"Totaloutwallarea" : {},
@@ -110,27 +96,26 @@
"Totalsharedwallarea" : {},
"Totalwallthermalareaaboveground" : {},
"Totalwallthermalareabelowground" : {},
- "TotalYearlyHeat+DHWdemand" : {},
+ "TotalYearlyHeatdemand" : {},
"X-coordinate" : {},
"Y-coordinate" : {},
- "Yearofconstruction" : {},
- "Yearofrefurbishment" : {},
- "_zmin" : {
- "minimum" : 0,
- "maximum" : 0
+ "yearOfConstruction" : {},
+ "_matched_records" : {
+ "minimum" : 1,
+ "maximum" : 1
}
},
- "geometricError" : 67.45996055472642,
+ "geometricError" : 149.09593290500774,
"root" : {
"boundingVolume" : {
- "box" : [ 4155348.6786887813, 672943.4777632501, 4775709.619341666, 441.7821512138471, 0, 0, 0, 473.17278632707894, 0, 0, 0, 352.48630644660443 ]
+ "region" : [ 0.16047723773872946, 0.8516152536487657, 0.16059797452417157, 0.8517428811004639, -3.372691571712494e-5, 47.31063522212207 ]
},
"refine" : "ADD",
"content" : {
"boundingVolume" : {
- "box" : [ 4155348.6786887813, 672943.4777632501, 4775709.619341666, 441.7821512138471, 0, 0, 0, 473.17278632707894, 0, 0, 0, 352.48630644660443 ]
+ "region" : [ 0.16047723773872946, 0.8516152536487657, 0.16059797452417157, 0.8517428811004639, -3.372691571712494e-5, 47.31063522212207 ]
},
- "url" : "data/data0.b3dm"
+ "uri" : "data/data0.b3dm"
}
}
}
\ No newline at end of file
diff --git a/vcm/datasource-data/Rosenstein_old/data/data0.b3dm b/vcm/datasource-data/Rosenstein_old/data/data0.b3dm
new file mode 100644
index 0000000000000000000000000000000000000000..ffecf5529f6166c88e5448aa17ea0f8ffa02db52
Binary files /dev/null and b/vcm/datasource-data/Rosenstein_old/data/data0.b3dm differ
diff --git a/vcm/datasource-data/Rosenstein_old/tileset.json b/vcm/datasource-data/Rosenstein_old/tileset.json
new file mode 100644
index 0000000000000000000000000000000000000000..5139d57e9e4685c0977b2da7f9aa2763b6782888
--- /dev/null
+++ b/vcm/datasource-data/Rosenstein_old/tileset.json
@@ -0,0 +1,136 @@
+{
+ "asset" : {
+ "version" : "0.0"
+ },
+ "properties" : {
+ "Specificspaceheatingdemand" : {
+ "minimum" : 21.9,
+ "maximum" : 35.1
+ },
+ "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" : {},
+ "_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" : {
+ "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
diff --git a/vcm/js/history.js b/vcm/js/history.js
index 5c7f5ec3caf807fb3a53c13936fdcf4e865c4c17..61e874656e423309cee20d0708db7347e20a7609 100644
--- a/vcm/js/history.js
+++ b/vcm/js/history.js
@@ -48,30 +48,30 @@ function activateStoryFrame(pageN) {
// TEST 02
function historyInfo() {
- history.pushState({ id: 2 }, "Info page", "./info");
+ history.pushState({ id: 2 }, "Info page", "./");
}
function historyProjekt() {
- history.pushState({ id: 3 }, "Project page", "./project");
+ history.pushState({ id: 3 }, "Project page", "./");
}
function historyToolbox() {
- history.pushState({ id: 4 }, "Info page", "./toolbox");
+ history.pushState({ id: 4 }, "Info page", "./");
}
function historyNordb() {
- history.pushState({ id: 5 }, "Info page", "./nordb");
+ history.pushState({ id: 5 }, "Info page", "./");
}
function historyRosen() {
- history.pushState({ id: 7 }, "Info page", "./rosen");
+ history.pushState({ id: 7 }, "Info page", "./");
}
function historyBock() {
- history.pushState({ id: 6 }, "Info page", "./bock");
+ history.pushState({ id: 6 }, "Info page", "./");
}
-history.replaceState({ id: 1 }, "Default page", "./start");
+history.replaceState({ id: 1 }, "Default page", "./");
window.addEventListener("popstate", (e) => {
if (e.state != null && e.state !== undefined) {