update vcs version

c53f4211 · Patrick · a7c8b61b · c53f4211 · c53f4211 · c53f4211
Commit c53f4211 authored 4 years ago by Patrick
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 904 additions and 677 deletions
+904 -677
--- a/serveralternative.js
+++ b/serveralternative.js
@@ -1205,13 +1205,13 @@ function timeDifference1(date11,date22) {
 //Final Version
 //===========================================================================================================================
 // ---- Traffic Flow ----
-// - 3Parts -
+// - 3Parts -  48.7823,9.1807,919
 // - get request from the html page
 app.get('/TrafficFlow', async (req, res) => {
  console.log('command angekommen!')
 try{
-  let APIout = await flow_getApiResponse('https://traffic.ls.hereapi.com/traffic/6.2/flow.json?prox=48.7823,9.1807,919&responseattributes=sh%2Cfc&apiKey=9Grm-6B7VRvxAnbf2eKw29gR-9uuJP8VaXXYR8LK93Y');
+  let APIout = await flow_getApiResponse('https://traffic.ls.hereapi.com/traffic/6.2/flow.json?prox=48.7544,9.1768,8745&responseattributes=sh%2Cfc&apiKey=9Grm-6B7VRvxAnbf2eKw29gR-9uuJP8VaXXYR8LK93Y');
+  console.log(APIout)
  let json_tf = await flow_buildTFLOWJson(APIout);
  console.log(json_tf)
  var json_tfs = {
@@ -1252,24 +1252,39 @@ function flow_buildTFLOWJson(inputData){
  var JsonFeature = [];
  console.log(json_tflow.RWS[0].RW.length + "---- in flow func")
  var length = json_tflow.RWS[0].RW.length;
+  var fik
  // console.log(length);
  for (var i = 0; i<= length -1; i++){
-    var shplength = json_tflow.RWS[0].RW[i].FIS[0].FI[0].SHP.length;
+    var FIlength = json_tflow.RWS[0].RW[i].FIS[0].FI.length
+    console.log("i - " + i)
-    // var type = accident.body.TRAFFIC_ITEMS.TRAFFIC_ITEM[i].TRAFFIC_ITEM_TYPE_DESC;
+      var mid = json_tflow.RWS[0].RW[i].mid;
-    var mid = json_tflow.RWS[0].RW[i].mid;
+      var LI = json_tflow.RWS[0].RW[i].LI;
-    var LI = json_tflow.RWS[0].RW[i].LI;
+      var DE = json_tflow.RWS[0].RW[i].DE;
-    var DE = json_tflow.RWS[0].RW[i].DE;
+      var PBT = json_tflow.RWS[0].RW[i].PBT;
-    var PBT = json_tflow.RWS[0].RW[i].PBT;
+    for (var m = 0; m <= FIlength -1; m++){
-    var TMC = json_tflow.RWS[0].RW[i].FIS[0].FI[0].TMC;
+      console.log("k - " + m)
-    var CF = json_tflow.RWS[0].RW[i].FIS[0].FI[0].CF[0];
+      var shplength = json_tflow.RWS[0].RW[i].FIS[0].FI[m].SHP.length;
+      console.log("FI - " + json_tflow.RWS[0].RW[i].FIS[0].FI[m])
-    var locationshp = [];
+      fik = json_tflow.RWS[0].RW[i].FIS[0].FI[m]
-    for (var j = 0; j <= shplength - 1; j++ ){
+      // var type = accident.body.TRAFFIC_ITEMS.TRAFFIC_ITEM[i].TRAFFIC_ITEM_TYPE_DESC;
-      var value = json_tflow.RWS[0].RW[i].FIS[0].FI[0].SHP[j].value[0];
-      // console.log(value[0])
+      var TMC = json_tflow.RWS[0].RW[i].FIS[0].FI[m].TMC;
+      var CF = json_tflow.RWS[0].RW[i].FIS[0].FI[m].CF[0];
+      console.log("Shp length - " + json_tflow.RWS[0].RW[i].FIS[0].FI[m].SHP.length)
+      console.log("Shp length - " + shplength)
+      var locationshp = [];
+      for (var j = 0; j <= shplength - 1; j++ ){
+        console.log("j - " +j)
+        console.log("RWS  - " + json_tflow.RWS[0])
+        console.log("RW  - " + json_tflow.RWS[0].RW[i])
+        console.log("FIS  - " + json_tflow.RWS[0].RW[i].FIS[0])
+        console.log("FIk  - " + fik)
+        console.log("FI  - " + json_tflow.RWS[0].RW[i].FIS[0].FI[m])
+        console.log("shape j  - " + fik.SHP[j])
+        var value = fik.SHP[j].value[0];
+        // console.log(value[0])
      var splitvalue = [];
@@ -1394,7 +1409,7 @@ function flow_buildTFLOWJson(inputData){
          }
        }) 
    }
-  };
+  };};
  resolve(JsonFeature)
  }catch(error){ reject(error)}
@@ -1895,7 +1910,8 @@ function Route_PublicbuildJson(inputData){
 app.get('/NoiseRealTime', async (req, res) => {
  console.log('command angekommen!')
 try{
-  let APIout = await flow_getApiResponse('https://data.sensor.community/airrohr/v1/sensor/49368/');
+  console.log('https://data.sensor.community/airrohr/v1/sensor/' + req.query.id + '/')
+  let APIout = await flow_getApiResponse('https://data.sensor.community/airrohr/v1/sensor/' + req.query.id + '/');
  console.log(APIout);
@@ -1916,9 +1932,9 @@ const pgp = require('pg-promise')({
 const connection = {
  user: 'postgres', 																		// name of the user account
-  database: 'NoiseSensorData', 																	// name of the database
+  database: 'NoiseSensorData', 																	// name of the database   -- NoiseSensorData
-  password: 'ahpk94meteor', 																	// env var: PGPASSWORD 
+  password: 'postgres', 																	// env var: PGPASSWORD  -- ahpk94meteor
-  host: '193.196.38.112', 				// Server hosting the postgres database (host: '35.187.21.114')
+  host: 'localhost', 				// Server hosting the postgres database (host: '35.187.21.114') -- 193.196.38.112
  port: 5432, 																				// env var: PGPORT 
  max: 10, 																					// max number of clients in the pool
  idleTimeoutMillis: 30000 																	// how long a client is allowed to remain idle before being closed
@@ -1935,7 +1951,7 @@ app.post('/getNoiseHist', function (req, res) {
      const data = req.body;
  // = "select sensor_id from public.noisesensor;"
-  let query_string = " SELECT   * FROM   noisesensors  ORDER BY timestamp ASC;"
+  let query_string = " SELECT   * FROM   noisesensorstest  ORDER BY timestamp ASC;"
 	// query_string += "from noisesensor;"; 
  console.log(query_string)
@@ -1954,3 +1970,94 @@ app.post('/getNoiseHist', function (req, res) {
      console.log('.../getNoiseHist failed!\n' + err);
  }
 });
+app.post('/getSTANoiseHist', async (req, res) => {
+  console.log('command angekommen ////// STANoise/////!')
+  const pointData = req.query;
+  // console.log(pointData);
+  try {
+    let origURL = 'http://193.196.138.56/frost-noise-api/v1.1/Datastreams(1)/Observations?$orderby=phenomenonTime%20asc'
+    let STALAeq = await STA_getApiResponse(origURL);
+    let STALAeqColl = [];
+    // let origURLmin = 'http://193.196.138.56/frost-noise-api/v1.1/Datastreams(2)/Observations?$orderby=phenomenonTime%20asc'
+    // let STALAeqmin = await STA_getApiResponse(origURLmin);
+    // let origURLmax = 'http://193.196.138.56/frost-noise-api/v1.1/Datastreams(3)/Observations?$orderby=phenomenonTime%20asc'
+    // let STALAeqmax = await STA_getApiResponse(origURLmax);
+    //eq
+    for (var i = 0; i<= STALAeq.value.length -1; i++){
+      var newNum = "noise";
+      var newVal = "LAeq";
+      STALAeq.value[i][newNum] = newVal;
+      STALAeqColl.push(STALAeq.value[i]);
+    }
+    do {
+      STALAeq = await STA_getApiResponse(STALAeq["@iot.nextLink"]);
+      for (var j = 0; j<= STALAeq.value.length -1; j++){
+        STALAeqColl.push(STALAeq.value[j]);
+      }
+    } while ("@iot.nextLink" in STALAeq);
+    // min
+    // for (var i = 0; i<= STALAeqmin.value.length -1; i++){
+    //   var newNum = "noise";
+    //   var newVal = "LAmin";
+    //   STALAeqmin.value[i][newNum] = newVal;
+    //   STALAeqColl.push(STALAeqmin.value[i]);
+    // }
+    // do {
+    //   STALAeqmin = await STA_getApiResponse(STALAeqmin["@iot.nextLink"]);
+    //   for (var j = 0; j<= STALAeqmin.value.length -1; j++){
+    //     STALAeqColl.push(STALAeqmin.value[j]);
+    //   }
+    // } while ("@iot.nextLink" in STALAeqmin);
+    // // max
+    // for (var i = 0; i<= STALAeqmax.value.length -1; i++){
+    //   var newNum = "noise";
+    //   var newVal = "LAmax";
+    //   STALAeqmax.value[i][newNum] = newVal;
+    //   STALAeqColl.push(STALAeqmax.value[i]);
+    // }
+    // do {
+    //   STALAeqmax = await STA_getApiResponse(STALAeqmax["@iot.nextLink"]);
+    //   for (var j = 0; j<= STALAeqmax.value.length -1; j++){
+    //     STALAeqColl.push(STALAeqmax.value[j]);
+    //   }
+    // } while ("@iot.nextLink" in STALAeqmax);
+    console.log(STALAeqColl.length)
+    res.json(STALAeqColl);
+  }
+  catch (err) {
+      console.log('.../loadSetP failed!\n' + err);
+  }
+});
+function STA_getApiResponse(url) {
+  return new Promise(function (resolve, reject) {
+    // console.log(url)
+    axios.get(url)
+      .then(function (response) {
+        // handle success
+        // console.log(response.data);
+        resolve(response.data);
+      })
+      .catch(function (error) {
+        // handle error
+        // console.log(error);
+        reject(error);
+      });
+  });
+}
\ No newline at end of file
--- a/vcm/config.json
+++ b/vcm/config.json
@@ -617,6 +617,32 @@
          "layerNames": [
            "Questionnaire"
          ]
+        },{
+          "template": [
+            "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
+            "   <button class='infobtn' onclick='NordbahnhofText()'></button>",
+            "   <h1 class='balloon-title' style='color: #FFFFFF;'>HFT SimStadt API</h1>",
+            "   <div class='balloon-content' style='margin-right: 0px;'",
+            "   </div>",
+            "<div class='box-3'>",
+            "<p>EnergyDemand</p><div class='switch'>",
+            "<input type='checkbox' name='toggle' id='chxboxDemand' onclick='checkboxDemandCampus(true);'>",
+            "<label for='toggle'><i></i></label>",
+            "<span></span>",
+            "</div>",
+            "</div>",
+            "<%  %>"
+          ],
+          "minTop": "balloonHeight + 10",
+          "minLeft": "70",
+          "layerTypes": [
+            ""
+          ],
+          "layerNames": [
+            "HFTSimStadt"
+          ]
        },{
          "template": [
            "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
@@ -660,12 +686,12 @@
        },{
          "template": [
            "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
-            "<button class='infobtn' id='infobtnNoise' onclick='setNoiseWaiting();NoiseText();'></button>",
+            "<button class='infobtn' id='infobtnNoise' onclick='NoiseText();'></button>",
-            "   <h1 class='balloon-title' style='color: #FFFFFF;'>Noise Sensor</h1>",
+            "   <h1 class='balloon-title' style='color: #FFFFFF;'>Noise Sensor (49368)</h1>",
            "   <div class='balloon-content' style='margin-right: 0px;'",
            "   </div>",
            "<div class='box-3'>",
-            "<div class='btn btn-three' id='noiseStuff' onclick='getNoiseData();SetNoiseDataWaiting()'>",
+            "<div class='btn btn-three' id='noiseStuff' onclick='getNoiseData(\"49368\");SetNoiseDataWaiting()'>",
            "<span>Get Noise Data</span>",
            "</div><br>",
            "<br></div><br>",
@@ -688,6 +714,68 @@
          "layerNames": [
            "NoiseLocation"
          ]
+        },{
+          "template": [
+            "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
+            "<button class='infobtn' id='infobtnNoise' onclick='NoiseText();'></button>",
+            "   <h1 class='balloon-title' style='color: #FFFFFF;'>Noise Sensor (53627)</h1>",
+            "   <div class='balloon-content' style='margin-right: 0px;'",
+            "   </div>",
+            "<div class='box-3'>",
+            "<div class='btn btn-three' id='noiseStuff' onclick='getNoiseData(\"53627\");SetNoiseDataWaiting()'>",
+            "<span>Get Noise Data</span>",
+            "</div><br>",
+            "<br></div><br>",
+            "<p>noise_LAeq: </p><p id='noise_laeq'>&nbsp;</p><br>",
+            "<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
+            "<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
+            "<span></span>",
+            "</div>",
+            "<%  %>"
+          ],
+          "minTop": "balloonHeight + 10",
+          "minLeft": "70",
+          "layerTypes": [
+            ""
+          ],
+          "layerNames": [
+            "NoiseLocation53627"
+          ]
+        },{
+          "template": [
+            "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
+            "<button class='infobtn' id='infobtnNoise' onclick='NoiseText();'></button>",
+            "   <h1 class='balloon-title' style='color: #FFFFFF;'>Noise Sensor (29212)</h1>",
+            "   <div class='balloon-content' style='margin-right: 0px;'",
+            "   </div>",
+            "<div class='box-3'>",
+            "<div class='btn btn-three' id='noiseStuff' onclick='getNoiseData(\"29212\");SetNoiseDataWaiting()'>",
+            "<span>Get Noise Data</span>",
+            "</div><br>",
+            "<br></div><br>",
+            "<p>noise_LAeq: </p><p id='noise_laeq'>&nbsp;</p><br>",
+            "<p>noise_LA_min: </p><p id='noise_lamin'>&nbsp;</p><br>",
+            "<p>noise_LA_max: </p><p id='noise_lamax'>&nbsp;</p><br>",
+            "<span></span>",
+            "</div>",
+            "<%  %>"
+          ],
+          "minTop": "balloonHeight + 10",
+          "minLeft": "70",
+          "layerTypes": [
+            ""
+          ],
+          "layerNames": [
+            "NoiseLocation29212"
+          ]
        },
        {
          "template": [
@@ -1079,7 +1167,7 @@
      "altitudeMode": "relativeToGround",
      "heightAboveGround": 0
    },
-    { "name": "Streetday",
+    { "name": "Streetday1",
      "url": "./datasource-data/accoustic/DE_a_ag1_Aggroad_Lden.json",
      "type": "vcs.vcm.layer.GeoJSON",
      "datasourceId": "...",
@@ -1091,6 +1179,24 @@
      },
      "altitudeMode": "relativeToGround",
      "heightAboveGround": 0
+    },{
+      "name": "Streetday",
+      "url": "./datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/tileset.json",
+      "type": "vcs.vcm.layer.cesium.Buildings",
+      "datasourceId": "zECwoSwXppPMrqfbt",
+      "activeOnStartup": false,
+      "exclusive": false,
+      "allowPicking": true,
+      "screenSpaceError": 32,
+      "screenSpaceErrorMobile": 32,
+      "hiddenObjectIds": [],
+      "copyright": {
+        "provider": "",
+        "url": "",
+        "year": "",
+        "altitudeMode": "relativeToGround",
+        "heightAboveGround": 0
+      }
    },
    { "name": "Streetnight",
      "url": "./datasource-data/accoustic/DE_a_ag1_Aggroad_Lnight.json",
@@ -1309,6 +1415,27 @@
        }
      },
      "heightAboveGround": 0
+    },{
+      "name": "HFTSimStadt",
+      "url": "./datasource-data/SimStadtAPI/HFTgeojson.geojson",
+      "type": "vcs.vcm.layer.GeoJSON",
+      "datasourceId": "...",
+      "activeOnStartup": true,
+      "exclusive": false,
+      "projection": {
+        "epsg": "4326",
+        "proj4": ""
+      },
+      "altitudeMode": "relativeToGround",
+      "style": {
+        "image": {
+          "icon": {
+            "src": "./templates/building.png",
+            "scale": 0.5
+          }
+        }
+      },
+      "heightAboveGround": 0
    },{
      "name": "ProjektNord",
      "url": "./templates/ProjektNord.geojson",
@@ -1460,6 +1587,48 @@
        }
      },
      "heightAboveGround": 0
+    },{
+      "name": "NoiseLocation29212",
+      "url": "./datasource-data/NoiseData/NoisePoint29212.geojson",
+      "type": "vcs.vcm.layer.GeoJSON",
+      "datasourceId": "...",
+      "activeOnStartup": true,
+      "exclusive": false,
+      "projection": {
+        "epsg": "4326",
+        "proj4": ""
+      },
+      "altitudeMode": "relativeToGround",
+      "style": {
+        "image": {
+          "icon": {
+            "src": "./datasource-data/NoiseData/noise.png",
+            "scale": 1
+          }
+        }
+      },
+      "heightAboveGround": 0
+    },{
+      "name": "NoiseLocation53627",
+      "url": "./datasource-data/NoiseData/NoisePoint53627.geojson",
+      "type": "vcs.vcm.layer.GeoJSON",
+      "datasourceId": "...",
+      "activeOnStartup": true,
+      "exclusive": false,
+      "projection": {
+        "epsg": "4326",
+        "proj4": ""
+      },
+      "altitudeMode": "relativeToGround",
+      "style": {
+        "image": {
+          "icon": {
+            "src": "./datasource-data/NoiseData/noise.png",
+            "scale": 1
+          }
+        }
+      },
+      "heightAboveGround": 0
    }
  ],
  "viewpoints": [

--- a/vcm/css/loading.css
+++ b/vcm/css/loading.css
@@ -33,6 +33,21 @@
    /* margin-top: 50%; */
    margin-left: 40%;
  }
+  #loadermain{
+    border: 8px solid rgb(88, 88, 88);
+    border-radius: 50%;
+    border-top: 8px solid #3498db;
+    width: 48px;
+    height: 48px;
+    -webkit-animation: spin 2s linear infinite; /* Safari */
+    animation: spin 2s linear infinite;
+    background-color: rgb(60, 60, 60);
+    color: rgb(60, 60, 60);
+    /* text-align:center; */
+    /* margin-top: 50%; */
+    margin-left: 40%;
+    display:none;
+  }
  /* Safari */
 @-webkit-keyframes spin {
    0% { -webkit-transform: rotate(0deg); }

--- a/vcm/css/menu.css
+++ b/vcm/css/menu.css
@@ -57,7 +57,7 @@
    cursor: pointer; 
 }
-#btn_NoiseSensOn, #btn_NoiseSensOff, .btn_on, .btn_off{
+#btn_NoiseSensOn,#btn_NoiseSensOpen,#btn_NoiseSensShow, #btn_NoiseSensOff, .btn_on, .btn_off{
    background-color: #424242; /* yellow */
    border: none;
    color: white;
@@ -71,7 +71,7 @@
    border-radius: 2px;
    box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);
 }
-#btn_NoiseSensOn:hover, #btn_NoiseSensOff:hover, .btn_on:hover, .btn_off:hover{
+#btn_NoiseSensOn:hover,#btn_NoiseSensOpen:hover,#btn_NoiseSensShow:hover, #btn_NoiseSensOff:hover, .btn_on:hover, .btn_off:hover{
    background-color: #161616;
    box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
    cursor: pointer; 
@@ -108,4 +108,44 @@
    background-color: #161616;
    box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
    cursor: pointer; 
 }
\ No newline at end of file
+.dropbtn {
+    background-color: #303030;
+    color: white;
+    padding: 16px;
+    font-size: 16px;
+    border: none;
+    cursor: pointer;
+  }
+  .dropdown {
+    position: relative;
+    display: inline-block;
+  }
+  .dropdown-content {
+    display: none;
+    position: absolute;
+    background-color: #f9f9f9;
+    min-width: 160px;
+    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    z-index: 1;
+  }
+  .dropdown-content a {
+    color: black;
+    padding: 12px 16px;
+    text-decoration: none;
+    display: block;
+  }
+  .dropdown-content a:hover {background-color: #f1f1f1}
+  .dropdown:hover .dropdown-content {
+    display: block;
+  }
+  .dropdown:hover .dropbtn {
+    background-color: #414141;
+  }
\ No newline at end of file
--- a/vcm/css/vcm.css
+++ b/vcm/css/vcm.css
--- a/vcm/css/vcm_info.css
+++ b/vcm/css/vcm_info.css
@@ -75,6 +75,10 @@ body {
  }
  .text-center{
    text-align: center;
+  }
+  .text-marker{
+    color: #ff0000;
+    font-weight: bold;
  }
 	table {
    border-collapse: collapse;
@@ -92,6 +96,13 @@ body {
 	td {
    padding:5px;
  }
+  .clipping-table{
+    width: 100%;
+    font-weight: bold;
+  }
+  .clipping-table td img{
+    margin: 0;
+  }
  img.scale{
    max-width: 100%;
@@ -135,6 +146,7 @@ body {
  .help-menu-toggler{
    display: block;
+    clear: both;
    border: 1px solid #ddd;
    padding: 0.4em;
    margin-bottom: .5em;
@@ -154,6 +166,7 @@ body {
  .hide-for-mobile{
    display: none;
+    clear: both;
  }
  .ui-scrollable {
@@ -264,23 +277,23 @@ body {
    content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAXCAYAAAAYyi9XAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTExIDc5LjE1ODMyNSwgMjAxNS8wOS8xMC0wMToxMDoyMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE5NzBDRDNCMjk4QjExRTZCNTY2OTYyOTY5RkEwRTU5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE5NzBDRDNDMjk4QjExRTZCNTY2OTYyOTY5RkEwRTU5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTk3MENEMzkyOThCMTFFNkI1NjY5NjI5NjlGQTBFNTkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTk3MENEM0EyOThCMTFFNkI1NjY5NjI5NjlGQTBFNTkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz71OKCkAAAB1UlEQVR42tyWPUgDQRCFcxr/AoaIGLEQCwuLFAoWVqcWSScWgogodoogYmGT1i6lhY2CnWijhaRMQCQgpAjaiyKk0kawMEHQ+Eafx7rej3peChe+LLe3O29nZmcvRq1WC9WzNYTq3OouGJafdDr9iK4RNAek8wSeM5lMJMyBNnAPdoDxx2JySOZAh+WhqIsQdrAahHuI4Dw1rBxegBhejAUgJjZj1LA8zIFhkAKnnBhieH9cN4iU+phSNCwPc+yTysRFcMmdTflwMmkneAaq4iU8i3JsA/SDQbAH+hwMDoEWh3BGGbkqNd4FEQIZKDLEJucf2ZWQ1tZoaBc02bw3ua5IjU+Fr4d1HSyDLY5dKXNbwTbYZEnJsT8E7W7hdBJMKcUqRqVUyh91hNYLsmBJMz7J8R6nA6MLlsADSCD2cW1RiYtm2Scd8iklMM38iY0EbZa+CCLGUpgFPo7z3QI4Bl1M/j4Y8DiV54oNaQXatr2880rsO8EKc/Td9gKutfzl3U6elUfsSnI0ohzxCQ8xuRqzbvl7m6R/gGH4Fl0ciw0f15nU7A24g51ur+/hCRdFfNwupmrLq5gl5jPgAKLlXwqO2uXPTbDCuvLTKnaCxr//E/UqwADGb37yp4980AAAAABJRU5ErkJggg==');
  }
  .adv-walkmode-btn{
-    background-image: url("../ui/assets/images/walkmode-icon.png");
+    background-image: url("../img/walkmode-icon.png");
    background-repeat: no-repeat;
    background-position: center;
  }
  .adv-walkmode-btn.active{
-    background-image: url("../ui/assets/images/walkmode-icon-hover.png");
+    background-image: url("../img/walkmode-icon-hover.png");
    background-color: #a8c02b;
  }
  .widget-icon-svg-camera{
-    background-image: url('../ui/assets/images/film-camera-g.svg');
+    background-image: url('../img/film-camera-g.png');
    height: 40px;
    background-size: 78%;
    background-repeat: no-repeat;
    background-position: center;
  }
  .widget-button.dark.widget-icon-svg-camera{
-    background-image: url('../ui/assets/images/film-camera-w.svg');
+    background-image: url('../img/film-camera-w.png');
  }
  .widget-button.vcm-widget-btn-map{
@@ -392,6 +405,7 @@ body {
    .content-box{
      margin-right:1em;
      display: block;
+      clear: both;
    }
    #main-content{
      top: 3em;
@@ -401,6 +415,9 @@ body {
    .help-menu-toggler {
      display: none;
    }
+    .clipping-table{
+      width: 75%;
+    }
 }

--- a/vcm/css/vcm_ui.css
+++ b/vcm/css/vcm_ui.css
--- a/vcm/datasource-data/NoiseData/NoisePoint29212.geojson
+++ b/vcm/datasource-data/NoiseData/NoisePoint29212.geojson
+{"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.00258013,48.80010380,-0.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}}
\ No newline at end of file
--- a/vcm/datasource-data/NoiseData/NoisePoint53627.geojson
+++ b/vcm/datasource-data/NoiseData/NoisePoint53627.geojson
+{"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.178,48.770,-0.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}}
\ No newline at end of file
--- a/vcm/datasource-data/SimStadtAPI/HFTgeojson.geojson
+++ b/vcm/datasource-data/SimStadtAPI/HFTgeojson.geojson
+{
+"type": "FeatureCollection",
+"name": "data_point",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+"features": [
+{ "type": "Feature", "properties": { "id": null, "name": "datapoint" }, "geometry": { "type": "Point", "coordinates": [ 9.1736143531331,48.78071533418364 ] } }
+]
+}
--- a/vcm/datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/data/data0.b3dm
+++ b/vcm/datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/data/data0.b3dm
--- a/vcm/datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/tileset.json
+++ b/vcm/datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/tileset.json
+{
+	"asset" : {
+		"version" : "0.0"
+	},
+	"properties" : {
+		"DB_LOW" : {
+			"minimum" : 55,
+			"maximum" : 75
+		},
+		"DB_HIGH" : {
+			"minimum" : 0,
+			"maximum" : 74
+		},
+		"CTRYID" : {},
+		"UNAGGID" : {},
+		"AGGLOMERAT" : {},
+		"SHAPE_LENG" : {
+			"minimum" : 0,
+			"maximum" : 0
+		},
+		"SHAPE_AREA" : {
+			"minimum" : 0,
+			"maximum" : 0
+		},
+		"DB_LOW_ROAD" : {
+			"minimum" : 55,
+			"maximum" : 75
+		},
+		"DB_HIGH_ROAD" : {
+			"minimum" : 0,
+			"maximum" : 74
+		}
+	},
+	"geometricError" : 15047.002089195652,
+	"root" : {
+		"boundingVolume" : {
+			"box" : [ 4156614.9942312706, 671091.9027434601, 4774413.803827877, 14545.47724061273, 0, 0, 0, 18109.618044564035, 0, 0, 0, 12764.76614540629 ]
+		},
+		"refine" : "ADD",
+		"content" : {
+			"boundingVolume" : {
+				"box" : [ 4156614.9942312706, 671091.9027434601, 4774413.803827877, 14545.47724061273, 0, 0, 0, 18109.618044564035, 0, 0, 0, 12764.76614540629 ]
+			},
+			"url" : "data/data0.b3dm"
+		}
+	}
+}
\ No newline at end of file
--- a/vcm/index.html
+++ b/vcm/index.html
@@ -165,8 +165,10 @@
              <div class="company-logo"></div>
          </div>
          <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: white !important; margin-top:1rem;"></i>
                            <div class="dropdown-content" style="width:20rem;">
                                <button class="accordion">Partizipation</button>
@@ -181,11 +183,12 @@
                                    </div>
                                <button class="accordion">Acoustics</button>
                                    <div class="sub-menu">
-                                        <a><strong>Lärmkarten:</strong></a><br>
+                                        <a><strong>Lärmkarten:</strong></a>
+                                        <a href="#">Straße</a>
                                        <button id ="btn_StreetDay" onclick="noisemap('Streetday')">Day</button>
                                        <button id ="btn_StreetNight" onclick="noisemap('Streetnight')">Night</button>
                                        <button id ="btn_StreetOff" onclick="noisemap('offS')">Off</button>
-                                        <a href="#" style="margin-left:0.4rem;">Straße</a><br>
                                        <!-- <div class="switch-toggle switch-3 switch-candy">
                                            <button id ="btn_StreetDay">Day</button>
@@ -199,13 +202,16 @@
                                            <label for="off" onclick="noisemap('offS')">OFF</label>
                                          </div><br> -->
+                                          <a href="#">Bahn</a>
                                          <button id ="btn_RailDay" onclick="noisemap('Railday')">Day</button>
                                          <button id ="btn_RailNight" onclick="noisemap('Railnight')">Night</button>
                                          <button id ="btn_RailOff" onclick="noisemap('offR')">Off</button>
-                                        <a href="#" style="margin-left:0.4rem;">Bahn</a><br>
-                                        <a><strong>Noise Sensors:</strong></a><br>
+                                        <a><strong>Noise Sensors (Live):</strong></a>
                                        <button id ="btn_NoiseSensOn" onclick="noisesens('on')">On</button>
                                        <button id ="btn_NoiseSensOff" onclick="noisesens('off')">Off</button><br>
+                                        <a><strong>Noise Sensors (historisch):</strong></a>
+                                        <button id ="btn_NoiseSensOpen" onclick="NoiseText();">Open</button>
                                        <!-- <div class="switch-toggle switch-3 switch-candy">
                                            <input id="onR" name="state-d" type="radio" checked="" />
@@ -222,9 +228,10 @@
                                <button class="accordion">Mobility</button>
                                    <div class="sub-menu">
+                                        <a href="#" onclick="" >Bauarbeiten</a>
                                        <button class = "btn_on" onclick="getAccidents('CONSTRUCTION')">On</button>
                                        <button class = "btn_off" onclick="deleteAccidents('CONSTRUCTION')">Off</button>
-                                        <a href="#" onclick="" >Bauarbeiten</a><br>
                                        <!-- <div class="switch-toggle switch-3 switch-candy">
@@ -235,9 +242,10 @@
                                            <label for="na" onclick="deleteAccidents('CONSTRUCTION')">OFF</label>
                                          </div><br> -->
+                                          <a href="#" onclick="" >Straßenschließungen</a>
                                          <button class = "btn_on" onclick="getAccidents('ROAD_CLOSURE')">On</button>
                                          <button class = "btn_off" onclick="deleteAccidents('ROAD_CLOSURE')">Off</button>
-                                          <a href="#" onclick="" >Straßenschließungen</a>
                                        <!-- <div class="switch-toggle switch-3 switch-candy">
                                            <input id="road-on" name="state-d" type="radio" checked="" />
@@ -247,9 +255,10 @@
                                            <label for="na" onclick="deleteAccidents('ROAD_CLOSURE')">OFF</label>
                                          </div> -->
+                                          <a href="#">Verkehrsflow</a>
                                          <button class = "btn_on" onclick="drawFlow()">On</button>
                                          <button class = "btn_off" onclick="deleteFlow()">Off</button>
-                                          <a href="#">Verkehrsflow</a>
                                          <!-- <div class="switch-toggle switch-3 switch-candy">
                                            <input id="flow-on" name="state-d" type="radio" checked="" />
@@ -261,6 +270,8 @@
                                          </div> -->
                                    </div>
                                    <button class="accordion" onclick="Navigationshow();getPosition();" >Navigation</button>
+                                    <button class="accordion" onclick="simstadtget();" >SimStadt</button>
+                                    <!-- <button class="accordion" onclick="NoiseText();" >STA Noise</button> -->
                                    <!-- <div class="sub-menu">
                                        <a href="#" onclick="Navigationshow();getPosition();" >Car</a>
                                        <div class="switch-toggle switch-3 switch-candy">
@@ -275,6 +286,11 @@
                                    </div> -->
                            </div>
+                            <div id = "loadermain" class="loader" style="margin-right: 40px; margin-top: 40px; margin-left: -50px;
+                            margin-top: -40px;
+                            height: 40px;
+                            width: 40px;
+                            position: absolute;"></div>
                      </div>
                    <!-- Drop down menu ends here -->            
           <div class="tool-box" style="cursor:pointer"></div> 
@@ -660,14 +676,33 @@
            <h2>Historical Noise Data</h2>
            <br>
            <div id="loadingHistNoise"></div>
+            <label for="cars">Sensor wählen:</label>
+                <select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);" name="sensor" id="sensors">
+                <option value="49368">49368</option>
+                <option value="53627">53627</option>
+                <option value="29212">29212</option>
+                <option value="compLAeq">compare LAeq</option>
+                </select>
+                <a href="#" id ="btn_NoiseSensShow" style="width:6em !important; height:2em !important;border-radius: 3px; padding-top: 1em;padding-bottom: 2em;" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('49368')">anzeigen</a>
+            <!-- <div class="dropdown">
+                <button class="dropbtn">Sensor wählen:</button>
+                <div class="dropdown-content">
+                <a href="#" onclick="getSTAHistNoise();setNoiseWaiting();HistNoiseData('49368')">49368</a>
+                <a href="#">53627</a>
+                <a href="#">29212</a>
+                </div>
+              </div> -->
            <!-- <p>The specific space heating demand wurde mit SimStadt simuliert. Die Werte sind in [kWh/m²·a] angegeben.</p><br>
            <button onclick="HistNoiseData()">GetData</button>
            <button onclick="showgraphNoise()">GetData</button> -->
            <div id="unconstrained"></div><br>
            <span class="example-val" id="unconstrained-values"></span>
+            <a>Überblick Sensor</a>
            <div style='width:100%;margin-top:10px;' id="chartNoise"></div>
+            <a>Genauere Sensordaten (LAeq)</a>
+            <div style='width:100%;margin-top:10px;' id="chartNoiseSTA"></div>
        <!-- <div id="slider-color"></div> -->
+                <a>Da der Sensor in UTC format die Zeit misst wird hier keine Unterscheidung zwischen Sommer und Winterzeit gemacht.</a>
        </div>
        <!-- ======================================================================================================================================================================== -->
        <!-- Navigation -->
@@ -727,6 +762,7 @@
    <script src="js/navigation.js"></script>
    <script src="js/ServerorLocal.js"></script>
    <script src="js/noise.js"></script>
+    <script src="js/STAnoise.js"></script>
    <link href="templates/sliders.css" rel="stylesheet">
    <link rel="stylesheet" href="css/menu.css">
@@ -746,7 +782,7 @@
      vcs.vcm.Framework.loadConfig('config.json');
    </script-->
    <script src='lib/vcm_ui.js'></script>
+    <script src="js/SimStadtApi_stud.js"></script>
    <script src="js/here.js"></script>
    <script src="js/codepoly.js"></script>
    <script src="templates/custom.js"></script>

--- a/vcm/js/STAnoise.js
+++ b/vcm/js/STAnoise.js
+var histNoiseSTA
+function getSTAHistNoise(){
+    try {
+        $.ajax({
+            async: true,
+            type: "POST",
+            url: getSTANoiseHistUrl,
+            data: "",
+        }).done(function (histwinddata) {
+            convertdata(histwinddata);
+            console.log(histwinddata)
+        });
+        function convertdata(histwinddt) {
+            histNoiseSTA = histwinddt;
+            console.log(histNoiseSTA[0]);
+            showgraphNoiseSTA();
+        }
+    }
+    catch (err) {
+        console.log('->  function gethistWind() failed!\n' + err);
+    }
+}
+function showgraphNoiseSTA(){
+    var i;
+    var datas = []
+    var datamin = []
+    var datamax = []
+    var dataseq = []
+    console.log(histNoise.length)
+    var sDay = new Date('1995-12-17T03:24:00');
+    for (i = 0; i < histNoiseSTA.length; i++) {
+        console.log(i)
+        // console.log(noise_LA_maxnumb)
+        var datestuff = Date.parse(histNoiseSTA[i].phenomenonTime)
+        var valuestuff = histNoiseSTA[i].result
+        // console.log(datestuff.toUTCString())
+        // if (histNoiseSTA[i].noise == "LAeq"){
+            datas.push({x: datestuff, y: parseFloat(valuestuff.toFixed(2))})
+        // } else if  (histNoiseSTA[i].noise == "LAmin") {
+        //     datamin.push({x: datestuff, y: parseFloat(valuestuff.toFixed(2))})
+        // } else if (histNoiseSTA[i].noise == "LAmax") {
+        //     datamax.push({x: datestuff, y: parseFloat(valuestuff.toFixed(2))})
+        // }
+    }
+    // console.log(datas)
+    // console.log(dataseq)
+    console.log("--------")
+    // console.log([{
+    //   x: new Date('2018-02-12').getTime(),
+    //   y: 76
+    // }, {
+    //   x: new Date('2018-02-12').getTime(),
+    //   y: 76
+    // }])
+    var options = {
+      chart: {
+        type: "area",
+        height: 300,
+        foreColor: "#999",
+        stacked: false,
+        dropShadow: {
+          enabled: true,
+          enabledSeries: [0],
+          top: -2,
+          left: 2,
+          blur: 5,
+          opacity: 0.06
+        }
+      },
+      colors: ['#7F0000','#00E396', '#0090FF'],
+      stroke: {
+        curve: "smooth",
+        width: 3
+      },
+      dataLabels: {
+        enabled: false
+      },
+      series: [{
+        name: 'Noise_LAeq',
+        data: datas
+      }],
+      markers: {
+        size: 0,
+        strokeColor: "#fff",
+        strokeWidth: 3,
+        strokeOpacity: 1,
+        fillOpacity: 1,
+        hover: {
+          size: 6
+        }
+      },
+      xaxis: {
+        type: "datetime",
+        labels: {
+          datetimeUTC: false
+        },
+        axisBorder: {
+          show: false
+        },
+        axisTicks: {
+          show: false
+        }
+      },
+      yaxis: {
+        labels: {
+          offsetX: 14,
+          offsetY: -5
+        },
+        tooltip: {
+          enabled: true
+        }
+      },
+      grid: {
+        padding: {
+          left: -5,
+          right: 5
+        }
+      },
+      tooltip: {
+        x: {
+            format: "dd.MM.yyyy HH:mm"
+          },
+      },
+      legend: {
+        position: 'top',
+        horizontalAlign: 'left'
+      },
+      fill: {
+        type: 'gradient',
+            gradient: {
+              shadeIntensity: 1,
+              inverseColors: false,
+              opacityFrom: 0.5,
+              opacityTo: 0,
+              stops: [0, 90, 100]
+            },
+      }
+    };
+  document.getElementById("chartNoiseSTA").innerHTML = "";
+  var chart = new ApexCharts(document.querySelector("#chartNoiseSTA"), options);
+  // document.getElementById("infobtnNoise").classList.add('infobtn');
+  // document.getElementById("infobtnNoise").classList.remove('loaderN');
+  console.log("end")
+  chart.render();
+  }
\ No newline at end of file
--- a/vcm/js/ServerorLocal.js
+++ b/vcm/js/ServerorLocal.js
 // Server
-var navPublicT = '/partizipation/navPublicT'
+// var navPublicT = '/partizipation/navPublicT'
-var NavCARdata = '/partizipation/NavCARdata'
+// var NavCARdata = '/partizipation/NavCARdata'
-var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
+// var ROAD_CLOSURE ="https://m4lab.hft-stuttgart.de/partizipation/ROAD_CLOSURE"
-var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
+// var CONSTRUCTION = "https://m4lab.hft-stuttgart.de/partizipation/CONSTRUCTION"
-var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
+// var TrafficFlow ="https://m4lab.hft-stuttgart.de/partizipation/TrafficFlow"
-var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
+// var NAVCAR = "https://m4lab.hft-stuttgart.de/partizipation/NAVCAR"
-var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
+// var NAVPUB = "https://m4lab.hft-stuttgart.de/partizipation/NAVPUB"
-var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
+// var addPointurl = "https://m4lab.hft-stuttgart.de/partizipation/addPoint"
-var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
+// var routecalcurl = "https://m4lab.hft-stuttgart.de/partizipation/Routecalc2"
-var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
+// var navpublict2url = "https://m4lab.hft-stuttgart.de/partizipation/navPublicT2"
-var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
+// var StartpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Startpoint"
-var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
+// var EndpointUrl = "https://m4lab.hft-stuttgart.de/partizipation/Endpoint"
-var FLOWdataUrl = "/partizipation/FLOWdata"
+// var FLOWdataUrl = "/partizipation/FLOWdata"
-var NavCARdataUrl = '/partizipation/NavCARdata'
+// var NavCARdataUrl = '/partizipation/NavCARdata'
-var FLOWtestUrl = '/partizipation/FLOWtest'
+// var FLOWtestUrl = '/partizipation/FLOWtest'
-var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
+// var getTrafficIncidentsUrl = '/partizipation/getTrafficIncidents'
-var navPointUrl = '/partizipation/navPoint'
+// var navPointUrl = '/partizipation/navPoint'
-var RoutecalcUrl = '/partizipation/Routecalc'
+// var RoutecalcUrl = '/partizipation/Routecalc'
-var navPublicTUrl = '/partizipation/navPublicT'
+// var navPublicTUrl = '/partizipation/navPublicT'
-var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
+// var NoiseRealTimeUrl = '/partizipation/NoiseRealTime'
-var getNoiseHistUrl = '/partizipation/getNoiseHist'
+// var getNoiseHistUrl = '/partizipation/getNoiseHist'
+// var getSTANoiseHistUrl = '/partizipation/getSTANoiseHist'
 //_________________________________________/
 // Local
-// var navPublicT = '/navPublicT'
+var navPublicT = '/navPublicT'
-// var NavCARdata = '/NavCARdata'
+var NavCARdata = '/NavCARdata'
-// var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
+var ROAD_CLOSURE = "http://localhost:8083/ROAD_CLOSURE"
-// var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
+var CONSTRUCTION = "http://localhost:8083/CONSTRUCTION"
-// var TrafficFlow = "http://localhost:8083/TrafficFlow"
+var TrafficFlow = "http://localhost:8083/TrafficFlow"
-// var NAVCAR = "http://localhost:8083/NAVCAR"
+var NAVCAR = "http://localhost:8083/NAVCAR"
-// var NAVPUB = "http://localhost:8083/NAVPUB"
+var NAVPUB = "http://localhost:8083/NAVPUB"
-// var addPointurl = "http://localhost:8083/addPoint"
+var addPointurl = "http://localhost:8083/addPoint"
-// var routecalcurl = "http://localhost:8083/Routecalc2"
+var routecalcurl = "http://localhost:8083/Routecalc2"
-// var navpublict2url = "http://localhost:8083/navPublicT2"
+var navpublict2url = "http://localhost:8083/navPublicT2"
-// var StartpointUrl = "http://localhost:8083/Startpoint"
+var StartpointUrl = "http://localhost:8083/Startpoint"
-// var EndpointUrl = "http://localhost:8083/Endpoint"
+var EndpointUrl = "http://localhost:8083/Endpoint"
-// var FLOWdataUrl = "/FLOWdata"
+var FLOWdataUrl = "/FLOWdata"
-// var NavCARdataUrl = '/NavCARdata'
+var NavCARdataUrl = '/NavCARdata'
-// var FLOWtestUrl = '/FLOWtest'
+var FLOWtestUrl = '/FLOWtest'
-// var getTrafficIncidentsUrl = '/getTrafficIncidents'
+var getTrafficIncidentsUrl = '/getTrafficIncidents'
-// var navPointUrl = '/navPoint'
+var navPointUrl = '/navPoint'
-// var RoutecalcUrl = '/Routecalc'
+var RoutecalcUrl = '/Routecalc'
-// var navPublicTUrl = '/navPublicT'
+var navPublicTUrl = '/navPublicT'
-// var NoiseRealTimeUrl = '/NoiseRealTime'
+var NoiseRealTimeUrl = '/NoiseRealTime'
-// var getNoiseHistUrl = '/getNoiseHist'
+var getNoiseHistUrl = '/getNoiseHist'
\ No newline at end of file
+var getSTANoiseHistUrl = '/getSTANoiseHist'
\ No newline at end of file
--- a/vcm/js/SimStadtApi_stud.js
+++ b/vcm/js/SimStadtApi_stud.js
+function simstadtget(){
+const userAction = async () => {
+    var myBody = {
+        "cityGMLRef": "campus",
+         "interestedAttributes": [
+         "buildingFunction",
+         "yearOfConstruction",
+         "usageType"
+         ]
+        }
+    const response = await fetch('https://simstadt.wiomoc.de/dev/', {
+      method: 'POST',
+      body: myBody, // string or object
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+    const myJson = await response.json(); //extract JSON from the http response
+    console.log(myJson)
+    // do something with myJson
+  }
+}
\ No newline at end of file
--- a/vcm/js/here.js
+++ b/vcm/js/here.js
@@ -205,6 +205,7 @@ catch (err) {
 };
 function drawFlow(){
+  document.getElementById("loadermain").style.display = "block";
  // url: "http://localhost:8083/FLOW",
  flowlayer = new vcs.vcm.layer.GeoJSON({
    name: "FLOW",
@@ -218,6 +219,35 @@ function drawFlow(){
 })
 framework.addLayer(flowlayer)
 flowlayer.activate(true);
+  // var mainlayer; 
+  var layern = ["FLOW"]
+  var layers = framework.getLayers();
+//   for (var i = 0; i< layers.length; i++) {
+//     var layer = layers[i];
+//      if(layern.indexOf(layer.name) >= 0){
+//        mainlayer = layer
+//      } 
+//   }
+//   var objectlist = [];
+//   var layerData = {}
+//   var test = 0; 
+//   var timeout = setInterval(function() {
+//     if("l" in layerData) {
+//       for (key in layerData.l) {
+//         test +=1;
+//         objectlist.push(layerData.l[key])
+//       }
+//       // document.getElementById("loadermain").style.display = "block";
+//         clearInterval(timeout); 
+//         isFinished = true;
+//     } else{
+//       layerData = getLayerforData("CarRoute")
+//     }
+// }, 1000);
+// document.getElementById("loadermain").style.display = "none";
 }
 function deleteFlow(){
  var layern = ["FLOW"]

--- a/vcm/js/noise.js
+++ b/vcm/js/noise.js
@@ -4,18 +4,25 @@ function SetNoiseDataWaiting(){
  resetBtn.innerHTML = '<div id="loaderCar" class="LoaderNoise"></div>'
 }
 function setNoiseWaiting(){
-  document.getElementById("infobtnNoise").classList.add('loaderN');
+  // document.getElementById("infobtnNoise").classList.add('loaderN');
-  console.log("arrived")
+  // console.log("arrived")
-  document.getElementById("infobtnNoise").classList.remove('infobtn');
+  // document.getElementById("infobtnNoise").classList.remove('infobtn');
  // var resetBtn = document.getElementById("infobtnNoise");
  // resetBtn.disabled = true;
  // resetBtn.innerHTML = '<div id="loaderCartest" class="loaderN"></div>'
 }
-function getNoiseData() {
+var Sensor = {
+  id:"49368"
+  }
+function getNoiseData(sensorid) {
+  console.log("arrive")
+    Sensor.id = sensorid
+    console.log(Sensor.id)
    try {
        $.ajax({
            type: "GET",
            url: NoiseRealTimeUrl,
+            data: Sensor
        }).done(function (newdata) {
            convertdata(newdata);
        });
@@ -102,6 +109,8 @@ function noisemap(areatime){
 function noisesens(status){
  var layerOn = ["NoiseLocation"]
+  var layerTwo = ["NoiseLocation53627"]
+  var layerThree = ["NoiseLocation29212"]
  var layers = framework.getLayers();
    for (var i = 0; i< layers.length; i++) {
@@ -113,12 +122,24 @@ function noisesens(status){
          layer.activate(false);
        }
-      } 
+      } else if(layerTwo.indexOf(layer.name) >= 0){
+        if(status == "on"){
+          layer.activate(true);
+        } else if (status == "off"){
+          layer.activate(false);
+        }
+      } else if(layerThree.indexOf(layer.name) >= 0) {
+        if(status == "on"){
+          layer.activate(true);
+        } else if (status == "off"){
+          layer.activate(false);
+        }
+      }
    }
 }
 let histNoise
-function HistNoiseData() {
+function HistNoiseData(Sensor) {
@@ -136,10 +157,11 @@ function HistNoiseData() {
        function convertdata(histwinddt) {
            histNoise = histwinddt;
+            console.log(histNoise[0]);
            showgraphNoise();
        }
-        console.log(histNoise[0]);
    }
    catch (err) {
        console.log('->  function gethistWind() failed!\n' + err);
@@ -162,27 +184,35 @@ function showgraphNoise(){
  var sDay = new Date('1995-12-17T03:24:00');
  for (i = 0; i < histNoise.length; i++) {
-    if (sameDay(sDay,new Date(histNoise[i].timestamp))){
-      noise_LA_max = noise_LA_max + parseFloat(histNoise[i].noise_LA_max)
+    // new Date(histNoise[i].timestamp)
-      noise_LA_min = noise_LA_min + parseFloat(histNoise[i].noise_LA_min)
+    datas.push({x: new Date(histNoise[i].timestamp).getTime(), y: parseFloat(histNoise[i].noise_LA_max)})
-      noise_LAeq = noise_LAeq + parseFloat(histNoise[i].noise_LAeq)
+    datasMin.push({x: new Date(histNoise[i].timestamp).getTime(), y: parseFloat(histNoise[i].noise_LA_min)})
-      noise_LA_maxnumb = noise_LA_maxnumb + 1
+    dataseq.push({x: new Date(histNoise[i].timestamp).getTime(), y: parseFloat(histNoise[i].noise_LAeq)})
+    // console.log(histNoise[i].timestamp)
+    // console.log(new Date(histNoise[i].timestamp))
+    // if (sameDay(sDay,new Date(histNoise[i].timestamp))){
+    //   noise_LA_max = noise_LA_max + parseFloat(histNoise[i].noise_LA_max)
+    //   noise_LA_min = noise_LA_min + parseFloat(histNoise[i].noise_LA_min)
+    //   noise_LAeq = noise_LAeq + parseFloat(histNoise[i].noise_LAeq)
+    //   noise_LA_maxnumb = noise_LA_maxnumb + 1
-      // console.log(noise_LA_maxnumb)
+    //   // console.log(noise_LA_maxnumb)
-    } else if (noise_LA_maxnumb != 0){
+    // } else if (noise_LA_maxnumb != 0){
-      var valuestuff = noise_LA_max / noise_LA_maxnumb
+    //   var valuestuff = noise_LA_max / noise_LA_maxnumb
-      var valuemin = noise_LA_min / noise_LA_maxnumb
+    //   var valuemin = noise_LA_min / noise_LA_maxnumb
-      var valueeq = noise_LAeq / noise_LA_maxnumb
+    //   var valueeq = noise_LAeq / noise_LA_maxnumb
-      console.log(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate())
+    //   console.log(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getHours())
-      datas.push({x: new Date(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate()).getTime(), y: parseFloat(valuestuff.toFixed(2))})
+    //   datas.push({x: new Date(sDay).getTime(), y: parseFloat(valuestuff.toFixed(2))})
-      datasMin.push({x: new Date(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate()).getTime(), y: parseFloat(valuemin.toFixed(2))})
+    //   datasMin.push({x: new Date(sDay).getTime(), y: parseFloat(valuemin.toFixed(2))})
-      dataseq.push({x: new Date(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate()).getTime(), y: parseFloat(valueeq.toFixed(2))})
+    //   dataseq.push({x: new Date(sDay).getTime(), y: parseFloat(valueeq.toFixed(2))})
-      noise_LA_max = 0
+    //   noise_LA_max = 0
-      noise_LA_min = 0
+    //   noise_LA_min = 0
-      noise_LAeq = 0
+    //   noise_LAeq = 0
-      noise_LA_maxnumb = 0
+    //   noise_LA_maxnumb = 0
-    }
+    // }
-    sDay = new Date(histNoise[i].timestamp)
+    // sDay = new Date(histNoise[i].timestamp)
  }
@@ -240,6 +270,9 @@ function showgraphNoise(){
    },
    xaxis: {
      type: "datetime",
+      labels: {
+        datetimeUTC: false
+      },
      axisBorder: {
        show: false
      },
@@ -285,15 +318,18 @@ function showgraphNoise(){
 document.getElementById("chartNoise").innerHTML = "";
 var chart = new ApexCharts(document.querySelector("#chartNoise"), options);
-document.getElementById("infobtnNoise").classList.add('infobtn');
+// document.getElementById("infobtnNoise").classList.add('infobtn');
-document.getElementById("infobtnNoise").classList.remove('loaderN');
+// document.getElementById("infobtnNoise").classList.remove('loaderN');
 console.log("end")
 chart.render();
 }
 function sameDay(d1, d2) {
+  console.log(d1.getFullYear() + " // " + d1.getMonth() + " // " + d1.getDate() + " // " + d1.getHours())
+  console.log(d2.getFullYear() + " // " + d2.getMonth() + " // " + d2.getDate() + " // " + d2.getHours())
  return d1.getFullYear() === d2.getFullYear() &&
    d1.getMonth() === d2.getMonth() &&
-    d1.getDate() === d2.getDate();
+    d1.getDate() === d2.getDate() &&
-}
+    d1.getHours() === d2.getHours();
\ No newline at end of file
+  }
\ No newline at end of file
--- a/vcm/lib/Cesium/Assets/approximateTerrainHeights.json
+++ b/vcm/lib/Cesium/Assets/approximateTerrainHeights.json
--- a/vcm/lib/Cesium/Cesium.js
+++ b/vcm/lib/Cesium/Cesium.js