changeset 270:561640ed2204 gmap2

Improve player position handling.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 13 Apr 2014 23:48:07 +0300
parents ce747cd9ec59
children 1359bc5c53e0
files map.js
diffstat 1 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/map.js	Sun Apr 13 23:41:40 2014 +0300
+++ b/map.js	Sun Apr 13 23:48:07 2014 +0300
@@ -1,12 +1,6 @@
 // $Id: map.js 2404 2009-12-24 20:01:32Z jeskko $
 
-var pmapBaseURL;
-var pmap;
-var pmapCanvas;
-
-var pmapPlrPrevPos = {"x": 8192, "y": 8192};
-var pmapPlrMarker;
-var pmapUpdateTime, pmapUpdateDelay;
+var pmap, pmapBaseURL, pmapCanvas;
 
 var pmapTileSize = 256;
 var pmapTileOrig = pmapTileSize / 2.0;
@@ -14,6 +8,11 @@
 var pmapTilePxPerRad = pmapTileSize / (2.0 * Math.PI);
 
 
+var pmapPlrPrevPos = {"x": 8192, "y": 8192};
+var pmapPlrMarker, pmapPlrToken, pmapPlrName;
+var pmapUpdateTime, pmapUpdateDelay;
+
+
 function pmapMinMax(vval, vmin, vmax)
 {
   return Math.min(Math.max(vval, vmin), vmax);
@@ -116,7 +115,7 @@
       });
     }
 
-    if ("token" in args && args.token != "")
+    if ("token" in args && args.token != "" && "name" in args && args.name != "")
     {
       // Create player position marker
       pmapPlrMarker = new google.maps.Marker(
@@ -129,7 +128,8 @@
       if (!posSet)
         pmap.setZoom(9);
 
-      pmapToken = args.token;
+      pmapPlrToken = args.token;
+      pmapPlrName = args.name;
       pmapUpdateTime = Date.now();
       pmapUpdateDelay = 0;
       pmapUpdatePID = setInterval("pmapUpdatePlayerPosition()", 500);
@@ -198,11 +198,10 @@
 
 function pmapUpdatePlayerPosition()
 {
-  if (pmapToken && Date.now() - pmapUpdateTime >= pmapUpdateDelay)
+  if (Date.now() - pmapUpdateTime >= pmapUpdateDelay)
   {
     pmapUpdateTime = Date.now();
-//    XDownloadUrl("http://www.bat.org/playerpos.php?token="+pmapToken,
-    XDownloadUrl("http://tnsp.org/gmapng/playerpos.php?token="+pmapToken,
+    XDownloadUrl("http://tnsp.org/gmapng/playerpos.php?name="+pmapPlrName+"&token="+pmapPlrToken,
     function(data, responseCode)
     {
       if (typeof(data) == "string")