Merge branch 'hotfix-0.5.1'

README.md

@@ -1,5 +1,5 @@
 # Tracman
-###### v 0.5.0
+###### v 0.5.1
 
 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
 
+#### v 0.5.1
+
+* Fixed broken controls
+
 #### v0.5.0
 
 * Updated libraries

package.json

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

views/map.html

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