Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages

code/chat.js

@@ -279,8 +279,14 @@ window.chat.writeDataToHash = function(newData, storageHash, skipSecureMsgs) {
 
       case 'PORTAL':
         var latlng = [markup[1].latE6/1E6, markup[1].lngE6/1E6];
-        var js = 'window.zoomToAndShowPortal(\''+markup[1].guid+'\', ['+latlng[0]+', '+latlng[1]+'])';
-        msg += '<a onclick="'+js+'" title="'+markup[1].address+'" class="help">'+markup[1].name+'</a>';
+        var perma = 'https://ingress.com/intel?latE6='+markup[1].latE6+'&lngE6='+markup[1].lngE6+'&z=17&pguid='+markup[1].guid;
+        var js = 'window.zoomToAndShowPortal(\''+markup[1].guid+'\', ['+latlng[0]+', '+latlng[1]+']);return false';
+
+        msg += '<a onclick="'+js+'"'
+          + ' title="'+markup[1].address+'"'
+          + ' href="'+perma+'" class="help">'
+          + markup[1].name
+          + '</a>';
         break;
 
       case 'SECURE':

code/map_data.js

@@ -43,6 +43,8 @@ window.requestData = function() {
     }
   }
 
+  // Reset previous result of Portal Render Limit handler
+  portalRenderLimit.init();
   // finally send ajax requests
   $.each(tiles, function(ind, tls) {
     data = { minLevelOfDetail: -1 };
@@ -70,6 +72,8 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
   // https://github.com/Leaflet/Leaflet/issues/185
   var ppp = [];
   var p2f = {};
+  // Reset new portals count of Portal Render Limit handler
+  portalRenderLimit.resetCounting();
   $.each(m, function(qk, val) {
     $.each(val.deletedGameEntityGuids, function(ind, guid) {
       if(getTypeByGuid(guid) === TYPE_FIELD && window.fields[guid] !== undefined) {
@@ -98,7 +102,7 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
           ) return;
 
 
-
+        portalRenderLimit.pushPortal(ent);
         ppp.push(ent); // delay portal render
       } else if(ent[2].edge !== undefined) {
         renderLink(ent);
@@ -147,6 +151,7 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
 
   if(portalUpdateAvailable) renderPortalDetails(selectedPortal);
   resolvePlayerNames();
+  renderUpdateStatus();
 }
 
 // removes entities that are still handled by Leaflet, although they

code/portal_detail_display.js

@@ -50,7 +50,7 @@ window.renderPortalDetails = function(guid) {
 
   var lat = d.locationE6.latE6;
   var lng = d.locationE6.lngE6;
-  var perma = 'http://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid;
+  var perma = 'https://ingress.com/intel?latE6='+lat+'&lngE6='+lng+'&z=17&pguid='+guid;
   var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."';
   var poslinks = 'window.showPortalPosLinks('+lat/1E6+','+lng/1E6+')';
   var postcard = 'Send in a postcard. Will put it online after receiving. Address:\\n\\nStefan Breunig\\nINF 305 – R045\\n69120 Heidelberg\\nGermany';

code/portal_render_limit.js

@@ -0,0 +1,80 @@
+
+// PORTAL RENDER LIMIT HANDLER ///////////////////////////////////////
+// Functions to handle hiding low level portal when portal render 
+// limit is reached. 
+//
+// After initialized and reset in window.requestData(), portals in 
+// response data will pass to function "pushPortal". Each new portal 
+// not on the map will add 1 to newPortalsPerLevel[portal level].
+//
+// "getMinLevel" will be called by "getMinPortalLevel" in utils_misc.js 
+// to determine min portal level to draw on map.
+// 
+// "getMinLevel" will return minLevel and call "setMinLevel" if 
+// minLevel hasn't set yet. 
+// 
+// In "setMinLevel", it will loop through all portal level from 
+// high to low, and sum total portal count (old + new) to check 
+// minLevel. 
+//
+// In each call of window.handleDataResponse(), it will call 
+// "resetCounting" to reset previous response data. But minLevel
+// is preserved and only replaced when render limit reached in 
+// higher level, until next window.requestData() called and reset.
+// 
+
+window.portalRenderLimit = function() {}
+
+window.portalRenderLimit.initialized = false;
+window.portalRenderLimit.minLevelSet = false;
+window.portalRenderLimit.minLevel = -1;
+window.portalRenderLimit.newPortalsPerLevel = new Array(MAX_PORTAL_LEVEL + 1);
+
+window.portalRenderLimit.init = function () {
+  portalRenderLimit.initialized = true;
+  portalRenderLimit.minLevel = -1;
+  portalRenderLimit.resetCounting();
+}
+
+window.portalRenderLimit.resetCounting = function() {
+  portalRenderLimit.minLevelSet = false;
+  for(var i = 0; i <= MAX_PORTAL_LEVEL; i++) {
+    portalRenderLimit.newPortalsPerLevel[i] = 0;
+  }
+}
+
+window.portalRenderLimit.pushPortal = function(ent) {
+  var portalGuid = ent[0];
+  var portalLevel = parseInt(getPortalLevel(ent[2]));
+  var layerGroup = portalsLayers[portalLevel];
+  
+  if(findEntityInLeaflet(layerGroup, window.portals, ent[0])) return;
+  portalRenderLimit.newPortalsPerLevel[portalLevel]++;
+}
+
+window.portalRenderLimit.getMinLevel = function() {
+  if(!portalRenderLimit.initialized) return -1;
+  if(!portalRenderLimit.minLevelSet) portalRenderLimit.setMinLevel();
+  return portalRenderLimit.minLevel;
+}
+
+window.portalRenderLimit.setMinLevel = function() {
+  var totalPortalsCount = 0;
+  var newMinLevel = MAX_PORTAL_LEVEL + 1;
+  
+  // Find the min portal level under render limit
+  while(newMinLevel > 0) {
+    var oldPortalCount = layerGroupLength(portalsLayers[newMinLevel - 1]);
+    var newPortalCount = portalRenderLimit.newPortalsPerLevel[newMinLevel - 1];
+    totalPortalsCount += oldPortalCount + newPortalCount;
+    if(totalPortalsCount >= MAX_DRAWN_PORTALS)
+      break;
+    newMinLevel--;
+  }
+  
+  // If render limit reached at max portal level, still let portal at max level render
+  newMinLevel = Math.min(newMinLevel, MAX_PORTAL_LEVEL);
+  
+  portalRenderLimit.minLevel = Math.max(newMinLevel, portalRenderLimit.minLevel);
+  portalRenderLimit.minLevelSet = true;
+}

code/utils_misc.js

@@ -2,6 +2,14 @@
 
 // UTILS + MISC  ///////////////////////////////////////////////////////
 
+window.layerGroupLength = function(layerGroup) {
+  var layersCount = 0;
+  var layers = layerGroup._layers;
+  if (layers)
+    layersCount = Object.keys(layers).length;
+  return layersCount;
+}
+
 // retrieves parameter from the URL?query=string.
 window.getURLParam = function(param) {
   var v = document.URL;
@@ -152,7 +160,11 @@ window.getMinPortalLevel = function() {
   var z = map.getZoom();
   if(z >= 16) return 0;
   var conv = ['impossible', 8,7,7,6,6,5,5,4,4,3,3,2,2,1,1];
-  return conv[z];
+  var minLevelByRenderLimit = portalRenderLimit.getMinLevel();
+  var result = minLevelByRenderLimit > conv[z]
+    ? minLevelByRenderLimit
+    : conv[z];
+  return result;
 }
 
 // returns number of pixels left to scroll down before reaching the