Merge branch 'master' into feature-lookangles

* master:
  fix locate-me marker's anchor to be at the bottom
  use panTo() to pan after update
  facepalm, im an idiot

Author: rossengeorgiev

js/tracker.js

@@ -32,6 +32,7 @@ var notamOverlay = null;
 var Z_RANGE = 1;
 var Z_STATION = 2;
 var Z_PATH = 10;
+var Z_ME = 11;
 var Z_SHADOW = 1000000;
 var Z_CAR = 1000001;
 var Z_PAYLOAD = 1000002;
@@ -1189,9 +1190,9 @@ function updateCurrentPosition(lat, lon) {
                 url: "img/marker-you.png",
                 size: new google.maps.Size(21,50),
                 scaledSize: new google.maps.Size(21,50),
-                anchor: new google.maps.Point(10,25)
+                anchor: new google.maps.Point(10,50)
             },
-            zIndex: Z_CAR,
+            zIndex: Z_ME,
             position: latlng,
             map: map,
             optimized: false,
@@ -1382,10 +1383,9 @@ function update(response) {
       // store in localStorage
       offline.set('positions', lastPositions);
 
-	  if(follow_vehicle != -1) {
-	  	var pos = vehicles[follow_vehicle].curr_position;
-	  	map.panTo(new google.maps.LatLng(pos.gps_lat, pos.gps_lon));
-	  }
+      if(follow_vehicle != -1) {
+          panTo(follow_vehicle);
+      }
   }
 
   if (got_positions && !zoomed_in) {