fix: 'show blips' button breaks

The toggle was using the old structure for the blips, forgot to update it. Now it works :)

closes #8

Author: TGRHavoc

CHANGELOG.rst

@@ -2,11 +2,23 @@ Changelog
 =========
 
 
+v2.2.1 (02-11-2017)
+-------------------
+- Fix #8 "Show blips toggle breaks" [Jordan Dalton]
+
+  The toggle was using the old structure for the blips, forgot to update it. Now it works :)
+- Merge branch 'develop' [Jordan Dalton]
+
+
 v2.2.0 (30-10-2017)
 -------------------
 
 Changes
 ~~~~~~~
+- Update version.json. [Jordan Dalton]
+
+  Don't know why socket.js is in here but, apparently I foorgot to commit some changes.
+- Update changelog. [Jordan Dalton]
 - Update coordinates to 2dp. [Jordan Dalton]
 
   Player coordinates are now 2dp like other markers.
@@ -29,6 +41,7 @@ Changes
 
 Other
 ~~~~~
+- Merge branch 'feature/live_blips' into develop. [Jordan Dalton]
 - Add blip socket commands. [Jordan Dalton]
 
   Blips can now be added/updated and removed from the map from the socket server.

js/src/controls.js

@@ -19,11 +19,19 @@
 function toggleBlips(){
     console.log("showing local blips");
     if (_showBlips){
-        _blips.forEach(function(blip){
-            var desc = blip.description == undefined ? "" : blip.description;
-            var obj = new MarkerObject(blip.name, new Coordinates(blip.x, blip.y, blip.z), MarkerTypes[blip.type], desc, "", "");
-            createMarker(false, false, obj, "");
-        });
+
+        for(var spriteId in _blips){
+            var blipArray = _blips[spriteId];
+
+            for(var i in blipArray){
+                var blip = blipArray[i];
+
+                var obj = new MarkerObject(blip.name, new Coordinates(blip.pos.x, blip.pos.y, blip.pos.z), MarkerTypes[blip.type], blip.description, "", "");
+                blip.markerId = createMarker(false, false, obj, "") - 1;
+
+            }
+        }
+
     }else{
         clearAllMarkers();
     }

js/src/init.js

@@ -93,7 +93,7 @@ function createBlip(blip){
     }
 
     blip.markerId = createMarker(false, false, obj, "") - 1;
-
+    
     _blips[blip.type].push(blip);
     _blipCount++;
 }
@@ -113,7 +113,7 @@ function blipSuccess(data, textStatus){
             for (var i in blipArray) {
                 var blip = blipArray[i];
                 var fallbackName = (MarkerTypes[spriteId] != undefined && MarkerTypes[spriteId].hasOwnProperty("name")) ? MarkerTypes[spriteId].name : "Unknown Name... Please make sure the sprite exists.";
-                
+
                 blip.name = (blip.hasOwnProperty("name") || blip.name != null) ? blip.name : fallbackName;
                 blip.description = (blip.hasOwnProperty("description") || blip.description != null) ? blip.description : "";
 

js/src/socket.js

@@ -80,11 +80,11 @@ function onMessage(e){
         updateBlip(data.payload);
 
     }else if (data.type == "playerData") {
-        console.log("updating players: " + JSON.stringify(data));
+        //console.log("updating players: " + JSON.stringify(data));
         doPlayerUpdate(data.payload);
 
     }else if(data.type == "playerLeft"){
-        console.log("player left:" + data.payload);
+        //console.log("player left:" + data.payload);
         playerLeft(data.payload);
     }
 }

version.json

@@ -1,3 +1,3 @@
 {
-  "interface" : "2.2.0"
+  "interface" : "2.2.1"
 }