diff --git a/vcm/Restricted/index.html b/vcm/Restricted/index.html
index e0caaee8fb2ce609748efbce2e520375f81ed79c..4d6a50f20433d8d1228e136a9acaf1ff10084811 100644
--- a/vcm/Restricted/index.html
+++ b/vcm/Restricted/index.html
@@ -164,7 +164,7 @@
<div class="title-box vcm_copyright_headerTitle"></div>
<!-- Drop down menu starts here -->
<div class="dropdown hidden" style="float: right; right:20px">
- <i class="fa fa-bars" id="dropdownMenu" style="font-size:1.8rem;color: antiquewhite; margin-top:1rem;"></i>
+ <i class="fa fa-bars" id="dropdownMenu" style="font-size:1.8rem;color: white !important; margin-top:1rem;"></i>
<div class="dropdown-content">
<button class="accordion">Partizipation</button>
<div class="sub-menu">
@@ -174,6 +174,9 @@
<div class="sub-menu">
<a href="#" onclick="EnergiekonzeptFunction('nothing')">Stöckach</a>
</div>
+ <div class="sub-menu">
+ <a href="#" onclick="nordbahnview()">Nordbahnhof</a>
+ </div>
<button class="accordion">Acoustics</button>
<div class="sub-menu">
<a href="#">Sub Menu 3</a>
diff --git a/vcm/config.json b/vcm/config.json
index fb91fcf739af498bc8566e0448b4322e4c8db57a..10eedc8b8759e85a17b2489a6789be8c159ff8f3 100644
--- a/vcm/config.json
+++ b/vcm/config.json
@@ -1189,6 +1189,24 @@
"pitch": -33.51784735784641,
"roll": 359.9542703265667,
"animate": true
+ },
+ {
+ "name": "NordBView",
+ "cameraPosition": [
+ 9.196706687392629,
+ 48.787236688854634,
+ 452.8161295397872
+ ],
+ "groundPosition": [
+ 9.197929833190297,
+ 48.7971060262033,
+ -0.004254466513807599
+ ],
+ "distance": 1190.703214339934,
+ "heading": 4.680790508536784,
+ "pitch": -22.356993435657433,
+ "roll": 0.016861192553048996,
+ "animate": true
}
]
}
\ No newline at end of file
diff --git a/vcm/index.html b/vcm/index.html
index c5cde2e2a2b42c07f886055513391520b43f6d3d..3ae5499d93b8230c73dae8c657ee8264c0712173 100644
--- a/vcm/index.html
+++ b/vcm/index.html
@@ -165,7 +165,7 @@
<div class="title-box vcm_copyright_headerTitle"></div>
<!-- Drop down menu starts here -->
<div class="dropdown hidden" style="float: right; right:20px">
- <i class="fa fa-bars" id="dropdownMenu" style="font-size:1.8rem;color: antiquewhite; margin-top:1rem;"></i>
+ <i class="fa fa-bars" id="dropdownMenu" style="font-size:1.8rem;color: white !important; margin-top:1rem;"></i>
<div class="dropdown-content">
<button class="accordion">Partizipation</button>
<div class="sub-menu">
@@ -174,6 +174,8 @@
<button class="accordion">Energy</button>
<div class="sub-menu">
<a href="#" onclick="EnergiekonzeptFunction('nothing')">Stöckach</a>
+
+ <a href="#" onclick="nordbahnview()">Nordbahnhof</a>
</div>
<button class="accordion">Acoustics</button>
<div class="sub-menu">
@@ -557,6 +559,7 @@
</div>
<!-- <div class='legend-source'>Source: <a href="#link to source">Name of source</a></div> -->
</div>
+ <div style='width:100%;margin-top:200px;' id="chartNordB"></div>
<!-- <div id="slider-color"></div> -->
</div>
@@ -579,6 +582,7 @@
<script src='lib/vcm_thirdparty.js'></script>
<script src="lib/vcm-compiled_api.js"></script>
<script src="sources/nouislider.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
<script src="templates/slider.js"></script>
<link href="templates/sliders.css" rel="stylesheet">
diff --git a/vcm/templates/cus_Menu.js b/vcm/templates/cus_Menu.js
index 5876c65a38338b6dc63011822d9c5fb0abff8fe9..5e16ae54c7441cfaaece2aee3f0d0ba3386857e9 100644
--- a/vcm/templates/cus_Menu.js
+++ b/vcm/templates/cus_Menu.js
@@ -10,4 +10,9 @@ var acc = document.getElementsByClassName("accordion");
subMenu.style.maxHeight = subMenu.scrollHeight + "px";
}
});
- }
\ No newline at end of file
+ }
+
+function nordbahnview(){
+ var viewp = vcs.vcm.Framework.getInstance().viewpoints.NordBView
+ vcs.vcm.Framework.getInstance().getActiveMap().gotoViewPoint(viewp);
+}
\ No newline at end of file
diff --git a/vcm/templates/custom.css b/vcm/templates/custom.css
index 4f30c1dfb03d25a77d0dbddb52105ab2b8d8c94f..abfdc8833f8530454b580f56311c0f1b705ebeab 100644
--- a/vcm/templates/custom.css
+++ b/vcm/templates/custom.css
@@ -470,3 +470,6 @@ div.tour-top-navi {
/* margin-top: -2px; */
}
+#dropdownMenu{
+ color:white !important;
+}
\ No newline at end of file
diff --git a/vcm/templates/custom.js b/vcm/templates/custom.js
index 6f1700a1864396839c3453e28243ad25d5fc3db6..d976ef18d0da38c2bbab0b610aa7b6f9dd42c49b 100644
--- a/vcm/templates/custom.js
+++ b/vcm/templates/custom.js
@@ -231,5 +231,7 @@ function NordbahnhofText() {
document.getElementById("Energiekonzept").style.display = "none";
document.getElementById("UmfrageOne").style.display = "none";
document.getElementById("NordbahnhofInfo").style.display = "block";
+
showTour();
+ showgraph();
}
\ No newline at end of file
diff --git a/vcm/templates/items.json b/vcm/templates/items.json
index b311956b53a668ca06b01f2dc3e3df6096283cf5..c1c8bb34585575c81e0376c11ddbffeb015dc8b2 100644
--- a/vcm/templates/items.json
+++ b/vcm/templates/items.json
@@ -74,6 +74,26 @@
"animate": true
}
},
+ { "id": "NordBView",
+ "type": "viewpoint",
+ "viewpoint": {
+ "name": "NordBView",
+ "cameraPosition": [
+ 9.196706687392629,
+ 48.787236688854634,
+ 452.8161295397872
+ ],
+ "groundPosition": [
+ 9.197929833190297,
+ 48.7971060262033,
+ -0.004254466513807599
+ ],
+ "distance": 1190.703214339934,
+ "heading": 4.680790508536784,
+ "pitch": -22.356993435657433,
+ "roll": 0.016861192553048996,
+ "animate": true
+ }},
{
"id": "Energiefahrrad",
"type": "viewpoint",
diff --git a/vcm/templates/newDevBahn.js b/vcm/templates/newDevBahn.js
index c80b8c8491ea4f15b4a6930e11c67f316c4ca8ab..3de7e869eb00037c32ddfc1b4ea6b7bc69a0537a 100644
--- a/vcm/templates/newDevBahn.js
+++ b/vcm/templates/newDevBahn.js
@@ -337,6 +337,49 @@ function oldZust(){
}
+ function showgraph(){
+ var options = {
+ series: [{
+ name: "Bisheriges Gebäude",
+ data: [376513, 291342, 187649, 62589, 3942,0,0,0, 8, 81966, 231772, 360644]
+ },{
+ name:"Neues Gebäude",
+ data: [37772, 28936, 17886, 4169, 128,1,0,0, 44, 7224, 23163, 36245]
+ }],
+ chart: {
+ height: 350,
+ width: '100%',
+ type: 'line',
+ zoom: {
+ enabled: false
+ }
+ },
+ dataLabels: {
+ enabled: false
+ },
+ stroke: {
+ curve: 'straight'
+ },
+ title: {
+ text: 'Heating Demand by Month',
+ align: 'left'
+ },
+ grid: {
+ row: {
+ colors: ['#f3f3f3', 'transparent'], // takes an array which will be repeated on columns
+ opacity: 0.5
+ },
+ },
+ xaxis: {
+ categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep','Okt','Nov','Dez'],
+ }
+ };
+
+ var chart = new ApexCharts(document.querySelector("#chartNordB"), options);
+ chart.render();
+
+ }
+
\ No newline at end of file