From c34d7ee3a267ada2b66374498a201cb95c93addb Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 13:25:39 +0800
Subject: [PATCH 01/27] Resonator on map Change: Add
 "RESONATOR_DISPLAY_ZOOM_LEVEL" to control minimum zoom level resonator will
 display Add layerGroup "resonatorsLayers" to draw resonators on it. Add
 "window.resonators" to store references to resonators on map

Resonator will have guid of portal with ".11" or ".12" replaced with ".r0"~".r7"
Add function "window.renderResontor" to draw resonators (use sorgo's code [sorgo](https://github.com/sorgo))
"window.renderPortal" will call "window.renderResontor" before add portal to portalsLayers
Change "window.removeByGuid" to handle resonators
Change "window.cleanUp" to handle resonators cleanup
---
 code/boot.js       |  9 +++++
 code/map_data.js   | 83 +++++++++++++++++++++++++++++++++++++++++++++-
 code/utils_misc.js | 12 +++++++
 main.js            |  8 +++--
 4 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 5c735d9a..531c5c60 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -81,6 +81,15 @@ window.setupMap = function() {
   map.addLayer(linksLayer, true);
   addLayers['Links'] = linksLayer;
 
+  resonatorsLayers = [];
+  for(var i = 1; i <= 8; i++) {
+    resonatorsLayers[i] = L.layerGroup([]);
+    map.addLayer(resonatorsLayers[i]);
+    var t = 'Level ' + i + ' Portal resonators';
+    addLayers[t] = resonatorsLayers[i];
+  }
+  
+
   map.addControl(new L.Control.Layers({
     'OSM Cloudmade Midnight': views[0],
     'OSM Cloudmade Minimal': views[1],
diff --git a/code/map_data.js b/code/map_data.js
index 6d12e7a7..f4c580fc 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -146,9 +146,15 @@ window.cleanUp = function() {
     portalsLayers[i].eachLayer(function(portal) {
       // portal must be in bounds and have a high enough level. Also don’t
       // remove if it is selected.
-      if(portal.options.guid == window.selectedPortal ||
+      var portalGuid = portal.options.guid;
+      if(portalGuid == window.selectedPortal ||
         (b.contains(portal.getLatLng()) && i >= minlvl)) return;
+
       cnt[0]++;
+
+      //remove attached resonators
+      for(var j = 0; j <= 7; j++) removeByGuid( portalResonatorGuid(portalGuid,j) );
+
       portalsLayers[i].removeLayer(portal);
     });
   }
@@ -162,6 +168,14 @@ window.cleanUp = function() {
     cnt[2]++;
     fieldsLayer.removeLayer(field);
   });
+  // remove all resonator if zoom level become 
+  // lower than RESONATOR_DISPLAY_ZOOM_LEVEL
+  if (map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL){
+    for(var i = 1; i < resonatorsLayers.length; i++){
+      resonatorsLayers[i].clearLayers();
+    }
+    console.log('removed all resonators');
+  }
   console.log('removed out-of-bounds: '+cnt[0]+' portals, '+cnt[1]+' links, '+cnt[2]+' fields');
 }
 
@@ -183,6 +197,10 @@ window.removeByGuid = function(guid) {
       if(!window.fields[guid]) return;
       fieldsLayer.removeLayer(window.fields[guid]);
       break;
+    case TYPE_RESONATOR:
+      if(!window.resonators[guid]) return;
+      resonatorsLayers[window.resonators[guid].options.pLevel].removeLayer(window.resonators[guid]);
+      break;
     default:
       console.warn('unknown GUID type: ' + guid);
       //window.debug.printStackTrace();
@@ -244,10 +262,73 @@ window.renderPortal = function(ent) {
     window.renderPortalDetails(ent[0]);
     window.map.setView(latlng, 17);
   });
+
+  window.renderResonator(ent);
+
   // portalLevel contains a float, need to round down
   p.addTo(portalsLayers[parseInt(portalLevel)]);
 }
 
+window.renderResonator = function(ent) {
+
+  var portalLevel = getPortalLevel(ent[2]);
+  if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal) return;
+
+  if(map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) return;
+
+  for(var i=0; i<ent[2].resonatorArray.resonators.length; i++) {
+    var rdata = ent[2].resonatorArray.resonators[i];
+    
+    if (rdata==null) continue;
+    
+    if (window.resonators[portalResonatorGuid(ent[0],i)]) continue;
+
+    var SLOT_TO_LAT = [0, Math.sqrt(2)/2, 1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2];
+    var SLOT_TO_LNG = [1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2, 0, Math.sqrt(2)/2];
+ 	
+    //Earths radius, sphere
+    var Radius=6378137;
+	
+    //offsets in meters
+    var dn = rdata.distanceToPortal*SLOT_TO_LAT[rdata.slot];
+    var de = rdata.distanceToPortal*SLOT_TO_LNG[rdata.slot];
+ 	 
+    //Coordinate offsets in radians
+    var dLat = dn/Radius;
+    var dLon = de/(Radius*Math.cos(Math.PI/180*(ent[2].locationE6.latE6/1E6)));
+ 	
+    //OffsetPosition, decimal degrees
+    var lat0 = ent[2].locationE6.latE6/1E6 + dLat * 180/Math.PI;
+    var lon0 = ent[2].locationE6.lngE6/1E6 + dLon * 180/Math.PI;
+    var Rlatlng = [lat0, lon0];
+    var r =  L.circleMarker(Rlatlng, {
+        radius: 4,
+        // #AAAAAA outline seems easier to see the fill opacity
+        color: '#AAAAAA',
+        opacity: 1,
+        weight: 1,
+        fillColor: COLORS_LVL[rdata.level],
+        fillOpacity: rdata.energyTotal/RESO_NRG[rdata.level],
+        clickable: false,
+        level: rdata.level,
+        pLevel: parseInt(portalLevel),
+        details: rdata,
+        pDetails: ent[2],
+        guid: portalResonatorGuid(ent[0],i) });
+
+    r.on('remove',   function() { delete window.resonators[this.options.guid]; });
+    r.on('add',      function() { window.resonators[this.options.guid] = this; });
+
+    r.addTo(resonatorsLayers[parseInt(portalLevel)]);
+  }
+}
+
+// replace .11 or .12 in portal guid with .r[slot] to
+// get guid for resonators
+window.portalResonatorGuid = function(portalGuid, slot){
+  return portalGuid.slice(0,32) + '.r' + slot;
+}
+
 window.portalResetColor = function(portal) {
   portal.setStyle({color: portal.options.fillColor});
 }
diff --git a/code/utils_misc.js b/code/utils_misc.js
index 02a202b8..e8e59e1e 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -147,6 +147,8 @@ window.getTypeByGuid = function(guid) {
   // .b  == fields
   // .c  == player/creator
   // .d  == chat messages
+  // 
+  // .r0~.r7 == resonators
   switch(guid.slice(33)) {
     case '11':
     case '12':
@@ -164,6 +166,16 @@ window.getTypeByGuid = function(guid) {
     case 'd':
       return TYPE_CHAT;
 
+    case 'r0':
+    case 'r1':
+    case 'r2':
+    case 'r3':
+    case 'r4':
+    case 'r5':
+    case 'r6':
+    case 'r7':
+      return TYPE_RESONATOR;
+
     default:
       return TYPE_UNKNOWN;
   }
diff --git a/main.js b/main.js
index 1d188f08..4b61babe 100644
--- a/main.js
+++ b/main.js
@@ -139,11 +139,14 @@ var NOMINATIM = 'http://nominatim.openstreetmap.org/search?format=json&limit=1&q
 var DEG2RAD = Math.PI / 180;
 var TEAM_NONE = 0, TEAM_RES = 1, TEAM_ENL = 2;
 var TEAM_TO_CSS = ['none', 'res', 'enl'];
-var TYPE_UNKNOWN = 0, TYPE_PORTAL = 1, TYPE_LINK = 2, TYPE_FIELD = 3, TYPE_PLAYER = 4, TYPE_CHAT = 5;
+var TYPE_UNKNOWN = 0, TYPE_PORTAL = 1, TYPE_LINK = 2, TYPE_FIELD = 3, TYPE_PLAYER = 4, TYPE_CHAT = 5, TYPE_RESONATOR = 6;
 // make PLAYER variable available in site context
 var PLAYER = window.PLAYER;
 var CHAT_SHRINKED = 60;
 
+// Minimum zoom level resonator will display
+var RESONATOR_DISPLAY_ZOOM_LEVEL = 16;
+
 // STORAGE ///////////////////////////////////////////////////////////
 // global variables used for storage. Most likely READ ONLY. Proper
 // way would be to encapsulate them in an anonymous function and write
@@ -156,7 +159,7 @@ window.selectedPortal = null;
 window.portalRangeIndicator = null;
 window.portalAccessIndicator = null;
 window.mapRunsUserAction = false;
-var portalsLayers, linksLayer, fieldsLayer;
+var portalsLayers, linksLayer, fieldsLayer, resonatorsLayers;
 
 // contain references to all entities shown on the map. These are
 // automatically kept in sync with the items on *sLayer, so never ever
@@ -164,6 +167,7 @@ var portalsLayers, linksLayer, fieldsLayer;
 window.portals = {};
 window.links = {};
 window.fields = {};
+window.resonators = {};
 
 // plugin framework. Plugins may load earlier than iitc, so don’t
 // overwrite data

From eecec0b4a4c261519537b554a76d5c5e70bbce9e Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 16:06:13 +0800
Subject: [PATCH 02/27] Move resonator layer back to layerGroup
 "portalsLayers", to make it work with portal level filter. And modify cleanup
 code to work with this change.

---
 code/boot.js     |  9 ---------
 code/map_data.js | 40 ++++++++++++++++++++++------------------
 main.js          |  2 +-
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 531c5c60..5c735d9a 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -81,15 +81,6 @@ window.setupMap = function() {
   map.addLayer(linksLayer, true);
   addLayers['Links'] = linksLayer;
 
-  resonatorsLayers = [];
-  for(var i = 1; i <= 8; i++) {
-    resonatorsLayers[i] = L.layerGroup([]);
-    map.addLayer(resonatorsLayers[i]);
-    var t = 'Level ' + i + ' Portal resonators';
-    addLayers[t] = resonatorsLayers[i];
-  }
-  
-
   map.addControl(new L.Control.Layers({
     'OSM Cloudmade Midnight': views[0],
     'OSM Cloudmade Minimal': views[1],
diff --git a/code/map_data.js b/code/map_data.js
index f4c580fc..4bf24c50 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -143,19 +143,31 @@ window.cleanUp = function() {
   var minlvl = getMinPortalLevel();
   for(var i = 0; i < portalsLayers.length; i++) {
     // i is also the portal level
-    portalsLayers[i].eachLayer(function(portal) {
+    portalsLayers[i].eachLayer(function(item) {
       // portal must be in bounds and have a high enough level. Also don’t
       // remove if it is selected.
-      var portalGuid = portal.options.guid;
-      if(portalGuid == window.selectedPortal ||
-        (b.contains(portal.getLatLng()) && i >= minlvl)) return;
+      var itemGuid = item.options.guid;
+      switch(getTypeByGuid(itemGuid)){
 
-      cnt[0]++;
+        case TYPE_PORTAL:
+          if(itemGuid == window.selectedPortal ||
+          (b.contains(item.getLatLng()) && i >= minlvl)) return;
+          
+          cnt[0]++;
 
-      //remove attached resonators
-      for(var j = 0; j <= 7; j++) removeByGuid( portalResonatorGuid(portalGuid,j) );
+          //remove attached resonators
+          for(var j = 0; j <= 7; j++) removeByGuid( portalResonatorGuid(itemGuid,j) );
 
-      portalsLayers[i].removeLayer(portal);
+          portalsLayers[i].removeLayer(item);
+          break;
+
+        case TYPE_RESONATOR:
+          // remove all resonator if zoom level become 
+          // lower than RESONATOR_DISPLAY_ZOOM_LEVEL
+          if (map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) 
+            portalsLayers[i].removeLayer(item);
+          break;
+      }
     });
   }
   linksLayer.eachLayer(function(link) {
@@ -168,14 +180,6 @@ window.cleanUp = function() {
     cnt[2]++;
     fieldsLayer.removeLayer(field);
   });
-  // remove all resonator if zoom level become 
-  // lower than RESONATOR_DISPLAY_ZOOM_LEVEL
-  if (map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL){
-    for(var i = 1; i < resonatorsLayers.length; i++){
-      resonatorsLayers[i].clearLayers();
-    }
-    console.log('removed all resonators');
-  }
   console.log('removed out-of-bounds: '+cnt[0]+' portals, '+cnt[1]+' links, '+cnt[2]+' fields');
 }
 
@@ -199,7 +203,7 @@ window.removeByGuid = function(guid) {
       break;
     case TYPE_RESONATOR:
       if(!window.resonators[guid]) return;
-      resonatorsLayers[window.resonators[guid].options.pLevel].removeLayer(window.resonators[guid]);
+      portalsLayers[window.resonators[guid].options.pLevel].removeLayer(window.resonators[guid]);
       break;
     default:
       console.warn('unknown GUID type: ' + guid);
@@ -319,7 +323,7 @@ window.renderResonator = function(ent) {
     r.on('remove',   function() { delete window.resonators[this.options.guid]; });
     r.on('add',      function() { window.resonators[this.options.guid] = this; });
 
-    r.addTo(resonatorsLayers[parseInt(portalLevel)]);
+    r.addTo(portalsLayers[parseInt(portalLevel)]);
   }
 }
 
diff --git a/main.js b/main.js
index 4b61babe..6e2a1262 100644
--- a/main.js
+++ b/main.js
@@ -159,7 +159,7 @@ window.selectedPortal = null;
 window.portalRangeIndicator = null;
 window.portalAccessIndicator = null;
 window.mapRunsUserAction = false;
-var portalsLayers, linksLayer, fieldsLayer, resonatorsLayers;
+var portalsLayers, linksLayer, fieldsLayer;
 
 // contain references to all entities shown on the map. These are
 // automatically kept in sync with the items on *sLayer, so never ever

From 444bcce988bb8723a447cdaaf9e2b17035090112 Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 20:58:15 +0800
Subject: [PATCH 03/27] Code cleanup and minor change Change: Code cleanup Loop
 over all portalsLayers when delete resonator

---
 code/map_data.js | 39 +++++++++++++++++----------------------
 main.js          |  5 +++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 4bf24c50..6c47155e 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -147,25 +147,25 @@ window.cleanUp = function() {
       // portal must be in bounds and have a high enough level. Also don’t
       // remove if it is selected.
       var itemGuid = item.options.guid;
-      switch(getTypeByGuid(itemGuid)){
+      switch(getTypeByGuid(itemGuid)) {
 
         case TYPE_PORTAL:
           if(itemGuid == window.selectedPortal ||
-          (b.contains(item.getLatLng()) && i >= minlvl)) return;
+            (b.contains(item.getLatLng()) && i >= minlvl)) return;
           
           cnt[0]++;
 
           //remove attached resonators
-          for(var j = 0; j <= 7; j++) removeByGuid( portalResonatorGuid(itemGuid,j) );
+          for(var j = 0; j <= 7; j++) removeByGuid(portalResonatorGuid(itemGuid,j));
 
           portalsLayers[i].removeLayer(item);
           break;
 
         case TYPE_RESONATOR:
-          // remove all resonator if zoom level become 
+          // remove all resonators if zoom level become 
           // lower than RESONATOR_DISPLAY_ZOOM_LEVEL
           if (map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) 
-            portalsLayers[i].removeLayer(item);
+            for(var j = 0; j <= 7; j++) portalsLayers[j].removeLayer(item);
           break;
       }
     });
@@ -203,7 +203,9 @@ window.removeByGuid = function(guid) {
       break;
     case TYPE_RESONATOR:
       if(!window.resonators[guid]) return;
-      portalsLayers[window.resonators[guid].options.pLevel].removeLayer(window.resonators[guid]);
+      var r = window.resonators[guid]
+      for(var i = 1; i < portalsLayers.length; i++)
+        portalsLayers[i].removeLayer(r);
       break;
     default:
       console.warn('unknown GUID type: ' + guid);
@@ -267,41 +269,35 @@ window.renderPortal = function(ent) {
     window.map.setView(latlng, 17);
   });
 
-  window.renderResonator(ent);
+  window.renderResonators(ent);
 
   // portalLevel contains a float, need to round down
   p.addTo(portalsLayers[parseInt(portalLevel)]);
 }
 
-window.renderResonator = function(ent) {
+window.renderResonators = function(ent) {
 
   var portalLevel = getPortalLevel(ent[2]);
   if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal) return;
 
   if(map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) return;
 
-  for(var i=0; i<ent[2].resonatorArray.resonators.length; i++) {
+  for(var i=0; i < ent[2].resonatorArray.resonators.length; i++) {
     var rdata = ent[2].resonatorArray.resonators[i];
     
-    if (rdata==null) continue;
+    if (rdata == null) continue;
     
     if (window.resonators[portalResonatorGuid(ent[0],i)]) continue;
 
-    var SLOT_TO_LAT = [0, Math.sqrt(2)/2, 1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2];
-    var SLOT_TO_LNG = [1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2, 0, Math.sqrt(2)/2];
- 	
-    //Earths radius, sphere
-    var Radius=6378137;
-	
-    //offsets in meters
+    // offsets in meters
     var dn = rdata.distanceToPortal*SLOT_TO_LAT[rdata.slot];
     var de = rdata.distanceToPortal*SLOT_TO_LNG[rdata.slot];
  	 
-    //Coordinate offsets in radians
-    var dLat = dn/Radius;
-    var dLon = de/(Radius*Math.cos(Math.PI/180*(ent[2].locationE6.latE6/1E6)));
+    // Coordinate offsets in radians
+    var dLat = dn/EARTH_RADIUS;
+    var dLon = de/(EARTH_RADIUS*Math.cos(Math.PI/180*(ent[2].locationE6.latE6/1E6)));
  	
-    //OffsetPosition, decimal degrees
+    // OffsetPosition, decimal degrees
     var lat0 = ent[2].locationE6.latE6/1E6 + dLat * 180/Math.PI;
     var lon0 = ent[2].locationE6.lngE6/1E6 + dLon * 180/Math.PI;
     var Rlatlng = [lat0, lon0];
@@ -315,7 +311,6 @@ window.renderResonator = function(ent) {
         fillOpacity: rdata.energyTotal/RESO_NRG[rdata.level],
         clickable: false,
         level: rdata.level,
-        pLevel: parseInt(portalLevel),
         details: rdata,
         pDetails: ent[2],
         guid: portalResonatorGuid(ent[0],i) });
diff --git a/main.js b/main.js
index 6e2a1262..d3a90b14 100644
--- a/main.js
+++ b/main.js
@@ -147,6 +147,11 @@ var CHAT_SHRINKED = 60;
 // Minimum zoom level resonator will display
 var RESONATOR_DISPLAY_ZOOM_LEVEL = 16;
 
+// Constants for resonator positioning
+var SLOT_TO_LAT = [0, Math.sqrt(2)/2, 1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2];
+var SLOT_TO_LNG = [1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2, 0, Math.sqrt(2)/2];
+var EARTH_RADIUS=6378137;
+
 // STORAGE ///////////////////////////////////////////////////////////
 // global variables used for storage. Most likely READ ONLY. Proper
 // way would be to encapsulate them in an anonymous function and write

From 63bdff0eb9f28c4e642f8002bb952a11d00f3d41 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 14:08:35 +0100
Subject: [PATCH 04/27] fix 'report issue' for places with single or double
 quotes in their names. Fixes #68

---
 code/portal_detail_display.js       | 2 +-
 code/portal_detail_display_tools.js | 8 --------
 code/utils_misc.js                  | 7 +++++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index 0a7fd8a5..30a24f83 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -70,7 +70,7 @@ window.renderPortalDetails = function(guid) {
         + '<div id="resodetails">'+getResonatorDetails(d)+'</div>'
         + '<div class="linkdetails">'
         + '<aside><a href="'+perma+'">portal link</a></aside>'
-        + '<aside><a onclick="window.reportPortalIssue(\''+getReportIssueInfoText(d)+'\')">report issue</a></aside>'
+        + '<aside><a onclick="window.reportPortalIssue()">report issue</a></aside>'
         + '</div>'
       );
   }
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index 71e38332..21fe3b91 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -78,14 +78,6 @@ window.getAvgResoDistText = function(d) {
   return '⌀ res dist: ' + avgDist + ' m';
 }
 
-window.getReportIssueInfoText = function(d) {
-  return ('Your Nick: '+PLAYER.nickname+'        '
-    + 'Portal: '+d.portalV2.descriptiveText.TITLE+'        '
-    + 'Location: '+d.portalV2.descriptiveText.ADDRESS
-    +' (lat '+(d.locationE6.latE6/1E6)+'; lng '+(d.locationE6.lngE6/1E6)+')'
-  ).replace(/['"]/, '');
-}
-
 window.getResonatorDetails = function(d) {
   console.log('rendering reso details');
   var resoDetails = '';
diff --git a/code/utils_misc.js b/code/utils_misc.js
index 02a202b8..4959c40a 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -93,6 +93,13 @@ window.rangeLinkClick = function() {
 
 window.reportPortalIssue = function(info) {
   var t = 'Redirecting you to a Google Help Page. Once there, click on “Contact Us” in the upper right corner.\n\nThe text box contains all necessary information. Press CTRL+C to copy it.';
+  var d = window.portals[window.selectedPortal].options.details;
+
+  var info = 'Your Nick: ' + PLAYER.nickname + '        '
+    + 'Portal: ' + d.portalV2.descriptiveText.TITLE + '        '
+    + 'Location: ' + d.portalV2.descriptiveText.ADDRESS
+    +' (lat ' + (d.locationE6.latE6/1E6) + '; lng ' + (d.locationE6.lngE6/1E6) + ')';
+
   //codename, approx addr, portalname
   if(prompt(t, info) !== null)
     location.href = 'https://support.google.com/ingress?hl=en';

From f781c6ebd4fbe4c47684cac2b84a06aa87873825 Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 21:14:54 +0800
Subject: [PATCH 05/27] Resonators deletion of portal move Move Resonators
 deletion to 'remove' event of portal

---
 code/map_data.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 6c47155e..fd353a0a 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -155,9 +155,6 @@ window.cleanUp = function() {
           
           cnt[0]++;
 
-          //remove attached resonators
-          for(var j = 0; j <= 7; j++) removeByGuid(portalResonatorGuid(itemGuid,j));
-
           portalsLayers[i].removeLayer(item);
           break;
 
@@ -255,7 +252,13 @@ window.renderPortal = function(ent) {
     details: ent[2],
     guid: ent[0]});
 
-  p.on('remove',   function() { delete window.portals[this.options.guid]; });
+  p.on('remove',   function() {
+    // remove attached resonators
+    var portalGuid = this.options.guid
+    for(var i = 0; i <= 7; i++)
+      removeByGuid(portalResonatorGuid(portalGuid,i));
+    delete window.portals[portalGuid]; 
+  });
   p.on('add',      function() {
     window.portals[this.options.guid] = this;
     // handles the case where a selected portal gets removed from the
@@ -289,11 +292,11 @@ window.renderResonators = function(ent) {
     
     if (window.resonators[portalResonatorGuid(ent[0],i)]) continue;
 
-    // offsets in meters
+    // offset in meters
     var dn = rdata.distanceToPortal*SLOT_TO_LAT[rdata.slot];
     var de = rdata.distanceToPortal*SLOT_TO_LNG[rdata.slot];
  	 
-    // Coordinate offsets in radians
+    // Coordinate offset in radians
     var dLat = dn/EARTH_RADIUS;
     var dLon = de/(EARTH_RADIUS*Math.cos(Math.PI/180*(ent[2].locationE6.latE6/1E6)));
  	

From f102ef593d3e1a70093ed4faaf648b758ef1b589 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 14:58:37 +0100
Subject: [PATCH 06/27] rename expand here as well

---
 main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.js b/main.js
index 1d188f08..e4eaa2c8 100644
--- a/main.js
+++ b/main.js
@@ -50,7 +50,7 @@ document.getElementsByTagName('head')[0].innerHTML = ''
 document.getElementsByTagName('body')[0].innerHTML = ''
   + '<div id="map">Loading, please wait</div>'
   + '<div id="chatcontrols" style="display:none">'
-  + '  <a>expand</a><a>automated</a><a>public</a><a class="active">faction</a>'
+  + '  <a>◢◣</a><a>automated</a><a>public</a><a class="active">faction</a>'
   + '</div>'
   + '<div id="chat" style="display:none">'
   + '  <div id="chatfaction"></div>'

From 6936ef1d051b1271e44726add7acdeacf2037dfa Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 22:23:01 +0800
Subject: [PATCH 07/27] Resonators deletion of zoom level move Change: Move
 resonators deletion to 'zoomend' event of map. Some clean up of code.

---
 code/boot.js     | 17 ++++++++++++++++-
 code/map_data.js | 42 +++++++++++++++++++-----------------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 5c735d9a..3d6d3912 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -93,7 +93,22 @@ window.setupMap = function() {
   map.attributionControl.setPrefix('');
   // listen for changes and store them in cookies
   map.on('moveend', window.storeMapPosition);
-  map.on('zoomend', window.storeMapPosition);
+  map.on('zoomend', function() {
+    window.storeMapPosition;
+
+    // remove all resonators if zoom out to < RESONATOR_DISPLAY_ZOOM_LEVEL
+    if (isResonatorsShow()) return;
+    for(var i = 1; i < portalsLayers.length; i++) {
+      portalsLayers[i].eachLayer(function(item) {
+        var itemGuid = item.options.guid;
+        // check if 'item' is a resonator
+        if(!window.resonators[itemGuid]) return;
+        portalsLayers[i].removeLayer(item);
+      });
+    }
+
+    console.log('Remove all resonators');
+  });
   $("[name='leaflet-base-layers']").change(function () {
     writeCookie('ingress.intelmap.type', $(this).parent().index());
   });
diff --git a/code/map_data.js b/code/map_data.js
index fd353a0a..2fef1534 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -144,27 +144,15 @@ window.cleanUp = function() {
   for(var i = 0; i < portalsLayers.length; i++) {
     // i is also the portal level
     portalsLayers[i].eachLayer(function(item) {
+      var itemGuid = item.options.guid;
+      // check if 'item' is a portal
+      if(!window.portals[itemGuid]) return;
       // portal must be in bounds and have a high enough level. Also don’t
       // remove if it is selected.
-      var itemGuid = item.options.guid;
-      switch(getTypeByGuid(itemGuid)) {
-
-        case TYPE_PORTAL:
-          if(itemGuid == window.selectedPortal ||
-            (b.contains(item.getLatLng()) && i >= minlvl)) return;
-          
-          cnt[0]++;
-
-          portalsLayers[i].removeLayer(item);
-          break;
-
-        case TYPE_RESONATOR:
-          // remove all resonators if zoom level become 
-          // lower than RESONATOR_DISPLAY_ZOOM_LEVEL
-          if (map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) 
-            for(var j = 0; j <= 7; j++) portalsLayers[j].removeLayer(item);
-          break;
-      }
+      if(itemGuid == window.selectedPortal ||
+        (b.contains(item.getLatLng()) && i >= minlvl)) return;
+      cnt[0]++;
+      portalsLayers[i].removeLayer(item);
     });
   }
   linksLayer.eachLayer(function(link) {
@@ -253,10 +241,14 @@ window.renderPortal = function(ent) {
     guid: ent[0]});
 
   p.on('remove',   function() {
-    // remove attached resonators
     var portalGuid = this.options.guid
-    for(var i = 0; i <= 7; i++)
-      removeByGuid(portalResonatorGuid(portalGuid,i));
+
+    // remove attached resonators, skip if 
+    // all resonators have already removed by zooming
+    if (isResonatorsShow()) {
+      for(var i = 0; i <= 7; i++)
+        removeByGuid(portalResonatorGuid(portalGuid,i));
+    }
     delete window.portals[portalGuid]; 
   });
   p.on('add',      function() {
@@ -283,7 +275,7 @@ window.renderResonators = function(ent) {
   var portalLevel = getPortalLevel(ent[2]);
   if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal) return;
 
-  if(map.getZoom() < RESONATOR_DISPLAY_ZOOM_LEVEL) return;
+  if(!isResonatorsShow()) return;
 
   for(var i=0; i < ent[2].resonatorArray.resonators.length; i++) {
     var rdata = ent[2].resonatorArray.resonators[i];
@@ -331,6 +323,10 @@ window.portalResonatorGuid = function(portalGuid, slot){
   return portalGuid.slice(0,32) + '.r' + slot;
 }
 
+window.isResonatorsShow = function(){
+  return map.getZoom() >= RESONATOR_DISPLAY_ZOOM_LEVEL;
+}
+
 window.portalResetColor = function(portal) {
   portal.setStyle({color: portal.options.fillColor});
 }

From 0cfb86eff0cadce2e79599a13e0a5ad43fb38933 Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Sun, 10 Feb 2013 15:29:27 +0100
Subject: [PATCH 08/27] Use invisible formatting for clipboard copy-paste

When text is copied from browser it looks like "00:00 <nick> text."
Firefox adds new lines between records. It would be good to get rid of
it.
---
 code/chat.js | 2 +-
 style.css    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/chat.js b/code/chat.js
index eb4b2b81..87399417 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -456,7 +456,7 @@ window.chat.renderMsg = function(msg, nick, time, team) {
   var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
   var s = 'style="color:'+COLORS[team]+'"';
   var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
-  return '<p>'+t+'<mark '+s+'>'+nick+'</mark><span>'+msg+'</span></p>';
+  return '<p>'+t+'<span class="invisibleseparator"> &lt;</span><mark '+s+'>'+nick+'</mark><span class="invisibleseparator">&gt; </span><span class="blockquote">'+msg+'</span></p>';
 }
 
 
diff --git a/style.css b/style.css
index eebbc734..6ce0e51a 100644
--- a/style.css
+++ b/style.css
@@ -195,7 +195,7 @@ summary {
   width: 683px;
 }
 
-#chat span {
+#chat .blockquote {
   display: inline-block;
   width: 540px;
 }
@@ -212,6 +212,11 @@ summary {
   z-index: 3001;
 }
 
+#chat .invisibleseparator {
+    color: rgba(8, 48, 78, 0.0);
+    display: inline-block;
+    width: 0px;
+}
 
 
 #chatinput span {

From 370f34a793402d78ada25889cacb669d54238449 Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 22:52:11 +0800
Subject: [PATCH 09/27] Change guid format of resonator Change: Guid format of
 resonator change to following, [portal guid]-resonator-[slot]

Some code cleanup
---
 code/boot.js       |  2 +-
 code/map_data.js   |  8 ++++----
 code/utils_misc.js | 13 ++-----------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 3d6d3912..e77d4630 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -97,7 +97,7 @@ window.setupMap = function() {
     window.storeMapPosition;
 
     // remove all resonators if zoom out to < RESONATOR_DISPLAY_ZOOM_LEVEL
-    if (isResonatorsShow()) return;
+    if(isResonatorsShow()) return;
     for(var i = 1; i < portalsLayers.length; i++) {
       portalsLayers[i].eachLayer(function(item) {
         var itemGuid = item.options.guid;
diff --git a/code/map_data.js b/code/map_data.js
index 2fef1534..704abccc 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -245,7 +245,7 @@ window.renderPortal = function(ent) {
 
     // remove attached resonators, skip if 
     // all resonators have already removed by zooming
-    if (isResonatorsShow()) {
+    if(isResonatorsShow()) {
       for(var i = 0; i <= 7; i++)
         removeByGuid(portalResonatorGuid(portalGuid,i));
     }
@@ -280,9 +280,9 @@ window.renderResonators = function(ent) {
   for(var i=0; i < ent[2].resonatorArray.resonators.length; i++) {
     var rdata = ent[2].resonatorArray.resonators[i];
     
-    if (rdata == null) continue;
+    if(rdata == null) continue;
     
-    if (window.resonators[portalResonatorGuid(ent[0],i)]) continue;
+    if(window.resonators[portalResonatorGuid(ent[0],i)]) continue;
 
     // offset in meters
     var dn = rdata.distanceToPortal*SLOT_TO_LAT[rdata.slot];
@@ -320,7 +320,7 @@ window.renderResonators = function(ent) {
 // replace .11 or .12 in portal guid with .r[slot] to
 // get guid for resonators
 window.portalResonatorGuid = function(portalGuid, slot){
-  return portalGuid.slice(0,32) + '.r' + slot;
+  return portalGuid + '-resonator-' + slot;
 }
 
 window.isResonatorsShow = function(){
diff --git a/code/utils_misc.js b/code/utils_misc.js
index e8e59e1e..b9c60b5f 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -148,7 +148,7 @@ window.getTypeByGuid = function(guid) {
   // .c  == player/creator
   // .d  == chat messages
   // 
-  // .r0~.r7 == resonators
+  // resonator guid is [portal guid]-resonator-[slot]
   switch(guid.slice(33)) {
     case '11':
     case '12':
@@ -166,17 +166,8 @@ window.getTypeByGuid = function(guid) {
     case 'd':
       return TYPE_CHAT;
 
-    case 'r0':
-    case 'r1':
-    case 'r2':
-    case 'r3':
-    case 'r4':
-    case 'r5':
-    case 'r6':
-    case 'r7':
-      return TYPE_RESONATOR;
-
     default:
+      if(guid.slice(-11,-2) == 'resonator') return TYPE_RESONATOR;
       return TYPE_UNKNOWN;
   }
 }

From 36aabc321656ff8400f9160b370d07fb91153de5 Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 22:58:08 +0800
Subject: [PATCH 10/27] Comment correction Correct comment of
 "portalResonatorGuid"

---
 code/map_data.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 704abccc..5d29de6a 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -317,8 +317,7 @@ window.renderResonators = function(ent) {
   }
 }
 
-// replace .11 or .12 in portal guid with .r[slot] to
-// get guid for resonators
+// append portal guid with -resonator-[slot] to get guid for resonators
 window.portalResonatorGuid = function(portalGuid, slot){
   return portalGuid + '-resonator-' + slot;
 }

From 259905b2242c6df557aa14476f90023e9551ac9b Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Sun, 10 Feb 2013 23:21:53 +0800
Subject: [PATCH 11/27] Add contributor Add [sorgo](https://github.com/sorgo)
 as contributor for his rendering code.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b5a6486d..afd73b95 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Contributors
 [mledoze](https://github.com/mledoze),
 [OshiHidra](https://github.com/OshiHidra),
 [Scrool](https://github.com/Scrool),
+[sorgo](https://github.com/sorgo),
 [Xelio](https://github.com/Xelio),
 [ZauberNerd](https://github.com/ZauberNerd)
 

From c94a95c3424fe692c746566bef107874a435af14 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 17:03:32 +0100
Subject: [PATCH 12/27] fix #74

---
 style.css | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/style.css b/style.css
index eebbc734..8a5505d2 100644
--- a/style.css
+++ b/style.css
@@ -35,6 +35,19 @@ body {
   overflow-x:hidden;
 }
 
+#sidebartoggle {
+  display: block;
+  padding: 5px;
+  position: absolute;
+  top: 50%;
+  z-index: 3000;
+  background-color: rgba(8, 48, 78, 0.9);
+  color: #FFCE00;
+  border: 1px solid #20A8B1;
+  border-right: none;
+  border-radius: 5px 0 0 5px;
+  text-decoration: none;
+}
 
 .enl {
   color: #03fe03 !important;
@@ -357,11 +370,16 @@ h3 {
 .mods {
   margin-bottom: 1px;
   margin-top: 5px;
+  height: 75px;
 }
 
 .mods span {
   background: #313131;
-  display: inline-block;
+  /* can’t use inline-block because Webkit’s implementation is buggy and
+   * introduces additional margins in random cases. No clear necessary,
+   * as that’s solved by setting height on .mods. */
+  display: block;
+  float:left;
   height: 63.7px;
   margin-left: 4px;
   overflow: hidden;

From 8bd0b287b7b15d065352095588d77198dbc2d623 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 17:08:17 +0100
Subject: [PATCH 13/27] fix missing space

---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index 8a5505d2..d5c8c67e 100644
--- a/style.css
+++ b/style.css
@@ -500,6 +500,7 @@ aside:nth-child(odd) span {
 
 .linkdetails {
   text-align: center;
+  margin-bottom: 10px;
 }
 .linkdetails aside {
   margin: 0 4px;

From 1f8463e487fd8efae2dce81136e4b87a229d701c Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 17:09:40 +0100
Subject: [PATCH 14/27] likely fix #80

---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index d5c8c67e..88e25f23 100644
--- a/style.css
+++ b/style.css
@@ -448,6 +448,7 @@ aside:nth-child(odd) span {
 
 /* resonators */
 #resodetails {
+  white-space: nowrap;
   margin: 16px 0;
   -moz-column-gap: 10px;
   -moz-column-width: 141px;

From 16e0f69929e3787a26aa8ab161794a8469dd88c8 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 18:47:45 +0100
Subject: [PATCH 15/27] =?UTF-8?q?hack=20range=20must=20obviously=20be=20la?=
 =?UTF-8?q?rger=20than=2035m=20if=20I=E2=80=99m=20seeing=20portals=20with?=
 =?UTF-8?q?=20avg=20reso=20dist=20being=2039m?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.js b/main.js
index e4eaa2c8..22ff37b0 100644
--- a/main.js
+++ b/main.js
@@ -130,7 +130,7 @@ var RANGE_INDICATOR_COLOR = 'red';
 var RESO_NRG = [0, 1000, 1500, 2000, 2500, 3000, 4000, 5000, 6000];
 var MAX_XM_PER_LEVEL = [0, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000];
 var MIN_AP_FOR_LEVEL = [0, 10000, 30000, 70000, 150000, 300000, 600000, 1200000];
-var HACK_RANGE = 35; // in meters, max. distance from portal to be able to access it
+var HACK_RANGE = 40; // in meters, max. distance from portal to be able to access it
 var OCTANTS = ['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'];
 var DEFAULT_PORTAL_IMG = 'http://commondatastorage.googleapis.com/ingress/img/default-portal-image.png';
 

From 7e6c8019764bcd27e5ab76d0d8704337f2cf5b05 Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Sun, 10 Feb 2013 19:04:47 +0100
Subject: [PATCH 16/27] CSS for clipboard-aware chat modified to be backwards
 compatible

---
 style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/style.css b/style.css
index 6ce0e51a..0fd56217 100644
--- a/style.css
+++ b/style.css
@@ -195,7 +195,7 @@ summary {
   width: 683px;
 }
 
-#chat .blockquote {
+#chat span {
   display: inline-block;
   width: 540px;
 }
@@ -214,7 +214,6 @@ summary {
 
 #chat .invisibleseparator {
     color: rgba(8, 48, 78, 0.0);
-    display: inline-block;
     width: 0px;
 }
 

From 7b7f229ac5b3ef814f39af86d234ec567d9af929 Mon Sep 17 00:00:00 2001
From: Xelio <xelio.cheong@gmail.com>
Date: Mon, 11 Feb 2013 02:22:35 +0800
Subject: [PATCH 17/27] Change resonators render min zoom level and radius
 Change: Resonators render minimum zoom level 16 -> 17 Resonators render
 radius 4 -> 3 Some cleanup and performance tuning

---
 code/boot.js     |  2 +-
 code/map_data.js | 12 ++++++------
 main.js          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index e77d4630..ec9be61c 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -102,7 +102,7 @@ window.setupMap = function() {
       portalsLayers[i].eachLayer(function(item) {
         var itemGuid = item.options.guid;
         // check if 'item' is a resonator
-        if(!window.resonators[itemGuid]) return;
+        if(getTypeByGuid(itemGuid) != TYPE_RESONATOR) return true;
         portalsLayers[i].removeLayer(item);
       });
     }
diff --git a/code/map_data.js b/code/map_data.js
index 5d29de6a..36b3fe7a 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -146,11 +146,11 @@ window.cleanUp = function() {
     portalsLayers[i].eachLayer(function(item) {
       var itemGuid = item.options.guid;
       // check if 'item' is a portal
-      if(!window.portals[itemGuid]) return;
+      if(getTypeByGuid(itemGuid) != TYPE_PORTAL) return true;
       // portal must be in bounds and have a high enough level. Also don’t
       // remove if it is selected.
       if(itemGuid == window.selectedPortal ||
-        (b.contains(item.getLatLng()) && i >= minlvl)) return;
+        (b.contains(item.getLatLng()) && i >= minlvl)) return true;
       cnt[0]++;
       portalsLayers[i].removeLayer(item);
     });
@@ -188,7 +188,7 @@ window.removeByGuid = function(guid) {
       break;
     case TYPE_RESONATOR:
       if(!window.resonators[guid]) return;
-      var r = window.resonators[guid]
+      var r = window.resonators[guid];
       for(var i = 1; i < portalsLayers.length; i++)
         portalsLayers[i].removeLayer(r);
       break;
@@ -297,7 +297,7 @@ window.renderResonators = function(ent) {
     var lon0 = ent[2].locationE6.lngE6/1E6 + dLon * 180/Math.PI;
     var Rlatlng = [lat0, lon0];
     var r =  L.circleMarker(Rlatlng, {
-        radius: 4,
+        radius: 3,
         // #AAAAAA outline seems easier to see the fill opacity
         color: '#AAAAAA',
         opacity: 1,
@@ -318,11 +318,11 @@ window.renderResonators = function(ent) {
 }
 
 // append portal guid with -resonator-[slot] to get guid for resonators
-window.portalResonatorGuid = function(portalGuid, slot){
+window.portalResonatorGuid = function(portalGuid, slot) {
   return portalGuid + '-resonator-' + slot;
 }
 
-window.isResonatorsShow = function(){
+window.isResonatorsShow = function() {
   return map.getZoom() >= RESONATOR_DISPLAY_ZOOM_LEVEL;
 }
 
diff --git a/main.js b/main.js
index d3a90b14..b27b56e6 100644
--- a/main.js
+++ b/main.js
@@ -145,7 +145,7 @@ var PLAYER = window.PLAYER;
 var CHAT_SHRINKED = 60;
 
 // Minimum zoom level resonator will display
-var RESONATOR_DISPLAY_ZOOM_LEVEL = 16;
+var RESONATOR_DISPLAY_ZOOM_LEVEL = 17;
 
 // Constants for resonator positioning
 var SLOT_TO_LAT = [0, Math.sqrt(2)/2, 1, Math.sqrt(2)/2, 0, -Math.sqrt(2)/2, -1, -Math.sqrt(2)/2];

From c66bc0f17165e13d721f50e655fc1361438d70b6 Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Sun, 10 Feb 2013 19:22:35 +0100
Subject: [PATCH 18/27] Hide elements used only for clipboard & removed unused
 selector

---
 code/chat.js | 2 +-
 style.css    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/chat.js b/code/chat.js
index 87399417..4217bb32 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -456,7 +456,7 @@ window.chat.renderMsg = function(msg, nick, time, team) {
   var t = '<time title="'+tb+'" data-timestamp="'+time+'">'+ta+'</time>';
   var s = 'style="color:'+COLORS[team]+'"';
   var title = nick.length >= 8 ? 'title="'+nick+'" class="help"' : '';
-  return '<p>'+t+'<span class="invisibleseparator"> &lt;</span><mark '+s+'>'+nick+'</mark><span class="invisibleseparator">&gt; </span><span class="blockquote">'+msg+'</span></p>';
+  return '<p>'+t+'<span class="invisibleseparator"> &lt;</span><mark '+s+'>'+nick+'</mark><span class="invisibleseparator">&gt; </span><span>'+msg+'</span></p>';
 }
 
 
diff --git a/style.css b/style.css
index 0fd56217..d271b4c4 100644
--- a/style.css
+++ b/style.css
@@ -214,6 +214,7 @@ summary {
 
 #chat .invisibleseparator {
     color: rgba(8, 48, 78, 0.0);
+    overflow: hidden;
     width: 0px;
 }
 

From 686497501b052a00383d838a34b0d3565a2ca58c Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 19:39:28 +0100
Subject: [PATCH 19/27] catch being logged in, but stating that the account is
 not allowed to play ingress.

It will simply reload the page right now after 10s. The user is probably faster to do this
manually, but it solves the problem where the tab is opened and forgotten.
---
 main.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/main.js b/main.js
index 0def816c..596b916f 100644
--- a/main.js
+++ b/main.js
@@ -28,6 +28,19 @@ for(var x in scr) {
   break;
 }
 
+
+if(!d) {
+  // page doesn’t have a script tag with player information.
+  if(document.getElementById('header_email')) {
+    // however, we are logged in.
+    setTimeout('location.reload();', 10*1000);
+    throw('Page doesn’t have player data, but you are logged in. Reloading in 10s.');
+  }
+  // FIXME: handle nia takedown in progress
+  throw('Couldn’t retrieve player data. Are you logged in?');
+}
+
+
 for(var i = 0; i < d.length; i++) {
   if(!d[i].match('var PLAYER = ')) continue;
   eval(d[i].match(/^var /, 'window.'));

From a6ae188548fc339d1b0c923c5a284a10c14981dd Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 19:45:25 +0100
Subject: [PATCH 20/27] size portals by their level. Slightly modified patch by
 OshiHidra. Fixes #24, #29

---
 code/map_data.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 98749a6a..a78f6eb3 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -226,12 +226,14 @@ window.renderPortal = function(ent) {
   }
 
   var team = getTeam(ent[2]);
+  var lvWeight = Math.max(2, portalLevel / 1.5);
+  var lvRadius = portalLevel + 3;
 
   var p = L.circleMarker(latlng, {
-    radius: 7,
+    radius: lvRadius,
     color: ent[0] == selectedPortal ? COLOR_SELECTED_PORTAL : COLORS[team],
     opacity: 1,
-    weight: 3,
+    weight: lvWeight,
     fillColor: COLORS[team],
     fillOpacity: 0.5,
     clickable: true,
@@ -242,13 +244,13 @@ window.renderPortal = function(ent) {
   p.on('remove',   function() {
     var portalGuid = this.options.guid
 
-    // remove attached resonators, skip if 
+    // remove attached resonators, skip if
     // all resonators have already removed by zooming
     if(isResonatorsShow()) {
       for(var i = 0; i <= 7; i++)
         removeByGuid(portalResonatorGuid(portalGuid,i));
     }
-    delete window.portals[portalGuid]; 
+    delete window.portals[portalGuid];
   });
   p.on('add',      function() {
     window.portals[this.options.guid] = this;
@@ -278,19 +280,19 @@ window.renderResonators = function(ent) {
 
   for(var i=0; i < ent[2].resonatorArray.resonators.length; i++) {
     var rdata = ent[2].resonatorArray.resonators[i];
-    
+
     if(rdata == null) continue;
-    
+
     if(window.resonators[portalResonatorGuid(ent[0],i)]) continue;
 
     // offset in meters
     var dn = rdata.distanceToPortal*SLOT_TO_LAT[rdata.slot];
     var de = rdata.distanceToPortal*SLOT_TO_LNG[rdata.slot];
- 	 
+
     // Coordinate offset in radians
     var dLat = dn/EARTH_RADIUS;
     var dLon = de/(EARTH_RADIUS*Math.cos(Math.PI/180*(ent[2].locationE6.latE6/1E6)));
- 	
+
     // OffsetPosition, decimal degrees
     var lat0 = ent[2].locationE6.latE6/1E6 + dLat * 180/Math.PI;
     var lon0 = ent[2].locationE6.lngE6/1E6 + dLon * 180/Math.PI;

From 1816e153f6cce0195a1834032bf1b53cfe515397 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 20:05:46 +0100
Subject: [PATCH 21/27] fix #85

---
 code/utils_misc.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/utils_misc.js b/code/utils_misc.js
index aa8d44a5..de0df1c6 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -141,8 +141,13 @@ window.scrollBottom = function(elm) {
 }
 
 window.zoomToAndShowPortal = function(guid, latlng) {
-  renderPortalDetails(guid);
   map.setView(latlng, 17);
+  // if the data is available, render it immediately. Otherwise defer
+  // until it becomes available.
+  if(window.portals[guid])
+    renderPortalDetails(guid);
+  else
+    urlPortal = guid;
 }
 
 // translates guids to entity types
@@ -154,7 +159,7 @@ window.getTypeByGuid = function(guid) {
   // .b  == fields
   // .c  == player/creator
   // .d  == chat messages
-  // 
+  //
   // resonator guid is [portal guid]-resonator-[slot]
   switch(guid.slice(33)) {
     case '11':

From 8c7e63a7f82513c7822e2a02518de1e8b07c5834 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 20:50:31 +0100
Subject: [PATCH 22/27] =?UTF-8?q?don=E2=80=99t=20remove=20&=20re-render=20?=
 =?UTF-8?q?portals=20if=20nothing=20changed=20for=20them.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/map_data.js     | 38 +++++++++++++++++++-------------------
 code/player_names.js | 15 +++++++++++++++
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index a78f6eb3..c911c35e 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -201,31 +201,30 @@ window.removeByGuid = function(guid) {
 
 // renders a portal on the map from the given entity
 window.renderPortal = function(ent) {
-  removeByGuid(ent[0]);
-
   if(Object.keys(portals).length >= MAX_DRAWN_PORTALS && ent[0] != selectedPortal)
-    return;
-
-  var latlng = [ent[2].locationE6.latE6/1E6, ent[2].locationE6.lngE6/1E6];
-  // needs to be checked before, so the portal isn’t added to the
-  // details list and other places
-  //if(!getPaddedBounds().contains(latlng)) return;
+    return removeByGuid(ent[0]);
 
   // hide low level portals on low zooms
   var portalLevel = getPortalLevel(ent[2]);
-  if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal) return;
-
-  // pre-load player names for high zoom levels
-  if(map.getZoom() >= PRECACHE_PLAYER_NAMES_ZOOM) {
-    if(ent[2].captured && ent[2].captured.capturingPlayerId)
-      getPlayerName(ent[2].captured.capturingPlayerId);
-    if(ent[2].resonatorArray && ent[2].resonatorArray.resonators)
-      $.each(ent[2].resonatorArray.resonators, function(ind, reso) {
-        if(reso) getPlayerName(reso.ownerGuid);
-      });
-  }
+  if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal)
+    return removeByGuid(ent[0]);
 
   var team = getTeam(ent[2]);
+
+  // do nothing if portal did not change
+  var old = window.portals[ent[0]];
+  if(old && old.options.level === portalLevel && old.options.team === team)
+    return;
+
+  // there were changes, remove old portal
+  removeByGuid(ent[0]);
+
+  var latlng = [ent[2].locationE6.latE6/1E6, ent[2].locationE6.lngE6/1E6];
+
+  // pre-loads player names for high zoom levels
+  loadPlayerNamesForPortal(ent[2]);
+
+
   var lvWeight = Math.max(2, portalLevel / 1.5);
   var lvRadius = portalLevel + 3;
 
@@ -238,6 +237,7 @@ window.renderPortal = function(ent) {
     fillOpacity: 0.5,
     clickable: true,
     level: portalLevel,
+    team: team,
     details: ent[2],
     guid: ent[0]});
 
diff --git a/code/player_names.js b/code/player_names.js
index 47caed80..9bbc251e 100644
--- a/code/player_names.js
+++ b/code/player_names.js
@@ -46,3 +46,18 @@ window.resolvePlayerNames = function() {
 window.setPlayerName = function(guid, nick) {
   localStorage[guid] = nick;
 }
+
+
+window.loadPlayerNamesForPortal = function(portal_details) {
+  if(map.getZoom() < PRECACHE_PLAYER_NAMES_ZOOM) return;
+  var e = portal_details;
+
+  if(e.captured && e.captured.capturingPlayerId)
+    getPlayerName(e.captured.capturingPlayerId);
+
+  if(!e.resonatorArray || !e.resonatorArray.resonators) return;
+
+  $.each(e.resonatorArray.resonators, function(ind, reso) {
+    if(reso) getPlayerName(reso.ownerGuid);
+  });
+}

From 0bd102e823afa166f3c4d972f4d09cf0f40a931e Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 21:13:17 +0100
Subject: [PATCH 23/27] avoid rendering portal details for hidden portals. They
 do not get updated and thus outdated info might be shown.

---
 code/map_data.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/map_data.js b/code/map_data.js
index c911c35e..61c4b81d 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -251,6 +251,11 @@ window.renderPortal = function(ent) {
         removeByGuid(portalResonatorGuid(portalGuid,i));
     }
     delete window.portals[portalGuid];
+    if(window.selectedPortal === portalGuid) {
+      window.unselectOldPortal();
+      window.map.removeLayer(window.portalAccessIndicator);
+      window.portalAccessIndicator = null;
+    }
   });
   p.on('add',      function() {
     window.portals[this.options.guid] = this;

From d0df5b84a3ddd15a7de120a557a1c0b436a99b1b Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 22:30:24 +0100
Subject: [PATCH 24/27] probably fix #90

---
 code/map_data.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 61c4b81d..32cf3cb8 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -123,7 +123,11 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
   });
 
   $.each(ppp, function(ind, portal) { renderPortal(portal); });
-  if(portals[selectedPortal]) portals[selectedPortal].bringToFront();
+  if(portals[selectedPortal]) {
+    try {
+      portals[selectedPortal].bringToFront();
+    } catch(e) { /* portal is now visible, catch Leaflet error */ }
+  }
 
   if(portalInUrlAvailable) {
     renderPortalDetails(urlPortal);
@@ -359,8 +363,11 @@ window.renderLink = function(ent) {
   if(!getPaddedBounds().intersects(poly.getBounds())) return;
 
   poly.on('remove', function() { delete window.links[this.options.guid]; });
-  poly.on('add',    function() { window.links[this.options.guid] = this; });
-  poly.addTo(linksLayer).bringToBack();
+  poly.on('add',    function() {
+    window.links[this.options.guid] = this;
+    this.bringToBack();
+  });
+  poly.addTo(linksLayer);
 }
 
 // renders a field on the map from a given entity
@@ -387,6 +394,9 @@ window.renderField = function(ent) {
   if(!getPaddedBounds().intersects(poly.getBounds())) return;
 
   poly.on('remove', function() { delete window.fields[this.options.guid]; });
-  poly.on('add',    function() { window.fields[this.options.guid] = this; });
-  poly.addTo(fieldsLayer).bringToBack();
+  poly.on('add',    function() {
+    window.fields[this.options.guid] = this;
+    this.bringToBack();
+  });
+  poly.addTo(fieldsLayer);
 }

From 1bbbe05a8607db41f35153c7420a7c7be48587b6 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 23:07:33 +0100
Subject: [PATCH 25/27] add hooks framework and add hook for portal added
 (fixes #87)

---
 code/hooks.js     | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 code/map_data.js  |  2 ++
 plugins/README.md |  6 ++++++
 3 files changed, 55 insertions(+)
 create mode 100644 code/hooks.js

diff --git a/code/hooks.js b/code/hooks.js
new file mode 100644
index 00000000..f5b90d0b
--- /dev/null
+++ b/code/hooks.js
@@ -0,0 +1,47 @@
+// PLUGIN HOOKS ////////////////////////////////////////////////////////
+// Plugins may listen to any number of events by specifying the name of
+// the event to listen to and handing a function that should be exe-
+// cuted when an event occurs. Callbacks will receive additional data
+// the event created as their first parameter. The value is always a
+// hash that contains more details.
+//
+// For example, this line will listen for portals to be added and print
+// the data generated by the event to the console:
+// window.addHook('portalAdded', function(data) { console.log(data) });
+//
+// Boot hook: booting is handled differently because IITC may not yet
+//            be available. Have a look at the plugins in plugins/. All
+//            code before “// PLUGIN START” and after “// PLUGIN END” os
+//            required to successfully boot the plugin.
+//
+// Here’s more specific information about each event:
+// portalAdded: called when a portal has been received and is about to
+//              be added to its layer group. Note that this does NOT
+//              mean it is already visible or will be, shortly after.
+//              If a portal is added to a hidden layer it may never be
+//              shown at all. Injection point is in
+//              code/map_data.js#renderPortal near the end. Will hand
+//              the Leaflet CircleMarker for the portal in "portal" var.
+
+window._hooks = {}
+window.VALID_HOOKS = ['portalAdded'];
+
+window.runHooks = function(event, data) {
+  if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);
+
+  if(!_hooks[event]) return;
+  $.each(_hooks[event], function(ind, callback) {
+    callback(data);
+  });
+}
+
+
+window.addHook = function(event, callback) {
+  if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);
+  if(typeof callback !== 'function') throw('Callback must be a function.');
+
+  if(!_hooks[event])
+    _hooks[event] = [callback];
+  else
+    _hooks[event].push(callback);
+}
diff --git a/code/map_data.js b/code/map_data.js
index 32cf3cb8..3bc7a169 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -276,6 +276,8 @@ window.renderPortal = function(ent) {
 
   window.renderResonators(ent);
 
+  window.runHooks('portalAdded', {portal: p});
+
   // portalLevel contains a float, need to round down
   p.addTo(portalsLayers[parseInt(portalLevel)]);
 }
diff --git a/plugins/README.md b/plugins/README.md
index 1b872227..310077f6 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -20,3 +20,9 @@ Plugins may be developed in the same way as the total conversion script. Plugins
 You can use the guess player level script as an example to get you started. Just update the names and the part between `// PLUGIN START` and  `// PLUGIN END` and you should be able to develop your plugin. The other code ensures your plugin is executed after the main script.
 
 If you happen the write general purpose functions for your plugin, consider adding them to the main script instead. For example, if you write a `getResoCountFromPortal(details)` function it may be very well added to `code/portal_info.js`.
+
+
+Available Hooks
+---------------
+
+Available hooks are documented in the code. Please refer to the [boilerplate explanation in `hooks.js`](https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/code/hooks.js) to see which are available and how to listen for them. If you need additional hooks, open bug reports (preferably with patches attached).

From e1c3c9e73bbec6c6ef5b9f677a87effe205452a4 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 23:38:05 +0100
Subject: [PATCH 26/27] portal mods for unclaimed portals were missing border

---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index 38ae0e2f..19a0afc6 100644
--- a/style.css
+++ b/style.css
@@ -392,6 +392,7 @@ h3 {
   text-align: center;
   width: 63.7px;
   cursor:help;
+  border: 1px solid #666;
 }
 
 .mods span[title=""] {

From e92a9e13b1babeb8accef37da03440d97df63da8 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Sun, 10 Feb 2013 23:49:01 +0100
Subject: [PATCH 27/27] add permalink feature

---
 code/utils_misc.js | 8 ++++++++
 main.js            | 2 +-
 style.css          | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/code/utils_misc.js b/code/utils_misc.js
index de0df1c6..2f982f7e 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -198,3 +198,11 @@ if (typeof String.prototype.startsWith !== 'function') {
 window.prettyEnergy = function(nrg) {
   return nrg> 1000 ? Math.round(nrg/1000) + ' k': nrg;
 }
+
+window.setPermaLink = function(elm) {
+  var c = map.getCenter();
+  var lat = Math.round(c.lat*1E6);
+  var lng = Math.round(c.lng*1E6);
+  var qry = 'latE6='+lat+'&lngE6='+lng+'&z=' + map.getZoom();
+  $(elm).attr('href',  'http://www.ingress.com/intel?' + qry);
+}
diff --git a/main.js b/main.js
index 596b916f..c3453b4a 100644
--- a/main.js
+++ b/main.js
@@ -78,7 +78,7 @@ document.getElementsByTagName('body')[0].innerHTML = ''
   + '    <input id="geosearch" placeholder="Search location…" type="text"/>'
   + '    <div id="portaldetails"></div>'
   + '    <input id="redeem" placeholder="Redeem code…" type="text"/>'
-  + '    <div id="toolbox"></div>'
+  + '    <div id="toolbox"><a onmouseover="setPermaLink(this)">permalink</a></div>'
   + '    <div id="spacer"></div>'
   + '    <div id="updatestatus"></div>'
   + '  </div>';
diff --git a/style.css b/style.css
index 19a0afc6..00185a17 100644
--- a/style.css
+++ b/style.css
@@ -519,6 +519,10 @@ aside:nth-child(odd) span {
   font-size:90%;
 }
 
+#toolbox > a {
+  padding: 5px;
+}
+
 #spacer {
   /* cheap hack to prevent sidebar content being overlayed by the map
    * status box */