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

Merge branch 'hotfix-0.5.1'

master
Keith Irwin 2017-03-18 03:46:20 -04:00
parent 9f882c1dea d4684cda1e
commit 1b0123631f
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,5 +1,5 @@
# Tracman # Tracman
###### v 0.5.0 ###### v 0.5.1
node.js application to display a map with user's location. node.js application to display a map with user's location.
@ -20,6 +20,10 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
## Changelog ## Changelog
#### v 0.5.1
* Fixed broken controls
#### v0.5.0 #### v0.5.0
* Updated libraries * Updated libraries

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "tracman", "name": "tracman",
"version": "0.5.0", "version": "0.5.1",
"description": "Tracks user's GPS location", "description": "Tracks user's GPS location",
"main": "server.js", "main": "server.js",
"dependencies": { "dependencies": {

11
views/map.html
View File

@ -281,12 +281,11 @@
lon: pos.coords.longitude, lon: pos.coords.longitude,
spd: (pos.coords.speed||0) spd: (pos.coords.speed||0)
} }
socket.broadcast.emit('app', newloc); socket.emit('set', newloc);
toggleMaps(newloc); toggleMaps(newloc);
}, function(err) { }, function(err) {
if (err) { if (err) {
alert("Unable to set location."); alert("Unable to set location.");
io.emit('log',err.message);
console.error(err.message); } console.error(err.message); }
else { else {
//console.log('Set position',pos); //console.log('Set position',pos);
@ -318,12 +317,14 @@
lon: pos.coords.longitude, lon: pos.coords.longitude,
spd: (pos.coords.speed||0) spd: (pos.coords.speed||0)
}; };
socket.broadcast.emit('app',newloc); socket.emit('set',newloc);
toggleMaps(newloc); toggleMaps(newloc);
}, function(err){ }, function(err){
if (err) { if (err) {
alert("Unable to track location."); alert("Unable to track location.");
console.log(err.message); console.error(err.message);
} else {
// console.log('Tracking position...');
} }
}, { enableHighAccuracy:true }); }, { enableHighAccuracy:true });
} }
@ -346,7 +347,7 @@
usr: userid, usr: userid,
lat:0, lon:0, spd:0 lat:0, lon:0, spd:0
} }
socket.broadcast.emit('app',newloc); socket.emit('set',newloc);
toggleMaps(newloc); toggleMaps(newloc);
} }
} }