Skip to content

GitLab

Commit bcea13bb authored by Patrick's avatar Patrick
Browse files

Big update

parent 5457d923
Expand all Hide whitespace changes
Inline Side-by-side
package-lock.json
View file @ bcea13bb
......@@ -1549,6 +1549,11 @@
}
}
},
"assert-options": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/assert-options/-/assert-options-0.7.0.tgz",
"integrity": "sha512-7q9uNH/Dh8gFgpIIb9ja8PJEWA5AQy3xnBC8jtKs8K/gNVCr1K6kIvlm59HUyYgvM7oEDoLzGgPcGd9FqhtXEQ=="
},
"assert-plus": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
......@@ -2173,6 +2178,11 @@
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
},
"buffer-writer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
},
"buffer-xor": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
......@@ -10967,6 +10977,11 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
"packet-reader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="
},
"pako": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
......@@ -11176,6 +11191,76 @@
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
},
"pg": {
"version": "8.5.1",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz",
"integrity": "sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==",
"requires": {
"buffer-writer": "2.0.0",
"packet-reader": "1.0.0",
"pg-connection-string": "2.4.0",
"pg-pool": "3.2.2",
"pg-protocol": "1.4.0",
"pg-types": "2.2.0",
"pgpass": "1.0.4"
}
},
"pg-connection-string": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz",
"integrity": "sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="
},
"pg-int8": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
},
"pg-minify": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz",
"integrity": "sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="
},
"pg-pool": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz",
"integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="
},
"pg-promise": {
"version": "10.9.2",
"resolved": "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.2.tgz",
"integrity": "sha512-ewelfzZeSPe5sbgd5ylB6edVXqoD8AH/fqZj4wPLL0242vXtkFY3JuUqt3mfvTruOqZHhoINpoXTfmC9UXbZ7A==",
"requires": {
"assert-options": "0.7.0",
"pg": "8.5.1",
"pg-minify": "1.6.2",
"spex": "3.2.0"
}
},
"pg-protocol": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz",
"integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="
},
"pg-types": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
"requires": {
"pg-int8": "1.0.1",
"postgres-array": "2.0.0",
"postgres-bytea": "1.0.0",
"postgres-date": "1.0.7",
"postgres-interval": "1.2.0"
}
},
"pgpass": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
"integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
"requires": {
"split2": "3.2.2"
}
},
"pify": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
......@@ -11784,6 +11869,29 @@
"uniqs": "2.0.0"
}
},
"postgres-array": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="
},
"postgres-bytea": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
"integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU="
},
"postgres-date": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="
},
"postgres-interval": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
"requires": {
"xtend": "4.0.2"
}
},
"prepend-http": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
......@@ -13284,6 +13392,11 @@
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
"dev": true
},
"spex": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz",
"integrity": "sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="
},
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
......@@ -13293,6 +13406,39 @@
"extend-shallow": "3.0.2"
}
},
"split2": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
"integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
"requires": {
"readable-stream": "3.6.0"
},
"dependencies": {
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "2.0.4",
"string_decoder": "1.3.0",
"util-deprecate": "1.0.2"
}
},
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"requires": {
"safe-buffer": "5.2.1"
}
}
}
},
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
......@@ -14819,8 +14965,7 @@
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
},
"y18n": {
"version": "3.2.1",
......
package.json
View file @ bcea13bb
......@@ -57,6 +57,7 @@
"http-auth": "^4.1.2",
"jquery": "^3.4.1",
"npm": "^6.13.6",
"pg-promise": "^10.9.2",
"request": "^2.81.0",
"soap": "^0.30.0"
},
......
server.js
View file @ bcea13bb
This diff is collapsed.
serveralternative.js
View file @ bcea13bb
This diff is collapsed.
vcm/config.json
View file @ bcea13bb
......@@ -305,7 +305,7 @@
null
],
"layerNames": [
"NAVCAR"
"CarRoute"
],
"minTop": "balloonHeight + 30",
"minLeft": "70",
......@@ -340,7 +340,7 @@
null
],
"layerNames": [
"NAVPUB"
"PublicRoute"
],
"minTop": "balloonHeight + 30",
"minLeft": "70",
......@@ -598,7 +598,7 @@
"balloonHeader": "Balloon header"
},{
"template": [
"<div class='balloon' onclick='Questionnaire()' id='myBalloonP1'>",
"<div class='balloon' onclick='Questionnaire()' id='myBalloon'>",
" <h1 class='balloon-title'>Umfrage (Böckinger Straße)</h1>",
" <div class='balloon-content' style='height:250px; margin-right: 0px;'",
" </div>",
......@@ -619,7 +619,7 @@
]
},{
"template": [
"<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloonNord'>",
"<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;'>Nordbahnhof Planungskonzept</h1>",
" <div class='balloon-content' style='margin-right: 0px;'",
......@@ -657,6 +657,37 @@
"layerNames": [
"ProjektNord"
]
},{
"template": [
"<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
"<button class='infobtn' onclick='NoiseText()'></button>",
" <h1 class='balloon-title' style='color: #FFFFFF;'>Noise Sensor</h1>",
" <div class='balloon-content' style='margin-right: 0px;'",
" </div>",
"<div class='box-3'>",
"<div class='btn btn-three' onclick='getNoiseData()'>",
"<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": [
"NoiseLocation"
]
},
{
"template": [
......@@ -1408,6 +1439,27 @@
}
},
"heightAboveGround": 0
},{
"name": "NoiseLocation",
"url": "./datasource-data/NoiseData/NoisePoint.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": [
......
vcm/css/loading.css 0 → 100644
View file @ bcea13bb
.loader {
border: 2px solid #f3f3f3;
border-radius: 50%;
border-top: 2px solid #3498db;
width: 12px;
height: 12px;
-webkit-animation: spin 2s linear infinite; /* Safari */
animation: spin 2s linear infinite;
}
/* Safari */
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(360deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.Travelpoint{
font-size: 12pt;
margin: 5px;
font-weight: bold;
}
.walkingshape {
height: 50px;
border-left-style: solid;
border-color:#1e90ff;
border-left-width: 10px;
width: 60px;
margin-left:30px;
padding-left:5px;
/* text-align: center; */
/* background-color: #1e90ff; */
}
.busshape {
height: 50px;
width: 60px;
margin-left:30px;
/* text-align: center; */
border-color: #ff8c00;
border-left-style: solid;
border-left-width: 10px;
padding-left:5px;
}
.subwayshape {
height: 50px;
width: 60px;
margin-left:30px;
/* text-align: center; */
border-color: #ff8c00;
border-left-style: solid;
border-left-width: 10px;
padding-left:5px;
}
\ No newline at end of file
vcm/css/menu.css 0 → 100644
View file @ bcea13bb
#btn_StreetDay, #btn_RailDay{
background-color: #ffcc33; /* yellow */
border: none;
color: white;
width:3.2em;
height:1.8em;
/* padding: 15px 32px; */
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
border-radius: 2px;
box-shadow: 0 8px 16px 0 rgba(255,204,51,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
}
#btn_StreetDay:hover, #btn_RailDay:hover{
background-color: #af8a1c;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
cursor: pointer;
}
#btn_StreetNight, #btn_RailNight{
background-color: #3583f8; /* yellow */
border: none;
color: white;
width:3.2em;
height:1.8em;
/* padding: 15px 32px; */
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
border-radius: 2px;
box-shadow: 0 8px 16px 0 #3583f833, 0 6px 20px 0 rgba(0,0,0,0.19);
}
#btn_StreetNight:hover, #btn_RailNight:hover{
background-color: #235fb9;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
cursor: pointer;
}
#btn_StreetOff, #btn_RailOff{
background-color: #424242; /* yellow */
border: none;
color: white;
width:2.4em;
height:1.8em;
/* padding: 15px 32px; */
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
border-radius: 2px;
box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);
}
#btn_StreetOff:hover, #btn_RailOff: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;
}
#btn_NoiseSensOn, #btn_NoiseSensOff, .btn_on, .btn_off{
background-color: #424242; /* yellow */
border: none;
color: white;
width:4em;
height:1.8em;
/* padding: 15px 32px; */
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
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{
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;
}
#tourstart-btn, #balloon-startscreen{
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
}
.btn-three{
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
}
/* .btn_home{
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
width:6em;
height:2.3em;
border-radius: 4px;
text-align: center;
margin-top: -15px;
} */
.btn_standard{
background-color: #424242; /* yellow */
border: none;
color: white;
/* padding: 15px 32px; */
text-align: center;
text-decoration: none;
display: inline-block;
border-radius: 2px;
box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);
}
.btn_standard: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;
}
\ No newline at end of file
vcm/datasource-data/NoiseData/NoisePoint.geojson 0 → 100644
View file @ bcea13bb
{"id": "LFwfxQb4d2CX8CBhL", "type": "FeatureCollection", "features":[{"type":"Feature","geometry":{"type":"Point","coordinates":[9.15884470936,48.77543604444,-0.013149800758705666]},"properties":{},"vcsMeta":{},"id":"mPWksRx2XR6bd7DQ8Ter9EPW"}],"featureType":"simple","vcsMeta": {"version":"1.0","altitudeMode":"clampToGround"}}
\ No newline at end of file
vcm/index.html
View file @ bcea13bb
......@@ -152,6 +152,8 @@
<link rel="stylesheet" href="templates/story/story.css">
<link rel="stylesheet" href="templates/cus_Menu.css">
<link rel="stylesheet" href="sources/nouislider.css">
<link rel="stylesheet" href="css/loading.css">
<!-- <link rel="stylesheet" href="css/menu.css"> -->
</head>
......@@ -179,9 +181,14 @@
</div>
<button class="accordion">Acoustics</button>
<div class="sub-menu">
<a href="#" style="margin-left:0.4rem;">Lärmkarte (Straße)</a>
<div class="switch-toggle switch-3 switch-candy">
<a><strong>Lärmkarten:</strong></a><br>
<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>
<input id="on" name="state-d" type="radio" checked="" />
<label for="on" onclick="noisemap('Streetday')">Day</label>
......@@ -191,10 +198,15 @@
<input id="off" name="state-d" type="radio" checked="checked" />
<label for="off" onclick="noisemap('offS')">OFF</label>
</div><br>
<a href="#" style="margin-left:0.4rem;">Lärmkarte (Bahn)</a>
<div class="switch-toggle switch-3 switch-candy">
</div><br> -->
<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>
<button id ="btn_NoiseSensOn" onclick="noisesens('on')">On</button>
<button id ="btn_NoiseSensOff" onclick="noisesens('off')">Off</button><br>
<!-- <div class="switch-toggle switch-3 switch-candy">
<input id="onR" name="state-d" type="radio" checked="" />
<label for="onR" onclick="noisemap('Railday')">Day</label>
......@@ -205,13 +217,16 @@
<input id="offR" name="state-d" type="radio" checked="checked" />
<label for="offR" onclick="noisemap('offR')">OFF</label>
</div>
</div> -->
</div>
<button class="accordion">Mobility</button>
<div class="sub-menu">
<a href="#" onclick="" >Bauarbeiten</a>
<div class="switch-toggle switch-3 switch-candy">
<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">
<input id="acc-on" name="state-d" type="radio" checked="" />
<label for="on" onclick="getAccidents('CONSTRUCTION')">ON</label>
......@@ -219,9 +234,11 @@
<input id="acc-off" name="state-d" type="radio" checked="true"/>
<label for="na" onclick="deleteAccidents('CONSTRUCTION')">OFF</label>
</div><br>
<a href="#" onclick="" >Straßenschließungen</a>
<div class="switch-toggle switch-3 switch-candy">
</div><br> -->
<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="" />
<label for="on" onclick="getAccidents('ROAD_CLOSURE')">ON</label>
......@@ -229,8 +246,19 @@
<input id="road-off" name="state-d" type="radio" checked="true"/>
<label for="na" onclick="deleteAccidents('ROAD_CLOSURE')">OFF</label>
</div>
<a href="#" onclick="drawFlow();" >Verkehrsflow</a>
</div> -->
<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="" />
<label for="on" onclick="drawFlow()">ON</label>
<input id="flow-off" name="state-d" type="radio" checked="true"/>
<label for="na" onclick="deleteFlow()">OFF</label>
</div> -->
</div>
<button class="accordion" onclick="Navigationshow();getPosition();" >Navigation</button>
<!-- <div class="sub-menu">
......@@ -260,9 +288,9 @@
<!--img src="images/Logo_SV.png" width="150"-->
<strong>M4_Lab</strong> <br>Platform
</h1>
<button id="tourstart-btn" onclick="stopStory(); removebuildings();getTraffic();getFlow();getFlowtest();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
<button id="tourstart-btn" onclick="stopStory(); removebuildings();" class="buttonset one"><span class="i18n_balloon_startscreen_btn">Start</span>
</button>
<!-- getNAVcar(); -->
<!-- getNAVcar(); -------Test back to start: getFlow();getFlowtest();getTraffic(); -->
</div>
<div class="dialog-image-balloon"></div>
<div class="balloon-left-edge"></div>
......@@ -271,7 +299,7 @@
<!-- Content Tour -->
<div id="tour-frame" style="display: none; overflow-y: scroll;">
<div class="tour-top-navi" style="z-index:99">
<a href="#" onclick="goHome()" id = "testing" class="top-nav buttonset one"><i class="fa fa-home"></i>Home</a>
<a href="#" onclick="goHome()" id = "testing" class=" top-nav buttonset one btn_home"><i class="fa fa-home"></i>Home</a>
<!-- <a href="#energiefahrrad" class="top-nav buttonset one"><i class="fa fa-bicycle"></i> Projekt 2</a>
<a href="#wea" class="top-nav buttonset one"><i class="fa fa-bolt"></i> Projekt 3</a>
<a href="#projects" id="back" class="top-nav buttonset one"><i class="fa fa-bolt"></i> Back to Projekt View 3</a> -->
......@@ -624,27 +652,53 @@
<div style='width:100%;margin-top:200px;' id="chartNordB"></div>
<!-- <div id="slider-color"></div> -->
</div>
<!-- ======================================================================================================================================================================== -->
<!-- Noise -->
<div id="NoiseInfo" class="SideInfo" style="display:none;">
<!-- <h1 class="sticky" id="headNoise">Lärmdaten</h1>
<br> -->
<h2>Historical Noise Data</h2>
<!-- <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>
<div style='width:100%;margin-top:200px;' id="chartNoise"></div>
<!-- <div id="slider-color"></div> -->
</div>
<!-- ======================================================================================================================================================================== -->
<!-- Navigation -->
<div id="Navigation" class="SideInfo" style="display:none;">
<h1 class="sticky" id="headNordB">Navigationsberechner</h1>
<p class="contentOne">Bitte wählen Sie einen Start und Endpunkt für ihre Route aus.</p>
<button onclick="getStart('Start');">Startpunkt</button>
<input type="text" id="Spunktlat" name="Spunktlat">
<input type="text" id="Spunktlon" name="Spunktlon"><br><br>
<!-- <button onclick="setRouteCar();">TestPunkt</button> -->
<div style="width:34em;">
<button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('Start');">Startpunkt</button>
<input style="width:12em;height:2em;" type="text" id="Spunktlat" name="Spunktlat">
<input style="width:12em;height:2em;" type="text" id="Spunktlon" name="Spunktlon"><br><br>
<button onclick="getStart('End');">Endpunkt</button>
<input type="text" id="Epunktlat" name="Epunktlat">
<input type="text" id="Epunktlon" name="Epunktlon"><br><br>
<button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('End');">Endpunkt</button>
<input style="width:12em;height:2em;" type="text" id="Epunktlat" name="Epunktlat">
<input style="width:12em;height:2em;" type="text" id="Epunktlon" name="Epunktlon"><br><br>
<!-- <select>
<option>mit Parkplatz</option>
<option>ohne Parkplatz</option>
</select> -->
<button onclick="showRoute();">Route berechnen</button>
<button onclick="drawnavcar();drawnavpub();">Route anzeigen</button>
<button onclick="deletenav();">Route löschen</button><br><br>
<button class="btn_standard" id="buttonCar" style="width:13em;height:2em;" onclick="setRouteCar();">Route berechnen (Auto)</button>
<button class="btn_standard" id="buttonPub" style="width:13em;height:2em;" onclick="setRoutePublic();">Route berechnen (Öffis)<div id="loaderPub" style="display:none;" class="loader"></div></button>
<button class="btn_standard" style="width:8em;height:2em;" onclick="deletenav();">Route löschen</button><br><br>
<p class="contentOne">Duration with Car</p>
<input type="text" id="Routeduration" name="Duration"><br>
<p class="contentOne">Duration with Public</p>
<input type="text" id="RoutedurationPub" name="Duration">
<br>
<div id="PubRouteShow" style="margin-top:1em;">
<!-- <a>Startpunkt</a>
<div class="walkingshape"></div>
<a>Endpunkt</a> -->
</div>
</div>
</div>
</div>
<div id="tour-button" title="Karte/Story umschalten">
......@@ -669,7 +723,9 @@
<script src="templates/slider.js"></script>
<script src="templates/UserBalloon.js"></script>
<script src="js/navigation.js"></script>
<script src="js/noise.js"></script>
<link href="templates/sliders.css" rel="stylesheet">
<link rel="stylesheet" href="css/menu.css">
<script>
var startVCM = function() {
......
vcm/js/here.js
View file @ bcea13bb
......@@ -62,7 +62,7 @@ function getAccidents(type){
if (type == "ROAD_CLOSURE"){
roadclose = new vcs.vcm.layer.GeoJSON({
name: "ROAD_CLOSURE",
url: "http://localhost:8083/CONSTRUCTION",
url: "http://localhost:8083/ROAD_CLOSURE",
data: geojson,
projection: {
epsg: 4326
......@@ -205,9 +205,10 @@ catch (err) {
};
function drawFlow(){
// url: "http://localhost:8083/FLOW",
flowlayer = new vcs.vcm.layer.GeoJSON({
name: "FLOW",
url: "http://localhost:8083/FLOW",
url: "http://localhost:8083/TrafficFlow",
data: geojson,
projection: {
epsg: 4326
......@@ -218,6 +219,18 @@ function drawFlow(){
framework.addLayer(flowlayer)
flowlayer.activate(true);
}
function deleteFlow(){
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){
layer.activate(false);
}
}
framework.removeLayerByName("FLOW")
}
function drawnavcar(){
var layern = ["NAVCAR"]
var layers = framework.getLayers();
......@@ -283,4 +296,387 @@ function drawnavpub(){
})
framework.addLayer(navcarlayer)
navcarlayer.activate(true);
}
//-- Set point in the map
function setPoint(location, pointd){
var datapoint = {
slat:"",
slon:"",
sloc:"",
}
datapoint.slat = pointd.lat
datapoint.slon = pointd.lon
datapoint.sloc = location
var layern = [location + "point"]
var layers = framework.getLayers();
// hide layer if it already exists
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layern.indexOf(layer.name) >= 0){
layer.activate(false);
}
}
// delete layer if it already exists
framework.removeLayerByName(location + "point")
// visualizing with vcs GeoJson function
pointlayer = new vcs.vcm.layer.GeoJSON({
name: location + "point",
url: "http://localhost:8083/addPoint?slat=" + pointd.lat + "&slon=" + pointd.lon + "&sloc=" + location,
data: geojson,
projection: {
epsg: 4326
},
altitudeMode : "relativeToGround",
style: {
image: {
icon: {
src: "./templates/locationSM.png",
scale: 0.5
}
}
},
heightAboveGround: 0
})
framework.addLayer(pointlayer)
pointlayer.activate(true);
}
// Test Funktion
function setRouteCar(){
var resetBtn = document.getElementById("buttonCar");
resetBtn.disabled = true;
resetBtn.innerHTML = '<div id="loaderCar" class="loader"></div>'
// var loaderBtn = document.getElementById("loaderCar");
// loaderBtn.display = "block";
pointsoe="";
var datapoint = {
slat:"",
slon:"",
sloc:"Start",
elat:"",
elon:"",
eloc:"End"
}
datapoint.slat = document.getElementById('Spunktlat').value
datapoint.slon = document.getElementById('Spunktlon').value
datapoint.sloc = "Start"
datapoint.elat = document.getElementById('Epunktlat').value
datapoint.elon = document.getElementById('Epunktlon').value
datapoint.eloc = "End"
var layern = ["CarRoute"]
var layers = framework.getLayers();
// hide layer if it already exists
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layern.indexOf(layer.name) >= 0){
layer.activate(false);
}
}
// delete layer if it already exists
framework.removeLayerByName("CarRoute")
// visualizing with vcs GeoJson function
pointlayer = new vcs.vcm.layer.GeoJSON({
name: "CarRoute",
url: "http://localhost:8083/Routecalc2?slat=" + datapoint.slat + "&slon=" + datapoint.slon + "&sloc=" + datapoint.sloc + "&elat=" + datapoint.elat + "&elon=" + datapoint.elon + "&eloc=" + datapoint.eloc,
data: geojson,
projection: {
epsg: 4326
},
altitudeMode : "relativeToGround",
style: {
image: {
icon: {
src: "./templates/locationSM.png",
scale: 0.5
}
}
},
heightAboveGround: 0
})
framework.addLayer(pointlayer)
pointlayer.activate(true);
// var mainlayer;
var layern = ["CarRoute"]
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])
}
console.log(test)
console.log(objectlist)
calcTime(objectlist,"Routeduration");
clearInterval(timeout);
isFinished = true;
} else{
layerData = getLayerforData("CarRoute")
}
}, 1000);
}
function setRoutePublic(){
document.getElementById("PubRouteShow").innerHTML = "";
var resetBtn = document.getElementById("buttonPub");
resetBtn.disabled = true;
resetBtn.innerHTML = '<div id="loaderCar" class="loader"></div>'
pointsoe = "";
var datapoint = {
slat:"",
slon:"",
sloc:"Start",
elat:"",
elon:"",
eloc:"End"
}
var testingThing;
datapoint.slat = document.getElementById('Spunktlat').value
datapoint.slon = document.getElementById('Spunktlon').value
datapoint.sloc = "Start"
datapoint.elat = document.getElementById('Epunktlat').value
datapoint.elon = document.getElementById('Epunktlon').value
datapoint.eloc = "End"
var layern = ["PublicRoute"]
var layers = framework.getLayers();
// hide layer if it already exists
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layern.indexOf(layer.name) >= 0){
layer.activate(false);
}
}
// delete layer if it already exists
framework.removeLayerByName("PublicRoute")
// visualizing with vcs GeoJson function
pointlayer = new vcs.vcm.layer.GeoJSON({
name: "PublicRoute",
url: "http://localhost:8083/navPublicT2?slat=" + datapoint.slat + "&slon=" + datapoint.slon + "&sloc=" + datapoint.sloc + "&elat=" + datapoint.elat + "&elon=" + datapoint.elon + "&eloc=" + datapoint.eloc,
data: testingThing,
projection: {
epsg: 4326
},
altitudeMode : "relativeToGround",
style: {
image: {
icon: {
src: "./templates/locationSM.png",
scale: 0.5
}
}
},
heightAboveGround: 0
})
framework.addLayer(pointlayer)
pointlayer.activate(true);
// --- get the Data from the geoJson
//======in progress
// var mainlayer;
var layern = ["PublicRoute"]
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])
}
console.log(test)
console.log(objectlist)
calcTime(objectlist,"RoutedurationPub");
clearInterval(timeout);
isFinished = true;
} else{
layerData = getLayerforData("PublicRoute")
}
}, 1000);
// var newmain = mainlayer.options.commonLayer.source
////["00c943b2-de4c-4898-bf4b-680b49cd0643"].I
//var testing = Object.getOwnPropertyNames(newmain.l).sort()
}
function calcTime(list,location){
var daystime = 0;
var minutestime = 0;
var secondstime = 0;
var hourstime = 0;
for (var i = 0; i< list.length; i++) {
daystime += parseFloat(list[i].I.daysDifference)
minutestime += parseFloat(list[i].I.minutesDifference)
secondstime += parseFloat(list[i].I.secondsDifference)
hourstime += parseFloat(list[i].I.hoursDifference)
if (location == "RoutedurationPub"){
if (i == 0){
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = "Startpunkt"
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
}
if (list[i].I.transportInfo.mode == "pedestrian"){
var newDiv = document.createElement("div");
newDiv.className = "walkingshape";
newDiv.innerHTML = "zu Fuß"
document.getElementById("PubRouteShow").appendChild(newDiv);
if (list[i].I.arrivalPlace.name){
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = list[i].I.arrivalPlace.name
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
}
} else if (list[i].I.transportInfo.mode == "subway"){
var newDiv = document.createElement("div");
newDiv.className = "subwayshape";
newDiv.innerHTML = "mit U-Bahn"
document.getElementById("PubRouteShow").appendChild(newDiv);
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = list[i].I.arrivalPlace.name
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
} else if (list[i].I.transportInfo.mode == "bus"){
var newDiv = document.createElement("div");
newDiv.className = "busshape";
newDiv.innerHTML = "mit Bus"
document.getElementById("PubRouteShow").appendChild(newDiv);
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = list[i].I.arrivalPlace.name
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
}else if (list[i].I.transportInfo.mode == "cityTrain"){
var newDiv = document.createElement("div");
newDiv.className = "subwayshape";
newDiv.innerHTML = "mit S-Bahn"
document.getElementById("PubRouteShow").appendChild(newDiv);
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = list[i].I.arrivalPlace.name
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
}
}
// test +=1;
// objectlist.push(layerData.l[key])
}
if (hourstime > 59) {
var days = Math.floor(hourstime / 24);
daystime += parseFloat(days);
var hours = hourstime - days * 24;
hourstime = parseFloat(hours)
}
if (minutestime > 59) {
var hours = Math.floor(minutestime / 60);
hourstime += parseFloat(hours);
var minutes = minutestime - hours * 60;
minutestime = parseFloat(minutes)
}
if (secondstime > 59) {
var minutes = Math.floor(secondstime / 60);
minutestime += parseFloat(minutes);
var seconds = secondstime - minutes * 60;
secondstime = parseFloat(seconds)
}
if (hourstime == 0){
document.getElementById(location).value = minutestime + " min " + secondstime + " sek";
} else if (daystime == 0){
document.getElementById(location).value = hourstime + " h " + minutestime + " min " + secondstime + " sek";
} else{
document.getElementById(location).value = daystime + " d " + hourstime + " h " + minutestime + " min " + secondstime + " sek";
}
if (location == "RoutedurationPub"){
var resetBtn = document.getElementById("buttonPub");
resetBtn.disabled = false;
resetBtn.innerHTML = "Route berechnen (Öffis)"
var newPoint = document.createElement("div");
newPoint.className = "Travelpoint";
newPoint.innerHTML = "Endpunkt"
// var textnode = document.createTextNode(list[i].I.arrivalPlace.name);
document.getElementById("PubRouteShow").appendChild(newPoint);
// var textnode = document.createTextNode("Endpunkt");
// document.getElementById("PubRouteShow").appendChild(textnode);
// var newDiv = document.createElement("div");
// newDiv.className = "walkingshape";
// var loaderBtn = document.getElementById("loaderPub");
// loaderBtn.display = "none";
// document.getElementById("PubRouteShow").appendChild(newDiv);
} else if (location == "Routeduration"){
var resetBtn = document.getElementById("buttonCar");
resetBtn.disabled = false;
resetBtn.innerHTML = "Route berechnen (Auto)"
// var loaderBtn = document.getElementById("loaderCar");
// loaderBtn.display = "none";
}
};
function getLayerforData(name){
var layern = [name]
var layers = framework.getLayers();
var mainlayer2
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layern.indexOf(layer.name) >= 0){
mainlayer2 = layer
return mainlayer2.options.commonLayer.source
}
}
}
\ No newline at end of file
vcm/js/navigation.js
View file @ bcea13bb
......@@ -253,13 +253,16 @@ function publictransport(){
};
function deletenav(){
var layernend = ["EndpointNav"]
document.getElementById("PubRouteShow").innerHTML = "";
document.getElementById("Routeduration").value = "";
document.getElementById("RoutedurationPub").value = "";
var layernend = ["Endpoint"]
var layernavpub = ["NAVPUB"]
var layernavpub = ["PublicRoute"]
var layern = ["Startpoint"]
var layerncar = ["NAVCAR"]
var layerncar = ["CarRoute"]
var layers = framework.getLayers();
......@@ -269,7 +272,7 @@ function deletenav(){
layer1.activate(false);
}
}
framework.removeLayerByName("NAVCAR")
framework.removeLayerByName("CarRoute")
......@@ -288,7 +291,7 @@ function deletenav(){
layer3.activate(false);
}
}framework.removeLayerByName("EndpointNav")
}framework.removeLayerByName("Endpoint")
for (var i = 0; i< layers.length; i++) {
......@@ -297,5 +300,5 @@ function deletenav(){
layer4.activate(false);
}
}
framework.removeLayerByName("NAVPUB")
framework.removeLayerByName("PublicRoute")
}
\ No newline at end of file
vcm/js/noise.js 0 → 100644
View file @ bcea13bb
function getNoiseData() {
try {
$.ajax({
type: "GET",
url: '/NoiseRealTime',
}).done(function (newdata) {
convertdata(newdata);
});
function convertdata(data) {
flow = data;
console.log(flow)
for (var i = 0; i<= flow[0].sensordatavalues.length -1; i++){
if (flow[0].sensordatavalues[i].value_type == "noise_LAeq"){
document.getElementById("noise_laeq").innerHTML = flow[0].sensordatavalues[i].value;
} else if(flow[0].sensordatavalues[i].value_type == "noise_LA_min") {
document.getElementById("noise_lamin").innerHTML = flow[0].sensordatavalues[i].value;
} else if(flow[0].sensordatavalues[i].value_type == "noise_LA_max") {
document.getElementById("noise_lamax").innerHTML = flow[0].sensordatavalues[i].value;
}
}
}
return flow
}
catch (err) {
console.log('loading Gas Values from DB failed!');
}
}
function noisemap(areatime){
var StreetD = false;
var StreetN = false;
var RailD = false;
var RailN = false;
if (areatime == "offS"){
StreetD = false;
StreetN = false;
} else if (areatime == "offR") {
RailD = false;
RailN = false;
} else if (areatime == "Streetday") {
StreetD = true;
StreetN = false;
RailD = false;
RailN = false;
} else if (areatime == "Streetnight") {
StreetD = false;
StreetN = true;
RailD = false;
RailN = false;
} else if (areatime == "Railday") {
StreetD = false;
StreetN = false;
RailD = true;
RailN = false;
} else if (areatime == "Railnight") {
StreetD = false;
StreetN = false;
RailD = false;
RailN = true;
}
var layerStreetD = ["Streetday"]
var layerStreetN = ["Streetnight"]
var layerRailD = ["Railday"]
var layerRailN = ["Railnight"]
var layers = framework.getLayers();
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layerStreetD.indexOf(layer.name) >= 0){
layer.activate(StreetD);
} else if (layerStreetN.indexOf(layer.name) >= 0){
layer.activate(StreetN);
} else if (layerRailD.indexOf(layer.name) >= 0){
layer.activate(RailD);
} else if (layerRailN.indexOf(layer.name) >= 0){
layer.activate(RailN);
}
}
}
function noisesens(status){
var layerOn = ["NoiseLocation"]
var layers = framework.getLayers();
for (var i = 0; i< layers.length; i++) {
var layer = layers[i];
if(layerOn.indexOf(layer.name) >= 0){
if(status == "on"){
layer.activate(true);
} else if (status == "off"){
layer.activate(false);
}
}
}
}
let histNoise
function HistNoiseData() {
try {
$.ajax({
async: false,
type: "POST",
url: '/getNoiseHist',
data: "",
}).done(function (histwinddata) {
convertdata(histwinddata);
});
function convertdata(histwinddt) {
histNoise = histwinddt;
showgraphNoise();
}
console.log(histNoise[0]);
}
catch (err) {
console.log('-> function gethistWind() failed!\n' + err);
}
}
function showgraphNoise(){
var i;
var noise_LA_max = 0
var noise_LA_maxnumb = 0
var noise_LA_min = 0
var noise_LAeq = 0
var datas = []
var datasMin = []
var dataseq = []
console.log(histNoise.length)
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)
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)
} else if (noise_LA_maxnumb != 0){
var valuestuff = noise_LA_max / noise_LA_maxnumb
var valuemin = noise_LA_min / noise_LA_maxnumb
var valueeq = noise_LAeq / noise_LA_maxnumb
console.log(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate())
datas.push({x: new Date(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate()).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))})
dataseq.push({x: new Date(sDay.getFullYear() +"-"+(parseInt(sDay.getMonth()) + 1 )+"-"+sDay.getDate()).getTime(), y: parseFloat(valueeq.toFixed(2))})
noise_LA_max = 0
noise_LA_min = 0
noise_LAeq = 0
noise_LA_maxnumb = 0
}
sDay = new Date(histNoise[i].timestamp)
}
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_LA_max',
data: datas
}, {
name: 'Noise_LAeq',
data: dataseq
}, {
name: 'Noise_LA_min',
data: datasMin
}],
markers: {
size: 0,
strokeColor: "#fff",
strokeWidth: 3,
strokeOpacity: 1,
fillOpacity: 1,
hover: {
size: 6
}
},
xaxis: {
type: "datetime",
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 MMM yyyy"
},
},
legend: {
position: 'top',
horizontalAlign: 'left'
},
fill: {
type: 'gradient',
gradient: {
shadeIntensity: 1,
inverseColors: false,
opacityFrom: 0.5,
opacityTo: 0,
stops: [0, 90, 100]
},
}
};
document.getElementById("chartNoise").innerHTML = "";
var chart = new ApexCharts(document.querySelector("#chartNoise"), options);
chart.render();
}
function sameDay(d1, d2) {
return d1.getFullYear() === d2.getFullYear() &&
d1.getMonth() === d2.getMonth() &&
d1.getDate() === d2.getDate();
}
\ No newline at end of file
vcm/templates/UserBalloon.js
View file @ bcea13bb
This diff is collapsed.
vcm/templates/custom.js
View file @ bcea13bb
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal