ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed update time/speed/altitude not updating

master
Keith Irwin 2017-04-26 23:00:50 -04:00
parent dc11bdd271
commit 4421b35ba6
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
static/js/map.js
View File

@ -23,7 +23,7 @@ function onConnect(socket,userid,mapuserid) {
console.log("🚹 Receiving updates for",mapuserid); console.log("🚹 Receiving updates for",mapuserid);
// Can set location too // Can set location too
if (mapuserid==userid) { if (mapuserid===userid) {
socket.emit('can-set', userid ); socket.emit('can-set', userid );
console.log("🚹 Sending updates for",userid); console.log("🚹 Sending updates for",userid);
} }
@ -75,9 +75,10 @@ $(function() {
// Google maps API callback // Google maps API callback
window.gmapsCb = function() { window.gmapsCb = function() {
//console.log("gmapsCb() called");
// Make sure everything's ready... // Make sure everything's ready...
waitForElements([mapuser,disp,noHeader], function() { waitForElements([mapuser,disp,noHeader], function() {
//console.log("gmapsCb() called");
// Create map // Create map
if (disp!=='1') { if (disp!=='1') {
@ -145,8 +146,8 @@ window.gmapsCb = function() {
// Create altitude block // Create altitude block
if (mapuser.settings.showAlt) { if (mapuser.settings.showAlt) {
//console.log("Creating altitude sign..."); //console.log("Creating altitude sign...");
var elevator = new google.maps.ElevationService; const elevator = new google.maps.ElevationService,
const altitudeSign = document.createElement('div'), altitudeSign = document.createElement('div'),
altitudeLabel = document.createElement('div'), altitudeLabel = document.createElement('div'),
altitudeText = document.createElement('div'), altitudeText = document.createElement('div'),
altitudeUnit = document.createElement('div'); altitudeUnit = document.createElement('div');
@ -175,29 +176,53 @@ window.gmapsCb = function() {
} }
}); });
}; };
// Get location // Got location
socket.on('get', function(loc) { socket.on('get', function(loc) {
console.log("🌐️ Got location:",loc.lat+", "+loc.lon);
// Parse location
loc = parseLoc(loc); loc = parseLoc(loc);
// Update street view // Update map
if (disp!=='0' && mapuser.settings.showStreetview) { if (disp!=='1') {
$('.tim').text('location updated '+loc.time);
if (mapuser.settings.showSpeed) { $('.spd').text(loc.spd.toFixed()); } // Update time
$('#timestamp').text('location updated '+loc.time);
// Show or hide map
toggleMaps(loc);
// Update marker and map center
map.setCenter({ lat:loc.lat, lng:loc.lon });
marker.setPosition({ lat:loc.lat, lng:loc.lon });
// Update speed
if (mapuser.settings.showSpeed) {
$('#spd').text( loc.spd.toFixed() );
}
// Update altitude
if (mapuser.settings.showAlt) { if (mapuser.settings.showAlt) {
getAltitude({lat:loc.lat,lng:loc.lon}, elevator, function(alt) { getAltitude({
if (alt) { $('.alt').text((mapuser.settings.units=='standard')?(alt*3.28084).toFixed():alt.toFixed()); } lat:loc.lat,
lng:loc.lon
}, elevator, function(alt) {
if (alt) {
$('#alt').text( (mapuser.settings.units=='standard')?(alt*3.28084).toFixed():alt.toFixed() );
}
}); });
} }
toggleMaps(loc);
map.setCenter({lat:loc.lat,lng:loc.lon}); }
marker.setPosition({lat:loc.lat,lng:loc.lon});
// Update street view
if (disp!=='0' && mapuser.settings.showStreetview) {
updateStreetView(loc,10); updateStreetView(loc,10);
} }
console.log("🌐️ Got location:",loc.lat+", "+loc.lon);
}); });
// Check altitude // Check altitude