fix: live_map v2.1.1 intergration

This fixes varrious stuff so that it can work with v2.1.1 of live_map

Author: TGRHavoc

index.php

@@ -162,10 +162,12 @@
                       <a id="showBlips" href="#">Show Blips <span id="blips_enabled" class="label label-success pull-right">on</span></a>
                   </li>
 
+                  <!--
                   <li>
                       <a id="toggleLive" href="#">Live update <span id="live_enabled" class="label label-danger pull-right">off</span></a>
                   </li>
-
+                  -->
+                  
                   <li>
                       <a id="reconnect" href="#">Connect <span id="connection" class="label label-danger pull-right">disconnected</span></a>
                   </li>

js/src/controls.js

@@ -28,7 +28,10 @@ $(document).ready(function(){
 
     $("#refreshBlips").click(function(e){
         e.preventDefault();
-        webSocket.send("getBlips");
+        if (_showBlips){
+            clearAllMarkers();
+            initBlips();
+        }
     });
 
     $("#showBlips").click(function(e){
@@ -50,25 +53,4 @@ $(document).ready(function(){
         $("#connection").removeClass("label-success").removeClass("label-danger").addClass("label-warning").text("reconnecting");
         connect();
     });
-
-    $("#toggleLive").click(function(e){
-        e.preventDefault();
-        if(!_isConnected){
-            // Not connected
-            return;
-        }
-
-        _isLive = !_isLive;
-
-        $("#live_enabled").removeClass("label-success").removeClass("label-danger")
-            .addClass( _isLive ? "label-success" : "label-danger")
-            .text(_isLive ? "on" : "off");
-
-        if (_isLive){
-            _invervalId = setInterval(function(){ webSocket.send("getPlayerData"); }, 250);
-        }else{
-            clearInterval(_invervalId);
-        }
-
-    });
 });

js/src/init.js

@@ -5,6 +5,7 @@ var _blipCount = 0;
 var _showBlips = true;
 var _isConnected = false;
 var _trackPlayer = null;
+var playerCount = 0;
 
 function globalInit() {
     mapInit("map-canvas");

js/src/socket.js

@@ -24,7 +24,8 @@ function onOpen(e){
     _isConnected = true;
     console.log("_isConnected: " + _isConnected);
 
-    webSocket.send("getPlayerData"); // Get any players connected to the server
+    // New websocket server doesn't need to recieve this
+    //webSocket.send("getPlayerData"); // Get any players connected to the server
 
     $("#connection").removeClass("label-danger")
         .removeClass("label-warning")
@@ -87,20 +88,13 @@ function onError(e){
 
     //$("#socket_error").text(reason);
     console.log("Socket error: " + reason);
-    if (_isLive){
-        clearInterval(_invervalId);
-    }
-
 }
 function onClose(e){
     $("#connection").removeClass("label-success")
         .removeClass("label-warning")
         .addClass("label-danger").text("disconnected");
 
     _isConnected = false;
-    if (_isLive){
-        clearInterval(_invervalId);
-    }
 }
 
 var localCache = {};
@@ -114,12 +108,15 @@ function playerLeft(playerName){
     if ($("#playerSelect option[value='" + playerName + "']").length > 0){
         $("#playerSelect option[value='" + playerName + "']").remove();
     }
+
+    playerCount --;
+    $("#player_count").text(playerCount);
 }
 
 function getPlayerInfoHtml(plr){
     var html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + plr.pos.x.toFixed(4) + "} Y {" + plr.pos.y.toFixed(4) + "} Z {" + plr.pos.z.toFixed(4) + "}</div>"
     for(var key in plr){
-        console.log("found key: "+ key);
+        //console.log("found key: "+ key);
         if (key == "name" || key == "pos" || key == "icon"){ // I should probably turn this into a array or something
             continue; // We're already displaying this info
         }
@@ -136,10 +133,10 @@ function getPlayerInfoHtml(plr){
 
 function doPlayerUpdate(players){
     console.log(players);
-    var playerCount = 0;
+    var _pc = 0;
     players.forEach(function(plr){
-        playerCount ++;
-        if (plr == null) return;
+        _pc ++;
+        if (plr == null || plr.name == undefined || plr.name == "") return;
 
         if ( !(plr.identifer in localCache) ){
             // "localCache" literally just keeps track of the marker.. I should rename it
@@ -164,7 +161,7 @@ function doPlayerUpdate(players){
             // If we have a custom icon (we should) use it!!
             if (plr.icon){
                 var t = MarkerTypes[plr.icon];
-                console.log("Got icon of :" + plr.icon);
+                //console.log("Got icon of :" + plr.icon);
                 _MAP_markerStore[localCache[plr.identifer].marker].setIcon({
                     url: _MAP_iconURL + t.icon,
                     size: t.size,
@@ -203,6 +200,7 @@ function doPlayerUpdate(players){
 
     });
 
-    console.log("Playercount: " + playerCount);
-    $("#player_count").text(playerCount);
+    console.log("Playercount: " + _pc);
+    $("#player_count").text(_pc);
+    playerCount = _pc;
 }