tvolkmann/gyrogpsc
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Wiki Activity

add function to ignore 0 Values

Browse Source
This commit is contained in:
unknown 2020-12-15 13:29:05 +01:00
parent 26014b0c34
commit 379d174f2b
3 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
static/scripts/map.js
View File

@ -29,14 +29,6 @@ var emptySERIAL = {
} }
map.on('load', function () { map.on('load', function () {
// save full coordinate list for later
//var coordinates = data.features[0].geometry.coordinates;
// start by showing just the first coordinate
//data.features[0].geometry.coordinates = [coordinates[0]];
// add it to the map
//map.addSource('trace', { type: 'geojson', data: data });
map.addSource('routeTCP', { 'type': 'geojson', 'data': emptyTCP }) map.addSource('routeTCP', { 'type': 'geojson', 'data': emptyTCP })
map.addSource('routeSERIAL', { 'type': 'geojson', 'data': emptySERIAL }) map.addSource('routeSERIAL', { 'type': 'geojson', 'data': emptySERIAL })
@ -70,21 +62,26 @@ map.on('load', function () {
}); });
map.jumpTo({ 'center': [9.19640999, 49.12283027], 'zoom': 17 }); map.jumpTo({ 'center': [9.19640999, 49.12283027], 'zoom': 6 });
map.setPitch(30); map.setPitch(30);
var stateLegendEl = document.getElementById('state-legend'); var stateLegendEl = document.getElementById('state-legend');
stateLegendEl.style.display = 'block'; stateLegendEl.style.display = 'block';
}) })
function updateMapTCP (long, lat) { function updateMap (TCPlong, TCPlat, SERIALlong, SERIALlat) {
emptyTCP.features[0].geometry.coordinates.push([long, lat]); emptyTCP.features[0].geometry.coordinates.push([TCPlong, TCPlat]);
map.getSource('routeTCP').setData(emptyTCP); map.getSource('routeTCP').setData(emptyTCP);
map.panTo([long, lat]); emptySERIAL.features[0].geometry.coordinates.push([SERIALlong, SERIALlat]);
}
function updateMapSERIAL (long, lat) {
emptySERIAL.features[0].geometry.coordinates.push([long, lat]);
map.getSource('routeSERIAL').setData(emptySERIAL); map.getSource('routeSERIAL').setData(emptySERIAL);
//map.panTo([long, lat]); if (!([TCPlong, TCPlat] = [0,0])) {
map.panTo({ 'center': [TCPlong, TCPlat], 'zoom': 17 });
}
else if (!([SERIALlong, SERIALlat] = [0,0])) {
map.panTo({ 'center': [SERIALlong, SERIALlat], 'zoom': 17 });
}
else {
map.jumpTo({ 'center': [9.19640999, 49.12283027], 'zoom': 6 });
}
} }

6
static/scripts/websocket.js
View File

@ -32,11 +32,11 @@ window.addEventListener("load", function(evt) {
} }
ws.onmessage = function(evt) { ws.onmessage = function(evt) {
//print2("RESPONSE: " + evt.data); //print2("RESPONSE: " + evt.data);
dataSmartphone.push(evt.data)
// let dat = JSON.parse(evt.data)["bmi26x gyroscope"] // let dat = JSON.parse(evt.data)["bmi26x gyroscope"]
// let dat = JSON.parse(evt.data)["lsm6dsm gyroscope"] // let dat = JSON.parse(evt.data)["lsm6dsm gyroscope"]
//let dat = JSON.parse(evt.data)["lsm6ds3c gyroscope"] //let dat = JSON.parse(evt.data)["lsm6ds3c gyroscope"]
let dat = JSON.parse(evt.data) let dat = JSON.parse(evt.data)
dataSmartphone.push(dat)
//console.log(evt.data) //console.log(evt.data)
console.log("JSON geparsed onmessage", dat) console.log("JSON geparsed onmessage", dat)
//console.log(dat.SOURCE_TCP.Orientation) //console.log(dat.SOURCE_TCP.Orientation)
@ -62,9 +62,7 @@ window.addEventListener("load", function(evt) {
// addData(orientation[0] / multiplier) // addData(orientation[0] / multiplier)
*/ */
addData(dat.SOURCE_TCP.Orientation[0]) addData(dat.SOURCE_TCP.Orientation[0])
updateMapTCP(dat.SOURCE_TCP.Position[1], dat.SOURCE_TCP.Position[0]) updateMap(dat.SOURCE_TCP.Position[1], dat.SOURCE_TCP.Position[0], dat.SOURCE_SERIAL.Position[1], dat.SOURCE_SERIAL.Position[0])
updateMapSERIAL(dat.SOURCE_SERIAL.Position[1], dat.SOURCE_SERIAL.Position[0])
//updateMap(dat.SOURCE_SERIAL.Position[1], dat.SOURCE_SERIAL.Position[0])
// addData(dat[0]) // addData(dat[0])
//document.getElementById("gyroscope").style.transform = `rotateX(${-orientation[0]}deg) rotateY(${orientation[1]}deg) rotateZ(${-orientation[2]}deg) translateZ(50px)` //document.getElementById("gyroscope").style.transform = `rotateX(${-orientation[0]}deg) rotateY(${orientation[1]}deg) rotateZ(${-orientation[2]}deg) translateZ(50px)`

18
templates/index.html
View File

@ -58,16 +58,16 @@
height: 200px; height: 200px;
position: relative; position: relative;
transform-style: preserve-3d; transform-style: preserve-3d;
/*transform: translateZ(-100px);*/ transform: translateZ(-100px);
/*transition: transform 25ms;*/ transition: transform 25ms;
} }
.cube.show-front { transform:/*translateZ(-100px)*/ rotateY( 0deg); } .cube.show-front { transform:translateZ(-100px) rotateY( 0deg); }
.cube.show-right { transform:/*translateZ(-100px)*/ rotateY( -90deg); } .cube.show-right { transform:translateZ(-100px) rotateY( -90deg); }
.cube.show-back { transform:/*translateZ(-100px)*/ rotateY(-180deg); } .cube.show-back { transform:translateZ(-100px) rotateY(-180deg); }
.cube.show-left { transform:/*translateZ(-100px)*/ rotateY( 90deg); } .cube.show-left { transform:translateZ(-100px) rotateY( 90deg); }
.cube.show-top { transform:/*translateZ(-100px)*/ rotateX( -90deg); } .cube.show-top { transform:translateZ(-100px) rotateX( -90deg); }
.cube.show-bottom { transform:/*translateZ(-100px)*/ rotateX( 90deg); } .cube.show-bottom { transform:translateZ(-100px) rotateX( 90deg); }
.cube__face { .cube__face {
position: absolute; position: absolute;
@ -102,7 +102,7 @@
<table style="font-size: small"> <table style="font-size: small">
<tr> <tr>
<td valign="top" width="50%"> <td valign="top" width="50%">
<p>Click "Open" to create a connection to the server. <p>Click "Open" to create a connection to the server. {{.}}
</p> </p>
<form> <form>
<button id="open">Verbinden</button> <button id="open">Verbinden</button>