Merge branch 'release/1.0.5.1'

Author: rcreasey

app/js/AdvisoryList.js

@@ -10,15 +10,14 @@ var AdvisoryList = {
     Data.advisories = {};
   },
 
-  lookup: function(systemId) {
+  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;
   },
 

app/js/SystemMap.js

@@ -8,18 +8,23 @@ var SystemMap = {
 
   // let's count things
   hostile_count: function(system) {
-    if (system == undefined) { return 0; }
-    return (system.name !== undefined ) ? $.grep(Data.hostiles, function(h) { return system.name === h.systemName && h.is_faded === false; }).length : 0
+    if (system === undefined) { return 0; }
+    return (system.name !== undefined ) ? $.grep(Data.hostiles, function(h) { return system.name === h.systemName && h.is_faded === false; }).length : 0;
   },
 
   faded_count: function(system) {
-    if (system == undefined) { return 0; }
-    return (system.name !== undefined ) ? $.grep(Data.hostiles, function(h) { return system.name === h.systemName && h.is_faded === true; }).length : 0
+    if (system === undefined) { return 0; }
+    return (system.name !== undefined ) ? $.grep(Data.hostiles, function(h) { return system.name === h.systemName && h.is_faded === true; }).length : 0;
   },
 
   friendly_count: function(system) {
-    if (system == undefined) { return 0; }
-    return (system.name !== undefined ) ? $.grep(Data.members, function(h) { return system.name === h.systemName; }).length : 0
+    if (system === undefined) { return 0; }
+    return (system.name !== undefined ) ? $.grep(Data.members, function(m) { return system.name === m.systemName; }).length : 0;
+  },
+  
+  advisory_count: function(system) {
+    if (system === undefined) { return 0; }
+    return (Data.advisories[system.id] instanceof Array) ? Data.advisories[system.id].length : 0;
   },
 
   // Given a system, return the class that corresponds to whether a system is hostile or not.
@@ -28,11 +33,13 @@ var SystemMap = {
       return "hostile";
     } else if ( SystemMap.faded_count(system) > 0 ) {
       return "warning";
-    } else if ( SystemMap.friendly_count(system) > 0 ) {
+    } else if ( SystemMap.advisory_count(system) > 0 ) {
+      return "warning";
+    } else if ( SystemMap.friendly_count(system) > 0 ) {      
       return "clear";
     }
   },
-
+  
   // Given a line AB and a point C, finds point D such that CD is perpendicular to AB
   getSpPoint: function(A, B, C) {
     var x1 = A.x, y1 = A.y, x2 = B.x, y2 = B.y, x3 = C.x, y3 = C.y;
@@ -123,7 +130,7 @@ var SystemMap = {
           .data('regionId', system.regionID)
           .text( Data.regions[ system.regionID ].name );
 
-        SystemMap.updateHud( system.name );
+        SystemMap.updateHud( system );
 
         var link_groups = link.data(SystemMap.jumps)
           .enter().append("g")
@@ -156,11 +163,23 @@ var SystemMap = {
           .attr("text-anchor", "middle")
           .attr("alignment-baseline", "middle")
           .attr("x", rect_width / 2)
-          .attr("y", -10)
+          .attr("y", -8)
           .text(function(n) {
-            return UI.advisoryUnicode( Data.advisories[n.system.id] );
+            return UI.mapUnicode( Data.advisories[n.system.id] );
           });
-        
+          
+        node_groups.append("text")
+          .attr("class", "hostiles")
+          .attr("text-anchor", "middle")
+          .attr("vector-effect", "non-scaling-stroke")
+          .attr("alignment-baseline", "middle")
+          .attr("x", rect_width / 2)
+          .attr("y", 25)
+          .text(function(n) {
+            var count = SystemMap.hostile_count(n.system)
+            return (count > 0) ? count + " " + UI.mapUnicode(['Hostile']) : "";
+          });
+                  
         node_groups.on('click', function(n) {
           SystemMap.updateInfo( n.system.name );
         });
@@ -271,15 +290,15 @@ var SystemMap = {
     SystemMap.zoom.event(root);
   },
 
-  updateHud: function(system_name) {
-    var system = {name: system_name}
+  updateHud: function(system) {
+    var system = {name: system.name, id: system.id }
     system.neighbors = $.map(SystemMap.links, function(n) {
-      if (n.target.system && n.target.system.name === system_name) {
+      if (n.target.system && n.target.system.name === system.name) {
         n.source.hostiles = SystemMap.hostile_count(n.source.system);
         n.source.faded = SystemMap.faded_count(n.source.system);
         return n.source;
       }
-      if (n.source.system && n.source.system.name === system_name) {
+      if (n.source.system && n.source.system.name === system.name) {
         n.target.hostiles = SystemMap.hostile_count(n.target.system);
         n.target.faded = SystemMap.faded_count(n.target.system);
         return n.target;
@@ -307,7 +326,7 @@ var SystemMap = {
       .data('system-id', Data.state.self.systemId)
       .text( Data.systems[ Data.state.self.systemId ].name );
 
-    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ].name );
+    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ] );
   },
 
   updateInfo: function(system_name) {
@@ -338,17 +357,17 @@ var SystemMap = {
 
     d3.selectAll('g.node text.advisories')
       .text(function(n) {
-        return UI.advisoryUnicode( Data.advisories[n.system.id] );
+        return UI.mapUnicode( Data.advisories[n.system.id] );
       });
 
-    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ].name );
+    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ] );
   },
 
   redraw: function() {
     log("Redrawing System Map...");
     $("#system-map > svg").remove();
     SystemMap.draw();
-    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ].name );
+    SystemMap.updateHud( Data.systems[ Data.state.self.systemId ] );
   },
 
   init: function() {

app/js/UI.js

@@ -146,31 +146,37 @@ var UI = {
     return msgs[Math.floor(Math.random()*msgs.length)] + "...";
   },
 
-  advisoryUnicode: function(advisory_list) {
-    if (advisory_list === undefined) return "";
-    if (advisory_list.length === 0) return "";
+  mapUnicode: function(list) {
+    if (list === undefined) return "";
+    if (list.length === 0) return "";
 
-    return $.map(advisory_list, function(a) { 
+    return $.map(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 if (a == 'Hostile') return '\uf0fb';  
       else return '';
 
     }).join("");
   }
 };
 
+Handlebars.logger.level = 0;
+
 Handlebars.registerHelper('hud_detect_hostiles', function(status) {
   if (status == 'warning') return true;
   else return false;
 });
 
 Handlebars.registerHelper('format_ts', function(ts) {
-  return moment(ts).format('MM/DD HH:mm:ss');s
+  return moment(ts).utc().format('MM/DD HH:mm:ss');
+});
+
+Handlebars.registerHelper('format_ts_short', function(ts) {
+  return moment(ts).utc().format('HH:mm:ss');
 });
 
 Handlebars.registerHelper('ui_icon', function(icon) {

app/styles/main.css

@@ -514,7 +514,13 @@ rect.status-hostile { stroke: #d9534f; fill: #74312f; }
 .node text.advisories {
   font-family: FontAwesome;
   font-size: 1.25rem;
-  fill: #f89406;
+  fill: #faa123;
+}
+
+.node text.hostiles {
+  font-family: FontAwesome;
+  font-size: 1.25rem;
+  fill: #d9534f;
 }
 
 .current rect {
@@ -599,7 +605,7 @@ rect.status-hostile { stroke: #d9534f; fill: #74312f; }
   font-weight: bold;
 }
 
-.hostile .faded > td { background-color: #444; }
+.hostile.faded td { opacity: 0.5; }
 .hostile .system, .hostile .ship-type, .hostile .actions, .hostile .alliance,
 .hostile .name { padding-left: 0.6rem; text-align: left; }
 

app/templates/hostile.hbs

@@ -1,4 +1,4 @@
-<table id="hostile-{{characterId}}" class="hostile">
+<table id="hostile-{{characterId}}" class="hostile {{#if is_faded}}faded{{/if}}">
   <tr>
     <td class="ship-icon">{{{shipIcon}}}</td>
     <td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{characterId}});">{{characterName}}</a></td>
@@ -19,8 +19,8 @@
       <i class="fa fa-clock-o"></i> Faded
       {{/if}}
     </td>
-    <td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
-    <td class="reported-at"><a title="Reported by {{reporterName}}">{{reported_at}}</a></td>
+    <td class="system {{#if is_docked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
+    <td class="reported-at"><a title="Reported by {{reporterName}}">{{format_ts_short ts}}</a></td>
     <td class="actions">
       <a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
       <a title="Killboard: {{characterName}}" target="_blank" href="https://zkillboard.com/character/{{characterId}}/"><i class="fa fa-crosshairs" title="Killboard"></i></a>

server/config/settings.js

@@ -8,11 +8,12 @@ module.exports = function () {
 		session_secret: process.env.SESSION_SECRET || 'buttes',
 		log: 'console',
 
-		advisoryTtl: 1800,
+		advisoryTtl: 3600,
 		eventTtl: 300,
 		scanTtl: 86400,
-		reportTtl: 300,
-		hostileTtl: 600,
+		reportTtl: 86400,
+		hostileFadeTtl: 600,
+		hostileRemoveTtl: 1200,
 		memberTtl: 600,
 
 		fleets: [						

server/models/hostile.js

@@ -26,7 +26,7 @@ var HostileSchema  = new Schema({
   is_docked: { type: Boolean, default: false }
 });
 
-HostileSchema.index({ ts: 1, key: 1, fleetKey: 1 }, { expireAfterSeconds: settings.hostileTtl });
+HostileSchema.index({ ts: 1, key: 1, fleetKey: 1 }, { expireAfterSeconds: settings.hostileRemoveTtl });
 
 HostileSchema.statics.prepare = function prepare(fleetKey, reporterId, reporterName, character) {
   return new this({

server/services/consuela.js

@@ -95,7 +95,7 @@ var clean_reports = function() {
 var clean_hostiles = function() {
   console.log('Consuela: Cleaning Hostiles');
 
-  Hostile.findQ({ts: { $lte: moment().unix() - +settings.hostileTtl }})
+  Hostile.findQ({ts: { $lte: moment().unix() - +settings.hostileFadeTtl }})
     .then(function(hostiles) {      
       _.forEach(hostiles, function(hostile) {
         if (!hostile.is_faded) {
@@ -107,7 +107,7 @@ var clean_hostiles = function() {
       })
     });
 
-  Hostile.findQ({ts: { $lte: moment().unix() - (+settings.hostileTtl * 2) }})
+  Hostile.findQ({ts: { $lte: moment().unix() - +settings.hostileRemoveTtl }})
     .then(function(hostiles) {      
       _.forEach(hostiles, function(hostile) {
         Event.prepare('hostileTimedOut', hostile.fleetKey, hostile)