diff --git a/public/application/img/demo.jpg b/public/application/img/demo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9a160425b323716268474c6bac12bea7ae26ee98 Binary files /dev/null and b/public/application/img/demo.jpg differ diff --git a/public/application/img/iCity_Banner_Logos.webp b/public/application/img/iCity_Banner_Logos.webp new file mode 100644 index 0000000000000000000000000000000000000000..0480da93e887feacb97e38ea629e995359907b48 Binary files /dev/null and b/public/application/img/iCity_Banner_Logos.webp differ diff --git a/public/application/index.html b/public/application/index.html index 5c9c62cbb78d62ef3f6d1c029c5d445f53a5183b..d58ecb1c0bcd4252af2f87eb25a0e31e3edb9638 100644 --- a/public/application/index.html +++ b/public/application/index.html @@ -28,52 +28,9 @@
- -
@@ -83,16 +40,14 @@
- +
Building Shadow
diff --git a/public/application/js/cesium_00_Main.js b/public/application/js/cesium_00_Main.js index 420a75c1de092ea69cd964781ae60376a0eeaec9..2cfd65a18820804146b54844c6ac96be04695471 100644 --- a/public/application/js/cesium_00_Main.js +++ b/public/application/js/cesium_00_Main.js @@ -6,6 +6,47 @@ $(document).ready(function () { // $("#cesiumContainer").css("width", "auto"); // }); }); +var PVPotential_legend_context = ` +PV Potential MWh/year
+ > 30
+ 25 - 30
+ 20 - 25
+ 15 - 20
+ 10 - 15
+ 5 - 10
+ 0 - 5
+
+` +// var PVPotential_legend_context = ` +// PV Potential MW⋅hel
+// >= 8
+// 7 - 8
+// 6 - 7
+// 5 - 6
+// 4 - 5
+// 3 - 4
+// 2 - 3
+// 1 - 2
+// 0 - 1
+//
+// ` +if ($("#PVPotential-legend").length > 0) { + $("#PVPotential-legend").html(PVPotential_legend_context) // Add Bioenergy menu if the "#id" exist +} +var PVSpecificYield_legend_context = ` +PV Specific Yield (kWh/kWp.year)
+ > 1100
+ 1050 - 1100
+ 1000 - 1050
+ 950 - 1000
+ 900 - 950
+ 850 - 900
+ < 850
+
+` +if ($("#PVSpecificYield-legend").length > 0) { + $("#PVSpecificYield-legend").html(PVSpecificYield_legend_context) // Add Bioenergy menu if the "#id" exist +} // set the Cesium ION token Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkZTkyOTcyNC0yMGFkLTQ2ZjktODA5YS0xYjY1N2QwM2Y2ZmMiLCJpZCI6NDM2NDUsImlhdCI6MTYxMjkyNDgwNX0.12Xvbhtt_c2Y2RGA6J_J906Vdn1iOKZKPur0SASh-gk'; @@ -69,37 +110,33 @@ var addBuilding = function () { show: true, color: "color('#ffffff')" }); - building_style["HeatDemand"] = new Cesium.Cesium3DTileStyle({ - pointSize: '3.0', + building_style["PVPotential"] = new Cesium.Cesium3DTileStyle({ show: true, color: { - "conditions" : [ - // ["${Total_Yealy_Heat_DHW_Demand} == 0", "color('#fff')"], - ["${Total_Yealy_Heat_DHW_Demand} === 0", "color('#ffffff',0)"], - - ["${Total_Yealy_Heat_DHW_Demand} < 10937", "color('#bcbddc')"], - ["${Total_Yealy_Heat_DHW_Demand} < 12884", "color('#9e9ac8')"], - ["${Total_Yealy_Heat_DHW_Demand} < 12884", "color('#807dba')"], - ["${Total_Yealy_Heat_DHW_Demand} < 20673", "color('#6a51a3')"], - ["${Total_Yealy_Heat_DHW_Demand} < 22620", "color('#6a51a3')"], - ["${Total_Yealy_Heat_DHW_Demand} < 24568", "color('#54278f')"], - ["true", "color('#3f007d', 0.5)"] + "conditions": [ + ['Number(${PV_potential_yield}) < 5', `color("#FFFFD4")`], + ['Number(${PV_potential_yield}) < 10', `color("#FEE391")`], + ['Number(${PV_potential_yield}) < 15', `color("#FEC44F")`], + ['Number(${PV_potential_yield}) < 20', `color("#FE9929")`], + ['Number(${PV_potential_yield}) < 25', `color("#EC7014")`], + ['Number(${PV_potential_yield}) < 30', `color("#CC4C02")`], + ['Number(${PV_potential_yield}) >= 30', `color("#8C2D04")`], + ["true", "color('#ffffff')"] //no data ] } }); - building_style["PVPotential"] = new Cesium.Cesium3DTileStyle({ - pointSize: '3.0', + building_style["PVSpecificYield"] = new Cesium.Cesium3DTileStyle({ show: true, color: { - "conditions" : [ - ["${PV_Potential_Yield} === 0", "color('#ffffff',0)"], - ["${PV_Potential_Yield} < 5615", "color('#c7e9c0')"], - ["${PV_Potential_Yield} < 6615", "color('#a1d99b')"], - ["${PV_Potential_Yield} < 7615", "color('#74c476')"], - ["${PV_Potential_Yield} < 8615", "color('#41ab5d')"], - ["${PV_Potential_Yield} < 9615", "color('#238b45')"], - ["${PV_Potential_Yield} < 10615", "color('#006d2c')"], - ["true", "color('#00441b', 0.5)"] + "conditions": [ + ['Number(${PV_specific_yield}) < 850', `color("#FFFFD4")`], + ['Number(${PV_specific_yield}) < 900', `color("#FEE391")`], + ['Number(${PV_specific_yield}) < 950', `color("#FEC44F")`], + ['Number(${PV_specific_yield}) < 1000', `color("#FE9929")`], + ['Number(${PV_specific_yield}) < 1050', `color("#EC7014")`], + ['Number(${PV_specific_yield}) < 1100', `color("#CC4C02")`], + ['Number(${PV_specific_yield}) >= 1100 ', `color("#8C2D04")`], + ["true", "color('#ffffff')"] //no data ] } }); @@ -108,7 +145,7 @@ var addBuilding = function () { show: true, color: { "conditions" : [ - ["${Electric_Demand} === 0", "color('#ffffff',0)"], + ["${Electric_Demand} === 0", "color('#ffffff')"], ["${Electric_Demand} < 3229", "color('#feedde')"], ["${Electric_Demand} < 4229", "color('#fdd0a2')"], ["${Electric_Demand} < 5229", "color('#fdae6b')"], diff --git a/public/index.html b/public/index.html index 37cf326982f9dd2a29b181cf039df5bf72fc2962..c0acf9b9e06122429737c45bb90e06b2f72dbf4a 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,8 @@ IQG4iCity + +