Merge branch 'release/1.0.5'

Author: rcreasey

app/js/AdvisoryList.js

@@ -0,0 +1,36 @@
+var AdvisoryList = {
+  types: ['Wormhole Detected', 
+  'Hostile Cloaked',
+  'Hostile Logged Off',
+  'Undock Camped',
+  'Gate Bubbled'], 
+  
+  clear: function () {
+    log('Clearing advisory list...');
+    Data.advisories = {};
+  },
+  
+  lookup: function(systemId) {
+    var advisories = $.map(AdvisoryList.types, function(t) {
+      var a = {type: t, systemId: systemId}
+      
+      if ($.inArray(t, Data.advisories[systemId]) !== -1) a.present = true;
+      
+      return a;
+    })
+    
+    return advisories;
+  },
+  
+  addAdvisory: function(advisory) {
+    if (! (Data.advisories[advisory.systemId] instanceof Array)) Data.advisories[advisory.systemId] = new Array;
+    Data.advisories[advisory.systemId].push(advisory.type);
+    
+    $.unique(Data.advisories[advisory.systemId]);
+  },
+  
+  clearAdvisory: function (advisory) {
+    Data.advisories[advisory.systemId] = $.grep(Data.advisories[advisory.systemId], function(t) { return t != advisory.type });
+  }, 
+
+}

app/js/Data.js

@@ -1,5 +1,6 @@
 var Data = {
 
+  advisories: [],
   members: [],
   hostiles: [],
   events: [],
@@ -10,7 +11,7 @@ var Data = {
     domain: 'https://standing-fleet.apps.goonswarm.org/',
     apiUrl: '/api',
     alertStay: 5000,
-    pollInterval: 7000,
+    pollInterval: 5000,
     maxEvents: 20,
     maxScans: 20,
     uiSpeed: 400,

app/js/EventHandler.js

@@ -30,7 +30,8 @@ var EventHandler = {
         delete event.blink;
       }
 
-      if (event.suppress !== true) EventList.addEvent(event);;      
+      if (Util.dedupe(Data.events, event, 'text')) event.suppress = true;
+      if (event.suppress !== true) EventList.addEvent(event); 
     });
   },
 
@@ -149,7 +150,23 @@ var EventHandler = {
           + target.characterId + ');">' + target.characterName + '</a> has moved into '
           + '<a href="javascript:CCPEVE.showInfo(5, ' + target.systemId + ');">'
           + target.systemName + '</a>';
-
+          
+      } else if (event.type === 'addAdvisory') {
+        var advisory = event.data;
+        event.text = 'Advisory issued for '
+          + '<a href="javascript:CCPEVE.showInfo(5, ' + advisory.systemId + ');">'
+          + Data.systems[advisory.systemId].name + '</a>: '
+          + advisory.type;
+        event.alert = true;
+      
+      } else if (event.type === 'clearAdvisory') {
+        var advisory = event.data;
+        event.text = 'Advisory cleared for '
+          + '<a href="javascript:CCPEVE.showInfo(5, ' + advisory.systemId + ');">'
+          + Data.systems[advisory.systemId].name + '</a>: '
+          + advisory.type;
+        event.alert = true;
+          
       } else if (event.type === 'sourcedClear') {
         var report = event.data;
         event.text = 'Intel channel reported '
@@ -222,6 +239,18 @@ var EventHandler = {
     SystemMap.refreshSystems();
   },
 
+  addAdvisory: function(advisory) {
+    AdvisoryList.addAdvisory(advisory);
+    SystemMap.refreshSystems();
+    SystemMap.updateInfo(Data.systems[advisory.systemId].name);
+  },
+  
+  clearAdvisory: function(advisory) {
+    AdvisoryList.clearAdvisory(advisory);
+    SystemMap.refreshSystems();    
+    SystemMap.updateInfo(Data.systems[advisory.systemId].name);
+  },
+
   reportClear: function (system) {
     HostileList.clearBySystem(system.systemId);
     HostileList.sortAndRenderAll();
@@ -284,6 +313,11 @@ var EventHandler = {
     SystemMap.init();
   },
 
+  statusAdvisories: function (advisories) {
+    advisories.forEach(AdvisoryList.addAdvisory);
+    SystemMap.refreshSystems();
+  },
+
   statusEvents: function (events) {
     EventHandler.dispatchEvents(events, true);
   },

app/js/Main.js

@@ -232,6 +232,25 @@ function submitHostileDetails(key, id, name, shipType, shipName) {
   });
 }
 
+function reportAdvisory(button, systemId, type) {
+  var state = ! $( button ).hasClass('present');
+  var advisory = {systemId: systemId, type: type, state: state};
+  
+  $(button).removeAttr('onclick');
+  
+  Server.postAdvisory(advisory, function(error, data) {
+    if (error) {
+      handleError(error);
+      return;
+    }
+    
+    EventList.addEvent({type: 'info', alert: true, text: 'Advisory reported on ' +
+                                            '<a href="javascript:CCPEVE.showInfo(5, ' + systemId + ')">' +
+                                            Data.systems[systemId].name + '</a> by you.' 
+    });
+  });
+}
+
 function leaveFleet() {
   UIPanels.showLoadingPanel('Leaving Standing Fleet...', function () {
     Server.leaveFleet(function(error, data) {

app/js/Server.js

@@ -98,6 +98,10 @@ var Server = {
     Server.ajaxPost('/fleets/status', statusData , callback);
   },
 
+  postAdvisory: function(advisoryData, callback) {
+    Server.ajaxPost('/fleets/advisory', advisoryData , callback);
+  },
+  
   postDetails: function(detailsData, callback) {
     Server.ajaxPost('/fleets/details', detailsData, callback);
   }

app/js/SystemMap.js

@@ -151,6 +151,16 @@ var SystemMap = {
           .attr("y", 10)
           .text(function(n) { return n.system.name; });
 
+        node_groups.append("text")
+          .attr("class", "advisories")
+          .attr("text-anchor", "middle")
+          .attr("alignment-baseline", "middle")
+          .attr("x", rect_width / 2)
+          .attr("y", -10)
+          .text(function(n) {
+            return UI.advisoryUnicode( Data.advisories[n.system.id] );
+          });
+        
         node_groups.on('click', function(n) {
           SystemMap.updateInfo( n.system.name );
         });
@@ -304,19 +314,20 @@ var SystemMap = {
     Server.ajaxGet('/map/system/' + system_name, function(error, results) {
       if (results === null) return;
       var system = { name: results.name,
+                     systemId: results.id,
                      region: Data.regions[ results.regionID ].name,
                      hostile_count: SystemMap.hostile_count( results ),
                      faded_count: SystemMap.faded_count( results ),
                      gates: $.map( results.jumps, function(j) { return Data.systems[ j.to ]})
       }
 
       system.last_report = (results.reports.length) ? moment(results.reports.pop().ts).format('HH:MM:SS') : 'Never';
-
-      Data.ui.mapInfo.html( $(Data.templates.system_info(system)) )
-      $('#system-info dl')
-        .fadeIn(Data.config.uiSpeed)
-        .delay(Data.config.alertStay)
-        .fadeOut(Data.config.uiSpeed * 5);
+      system.advisories = AdvisoryList.lookup(results.id);
+      system.active_advisories = $.grep(system.advisories, function(a) { return a.present == true; });
+      if (results.id == Data.state.self.systemId) system.allow_report = true; 
+      
+      Data.ui.mapInfo.html( $(Data.templates.system_info(system)) );
+      Data.ui.mapInfo.children('dl').fadeIn(Data.config.uiSpeed)
     });
 
   },
@@ -325,6 +336,11 @@ var SystemMap = {
     d3.selectAll('g.node rect')
       .attr("class", function(n) { return 'status-' + SystemMap.system_color(n.system); });
 
+    d3.selectAll('g.node text.advisories')
+      .text(function(n) {
+        return UI.advisoryUnicode( Data.advisories[n.system.id] );
+      });
+        
     SystemMap.updateHud( Data.systems[ Data.state.self.systemId ].name );
   },
 

app/js/UI.js

@@ -144,6 +144,23 @@ var UI = {
       "Whoring on the pod"
     ];
     return msgs[Math.floor(Math.random()*msgs.length)] + "...";
+  },
+  
+  advisoryUnicode: function(advisory_list) {
+    if (advisory_list === undefined) return "";
+    if (advisory_list.length === 0) return "";
+    
+    return $.map(advisory_list, function(a) { 
+      if (a == 'Wormhole Detected') return '\uf138'; 
+      else if (a == 'Hostile Cloaked') return '\uf0c2'; 
+      else if (a == 'Hostile Faded') return '\uf017'; 
+      else if (a == 'Hostile Logged Off') return '\uf08b'; 
+      else if (a == 'Undock Camped') return '\uf023'; 
+      else if (a == 'Gate Bubbled') return '\uf192';  
+      else if (a == 'Hostiles') return '\uf0fb';  
+      else return '';
+      
+    }).join("");
   }
 };
 
@@ -157,6 +174,7 @@ Handlebars.registerHelper('format_ts', function(ts) {
 });
 
 Handlebars.registerHelper('ui_icon', function(icon) {
+  if (icon == 'addAdvisory') return 'bolt';
   if (icon == 'alert') return 'bell';
   if (icon == 'approve') return 'check';
   if (icon == 'close') return 'close';
@@ -175,6 +193,7 @@ Handlebars.registerHelper('ui_icon', function(icon) {
   if (icon == 'options') return 'cog';
   if (icon == 'reportClear') return 'check';
   if (icon == 'reportHostile') return 'crosshairs';
+  if (icon == 'clearAdvisory') return 'check';
   if (icon == 'scan') return 'wifi';
   if (icon == 'scanPosted') return 'wifi';
   if (icon == 'settings') return 'cog';
@@ -185,6 +204,13 @@ Handlebars.registerHelper('ui_icon', function(icon) {
   if (icon == 'updateHostile') return 'crosshairs';
   if (icon == 'updateSystemMap') return 'sitemap';
   if (icon == 'youJoined') return 'user';
+  
+  if (icon == 'Wormhole Detected') return 'chevron-circle-right'; 
+  if (icon == 'Hostile Cloaked') return 'cloud'; 
+  if (icon == 'Hostile Faded') return 'clock-o'; 
+  if (icon == 'Hostile Logged Off') return 'sign-out'; 
+  if (icon == 'Undock Camped') return 'lock'; 
+  if (icon == 'Gate Bubbled') return 'dot-circle-o';  
 
   return 'exclamation';
 });

app/js/Util.js

@@ -1,9 +1,19 @@
 var Util = {
 
   compareRegion: function( pilot ) {
-    return Data.systems[ pilot.systemId ].regionID === Data.systems[ Data.state.self.systemId ].regionID;
+    try {
+      return Data.systems[ pilot.systemId ].regionID === Data.systems[ Data.state.self.systemId ].regionID;      
+    } catch(e) {
+      return false;
+    }
   },
 
+  dedupe: function(list, element, key) {
+    var match = $.grep(list, function(e) { return e[key] === element[key] && e.ts.toString().slice(0,-2) === element.ts.toString().slice(0,-2) });
+    
+    return (match.length > 0) ? true : false;
+  },  
+  
   isShip: function (shipName) {
     return (typeof Data.ships[shipName] !== 'undefined' && Data.ships[shipName].icons !== undefined)
   },
@@ -49,10 +59,16 @@ var Util = {
   },
 
   redirectToKeyUrl: function (fleetKey) {
-    window.location = location.protocol
+    if (fleetKey !== undefined || fleetKey !== 'undefined') {
+      window.location = location.protocol
       + '//' + location.hostname
       + (location.port ? ':' + location.port : '')
-      + '/' + fleetKey + '/';
+      + '/' + fleetKey + '/';      
+    } else {
+      Data.poll = false;
+      stopPolling();
+      Util.redirectToBasePath();
+    }
   },
 
   redirectToBasePath: function () {