From c9e27018909466ddc505471dd7b55d711e15f66d Mon Sep 17 00:00:00 2001
From: Jakub Ludwig <domaci.pirozek@gmail.com>
Date: Sat, 9 Feb 2013 11:10:53 +0100
Subject: [PATCH 01/16] AP for destroying portal

Calculate AP gained from destroyed resonators + link
TODO: fields :)
---
 code/portal_detail_display.js       |  1 +
 code/portal_detail_display_tools.js | 22 ++++++++++++++++++++++
 main.js                             |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index 2187b34b..d9d308d9 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -66,6 +66,7 @@ window.renderPortalDetails = function(guid) {
         + '<div class="mods">'+getModDetails(d)+'</div>'
         + '<div id="randdetails">'+randDetails+'</div>'
         + '<div id="resodetails">'+getResonatorDetails(d)+'</div>'
+        + '<div id="destroydetails">'+getDestroyAP(d)+'</div>'
         + '<div class="linkdetails">'
         + '<aside><a href="'+perma+'">portal link</a></aside>'
         + '<aside><a onclick="window.reportPortalIssue(\''+getReportIssueInfoText(d)+'\')">report issue</a></aside>'
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index b02d40be..42cf0c95 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -131,3 +131,25 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) {
   var text = '<span class="meter-text '+cls+'">'+(nick||'')+'</span>';
   return (slot <= 3 ? text+meter : meter+text) + '<br/>';
 }
+
+// calculate AP gain from destroying portal
+// so far it counts only resonators + links
+window.getDestroyAP = function(d) {
+  console.log('rendering destroy AP');
+  var res_count = 0;
+  var links = 0;
+
+  $.each(d.resonatorArray.resonators, function(ind, reso) 
+  {
+    res_count += 1;
+  });
+
+  if(d.portalV2.linkedEdges) $.each(d.portalV2.linkedEdges, function(ind, link) 
+  {
+    links++;
+  });
+
+  var ap_count = (res_count * DESTROY_RESONATOR) + (links * DESTROY_LINK);
+  
+  return 'Destroy ' + res_count + 'x res + ' + links + 'x link -> <strong style="color: #FFCE00">' + ap_count + '</strong>AP';
+}
diff --git a/main.js b/main.js
index f34165eb..b99017df 100644
--- a/main.js
+++ b/main.js
@@ -128,6 +128,8 @@ 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 OCTANTS = ['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'];
 var DEFAULT_PORTAL_IMG = 'http://commondatastorage.googleapis.com/ingress/img/default-portal-image.png';
+var DESTROY_RESONATOR = 75; //AP for destroying portal
+var DESTROY_LINK = 187; //AP fro destroying link
 
 // OTHER MORE-OR-LESS CONSTANTS //////////////////////////////////////
 var NOMINATIM = 'http://nominatim.openstreetmap.org/search?format=json&limit=1&q=';

From 74be29ea29142d232fda2affe5bc84df20c78a2d Mon Sep 17 00:00:00 2001
From: Cameron Moon <cameron@moon.net.au>
Date: Mon, 11 Feb 2013 12:25:47 +1100
Subject: [PATCH 02/16] Made the sidebar transparent like the chat box

---
 code/boot.js | 13 ++++++-------
 style.css    | 23 ++++++++++-------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index b4d927ba..246d6c1f 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -27,14 +27,14 @@ window.setupLargeImagePreview = function() {
 
 window.setupStyles = function() {
   $('head').append('<style>' +
-    [ '#map { margin-right: '+(SIDEBAR_WIDTH+2)+'px } ',
-      '#largepreview.enl img { border:2px solid '+COLORS[TEAM_ENL]+'; } ',
+    [ '#largepreview.enl img { border:2px solid '+COLORS[TEAM_ENL]+'; } ',
       '#largepreview.res img { border:2px solid '+COLORS[TEAM_RES]+'; } ',
       '#largepreview.none img { border:2px solid '+COLORS[TEAM_NONE]+'; } ',
       '#chatcontrols { bottom: '+(CHAT_SHRINKED+24)+'px; }',
       '#chat { height: '+CHAT_SHRINKED+'px; } ',
+      '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ',
       '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4)+'px;  } ',
-      '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 2 /*border*/)+'px;  } ',
+      '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 1 /*border*/)+'px;  } ',
       '#sidebartoggle { right:'+SIDEBAR_WIDTH+'px;  } ',
       '#scrollwrapper  { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ',
       '#sidebar input, h2, #updatestatus  { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ',
@@ -176,16 +176,15 @@ window.setupSidebarToggle = function() {
     var sidebar = $('#sidebar');
     if(sidebar.is(':visible')) {
       sidebar.hide();
-      $('#map').css('margin-right','0');
+      $('.leaflet-right').css('margin-right','0');
       toggle.html('◢<br>◥');
       toggle.css('right', '0');
     } else {
       sidebar.show();
-      $('#map').css('margin-right', SIDEBAR_WIDTH+2+'px');
+      $('.leaflet-right').css('margin-right', SIDEBAR_WIDTH+1+'px');
       toggle.html('◣<br>◤');
-      toggle.css('right', SIDEBAR_WIDTH+'px');
+      toggle.css('right', SIDEBAR_WIDTH+1+'px');
     }
-    window.map.invalidateSize(false);
   });
 }
 
diff --git a/style.css b/style.css
index 45145173..30b50d61 100644
--- a/style.css
+++ b/style.css
@@ -10,10 +10,6 @@ body {
   margin: 0;
 }
 
-#map {
-  margin-right:302px;
-}
-
 #scrollwrapper {
   height: 100%;
   overflow: hidden;
@@ -24,8 +20,8 @@ body {
 }
 
 #sidebar {
-  background: #000;
-  border-left: 2px solid #c3c3c3;
+  background-color: rgba(8, 48, 78, 0.9);
+  border-left: 1px solid #20A8B1;
   color: #888;
   height: 100%;
   position: relative;
@@ -33,16 +29,17 @@ body {
   top: 0;
   overflow-y:scroll;
   overflow-x:hidden;
+  z-index: 3000;
 }
 
 #sidebartoggle {
   display: block;
-  padding: 10px 5px;
+  padding: 20px 5px;
   margin-top: -31px;
   line-height: 10px;
   position: absolute;
   top: 50%;
-  z-index: 3000;
+  z-index: 3001;
   background-color: rgba(8, 48, 78, 0.9);
   color: #FFCE00;
   border: 1px solid #20A8B1;
@@ -257,7 +254,7 @@ summary {
 /* sidebar ************************************************************/
 
 #sidebar > * {
-  border-bottom: 1px solid #c3c3c3;
+  border-bottom: 1px solid #20A8B1;
 }
 
 
@@ -321,7 +318,7 @@ h2 sup, h2 sub {
 
 /* geosearch input, and others */
 input {
-  background: #313131;
+  background-color: rgba(0, 0, 0, 0.3);
   color: #ffce00;
   height: 22px;
   line-height: 22px;
@@ -381,7 +378,7 @@ h3 {
 }
 
 .mods span {
-  background: #313131;
+  background-color: rgba(0, 0, 0, 0.3);
   /* 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. */
@@ -541,9 +538,9 @@ aside:nth-child(odd) span {
 
 /* update status */
 #updatestatus {
-  background: #000;
+  background-color: rgba(8, 48, 78, 1);
   border-bottom: 0;
-  border-top: 1px solid #c3c3c3;
+  border-top: 1px solid #20A8B1;
   bottom: 0;
   color: #ffce00;
   font-size:13px;

From 543fc5ce5bc63ee3768186bae218c2d41440aeba Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 08:57:26 +0100
Subject: [PATCH 03/16] improve portal number separation from background (trick
 by jonatkins)

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

diff --git a/style.css b/style.css
index 45145173..b80d86fd 100644
--- a/style.css
+++ b/style.css
@@ -369,7 +369,7 @@ h3 {
   font-size: 40px;
   position: absolute;
   right: 10px;
-  text-shadow: 0 0 2px #000000, 0 0 5px #ffffff;
+  text-shadow: -1px -1px #000, 1px -1px #000, -1px 1px #000, 1px 1px #000, 0 0 5px #fff;
   top: 100px;
 }
 

From 81ed7e279c641a27cb1c9138f1ea6034a9b3b027 Mon Sep 17 00:00:00 2001
From: Cameron Moon <cameron@moon.net.au>
Date: Mon, 11 Feb 2013 19:24:41 +1100
Subject: [PATCH 04/16] fixed #100 by explictly setting encoding (credit to
 breunigs)

---
 build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.py b/build.py
index b690a2ed..ef764cc1 100755
--- a/build.py
+++ b/build.py
@@ -4,7 +4,7 @@ import glob
 import time
 
 def readfile(fn):
-    with open(fn, 'Ur') as f:
+    with open(fn, 'Ur', encoding='utf8') as f:
         return f.read()
 
 c = '\n\n'.join(map(readfile, glob.glob('code/*')))
@@ -14,7 +14,7 @@ m = m.split('@@INJECTHERE@@')
 m.insert(1, c)
 t = '\n\n'.join(m)
 
-with open('total-conversion-build.user.js', 'w') as f:
+with open('total-conversion-build.user.js', 'w', encoding='utf8') as f:
     f.write(t)
 
 # vim: ai si ts=4 sw=4 sts=4 et

From 781ee0dd3bea5d8cd86fae4b169fbf616ec4165d Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 11:29:17 +0100
Subject: [PATCH 05/16] be less verbose about sidebar updates

---
 code/portal_detail_display_tools.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index 21fe3b91..95b5798a 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -79,7 +79,6 @@ window.getAvgResoDistText = function(d) {
 }
 
 window.getResonatorDetails = function(d) {
-  console.log('rendering reso details');
   var resoDetails = '';
   // octant=slot: 0=E, 1=NE, 2=N, 3=NW, 4=W, 5=SW, 6=S, SE=7
   // resos in the display should be ordered like this:

From 64bf9e1f70739d4c871a51e5ea1b981cd288df85 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 11:30:56 +0100
Subject: [PATCH 06/16] this patch fixes several issues:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– fix #103 by always re-rendering resonator details.
  A follow-up patch could also avoid re-rendering resos if they did not
  change. Given that there are only a few on these high zoom levels, perf
  improvement might be negligible though.
- fix #91. This avoids drawing portals/links/fields again if they are
  hidden. The patch looks for those hidden entities and either removes
  them before re-drawing (portals) or skips re-drawing altogether:
- Fields and Links are assumed to never change as long as their GUID is
  the same. This avoids deleting and re-creating links/fields all the
  time and might improve speed. Haven’t tested though.
---
 code/map_data.js | 66 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/code/map_data.js b/code/map_data.js
index 34f9dcc4..bcd8ba11 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -216,9 +216,17 @@ window.renderPortal = function(ent) {
   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;
+  var layerGroup = portalsLayers[parseInt(portalLevel)];
+  var old = findEntityInLeaflet(layerGroup, window.portals, ent[0]);
+  if(old) {
+    var oo = old.options;
+    var u = oo.team !== team;
+    u = u || oo.level !== portalLevel;
+    // nothing for the portal changed, so don’t update. Let resonators
+    // manage themselves if they want to be updated.
+    if(!u) return renderResonators(ent);
+    removeByGuid(ent[0]);
+  }
 
   // there were changes, remove old portal
   removeByGuid(ent[0]);
@@ -245,7 +253,7 @@ window.renderPortal = function(ent) {
     details: ent[2],
     guid: ent[0]});
 
-  p.on('remove',   function() {
+  p.on('remove', function() {
     var portalGuid = this.options.guid
 
     // remove attached resonators, skip if
@@ -261,13 +269,17 @@ window.renderPortal = function(ent) {
       window.portalAccessIndicator = null;
     }
   });
-  p.on('add',      function() {
+
+  p.on('add', function() {
+    // enable for debugging
+    if(window.portals[this.options.guid]) throw('duplicate portal detected');
     window.portals[this.options.guid] = this;
     // handles the case where a selected portal gets removed from the
     // map by hiding all portals with said level
     if(window.selectedPortal != this.options.guid)
       window.portalResetColor(this);
   });
+
   p.on('click',    function() { window.renderPortalDetails(ent[0]); });
   p.on('dblclick', function() {
     window.renderPortalDetails(ent[0]);
@@ -279,11 +291,10 @@ window.renderPortal = function(ent) {
   window.runHooks('portalAdded', {portal: p});
 
   // portalLevel contains a float, need to round down
-  p.addTo(portalsLayers[parseInt(portalLevel)]);
+  p.addTo(layerGroup);
 }
 
 window.renderResonators = function(ent) {
-
   var portalLevel = getPortalLevel(ent[2]);
   if(portalLevel < getMinPortalLevel()  && ent[0] != selectedPortal) return;
 
@@ -344,8 +355,12 @@ window.portalResetColor = function(portal) {
 
 // renders a link on the map from the given entity
 window.renderLink = function(ent) {
-  removeByGuid(ent[0]);
-  if(Object.keys(links).length >= MAX_DRAWN_LINKS) return;
+  if(Object.keys(links).length >= MAX_DRAWN_LINKS)
+    return removeByGuid(ent[0]);
+
+  // assume that links never change. If they do, they will have a
+  // different ID.
+  if(findEntityInLeaflet(linksLayer, links, ent[0])) return;
 
   var team = getTeam(ent[2]);
   var edge = ent[2].edge;
@@ -366,6 +381,8 @@ window.renderLink = function(ent) {
 
   poly.on('remove', function() { delete window.links[this.options.guid]; });
   poly.on('add',    function() {
+    // enable for debugging
+    if(window.links[this.options.guid]) throw('duplicate link detected');
     window.links[this.options.guid] = this;
     this.bringToBack();
   });
@@ -374,8 +391,12 @@ window.renderLink = function(ent) {
 
 // renders a field on the map from a given entity
 window.renderField = function(ent) {
-  window.removeByGuid(ent[0]);
-  if(Object.keys(fields).length >= MAX_DRAWN_FIELDS) return;
+  if(Object.keys(fields).length >= MAX_DRAWN_FIELDS)
+    return window.removeByGuid(ent[0]);
+
+  // assume that fields never change. If they do, they will have a
+  // different ID.
+  if(findEntityInLeaflet(fieldsLayer, fields, ent[0])) return;
 
   var team = getTeam(ent[2]);
   var reg = ent[2].capturedRegion;
@@ -391,14 +412,37 @@ window.renderField = function(ent) {
     clickable: false,
     smoothFactor: 10,
     vertices: ent[2].capturedRegion,
+    lastUpdate: ent[1],
     guid: ent[0]});
 
   if(!getPaddedBounds().intersects(poly.getBounds())) return;
 
   poly.on('remove', function() { delete window.fields[this.options.guid]; });
   poly.on('add',    function() {
+    // enable for debugging
+    if(window.fields[this.options.guid]) console.warn('duplicate field detected');
     window.fields[this.options.guid] = this;
     this.bringToBack();
   });
   poly.addTo(fieldsLayer);
 }
+
+
+// looks for the GUID in either the layerGroup or entityHash, depending
+// on which is faster. Will either return the Leaflet entity or null, if
+// it does not exist.
+// For example, to find a field use the function like this:
+// field = findEntityInLeaflet(fieldsLayer, fields, 'asdasdasd');
+window.findEntityInLeaflet = function(layerGroup, entityHash, guid) {
+  // fast way
+  if(map.hasLayer(layerGroup)) return entityHash[guid] || null;
+
+  // slow way in case the layer is currently hidden
+  var ent = null;
+  layerGroup.eachLayer(function(entity) {
+    if(entity.options.guid !== guid) return true;
+    ent = entity;
+    return false;
+  });
+  return ent;
+}

From b4f273e80b5c83a2f93440629560b69cb660c560 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 11:43:27 +0100
Subject: [PATCH 07/16] user newer Python, old one may have issues with utf-8

---
 build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.py b/build.py
index ef764cc1..611c86e3 100755
--- a/build.py
+++ b/build.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import glob
 import time

From 4a45570f40ee0bcbe892307b6e1de355130bb604 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 12:10:40 +0100
Subject: [PATCH 08/16] =?UTF-8?q?make=20more=20use=20of=20the=20empty=20sp?=
 =?UTF-8?q?ace=20below=20the=20sidebar=20now=20that=20there=E2=80=99s=20a?=
 =?UTF-8?q?=20map=20rendered=20behind=20it=20all=20the=20time?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/boot.js             |  4 ++--
 code/request_handling.js |  2 +-
 main.js                  | 11 +++++------
 style.css                | 12 ++++++------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/code/boot.js b/code/boot.js
index 246d6c1f..dbd9b265 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -33,11 +33,11 @@ window.setupStyles = function() {
       '#chatcontrols { bottom: '+(CHAT_SHRINKED+24)+'px; }',
       '#chat { height: '+CHAT_SHRINKED+'px; } ',
       '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ',
-      '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4)+'px;  } ',
+      '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4+1)+'px;  } ',
       '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 1 /*border*/)+'px;  } ',
       '#sidebartoggle { right:'+SIDEBAR_WIDTH+'px;  } ',
       '#scrollwrapper  { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ',
-      '#sidebar input, h2, #updatestatus  { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ',
+      '#sidebar input, h2  { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ',
       '#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px;  }'].join("\n")
     + '</style>');
 }
diff --git a/code/request_handling.js b/code/request_handling.js
index 60aa00f6..042fc397 100644
--- a/code/request_handling.js
+++ b/code/request_handling.js
@@ -50,7 +50,7 @@ window.renderUpdateStatus = function() {
     t += ' <span style="color:red" class="help" title="Can only render so much before it gets unbearably slow. Not all entities are shown. Zoom in or increase the limit (search for MAX_DRAWN_*).">RENDER LIMIT</span> '
 
   if(window.failedRequestCount > 0)
-    t += ' <span style="color:red">' + window.failedRequestCount + ' requests failed</span>.'
+    t += ' <span style="color:red">' + window.failedRequestCount + ' failed</span>.'
 
   t += '<br/>(';
   var minlvl = getMinPortalLevel();
diff --git a/main.js b/main.js
index 6f722903..a9242ec3 100644
--- a/main.js
+++ b/main.js
@@ -49,14 +49,13 @@ for(var i = 0; i < d.length; i++) {
 // player information is now available in a hash like this:
 // window.PLAYER = {"ap": "123", "energy": 123, "available_invites": 123, "nickname": "somenick", "team": "ALIENS||RESISTANCE"};
 
-
 // remove complete page. We only wanted the user-data and the page’s
 // security context so we can access the API easily. Setup as much as
 // possible without requiring scripts.
 document.getElementsByTagName('head')[0].innerHTML = ''
-  //~ + '<link rel="stylesheet" type="text/css" href="http://0.0.0.0:8000/style.css"/>'
+  + '<link rel="stylesheet" type="text/css" href="http://0.0.0.0:8000/style.css"/>'
   + '<title>Ingress Intel Map</title>'
-  + '<link rel="stylesheet" type="text/css" href="http://breunigs.github.com/ingress-intel-total-conversion/style.css?@@BUILDDATE@@"/>'
+  //~ + '<link rel="stylesheet" type="text/css" href="http://breunigs.github.com/ingress-intel-total-conversion/style.css?@@BUILDDATE@@"/>'
   + '<link rel="stylesheet" type="text/css" href="http://cdn.leafletjs.com/leaflet-0.5/leaflet.css"/>'
   + '<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Coda"/>';
 
@@ -81,9 +80,9 @@ document.getElementsByTagName('body')[0].innerHTML = ''
   + '    <input id="redeem" placeholder="Redeem code…" type="text"/>'
   + '    <div id="toolbox"><a onmouseover="setPermaLink(this)">permalink</a></div>'
   + '    <div id="spacer"></div>'
-  + '    <div id="updatestatus"></div>'
-  + '  </div>';
-  + '</div>';
+  + '  </div>'
+  + '</div>'
+  + '<div id="updatestatus"></div>';
 
 // putting everything in a wrapper function that in turn is placed in a
 // script tag on the website allows us to execute in the site’s context
diff --git a/style.css b/style.css
index 3f79011c..f23b7799 100644
--- a/style.css
+++ b/style.css
@@ -11,22 +11,22 @@ body {
 }
 
 #scrollwrapper {
-  height: 100%;
   overflow: hidden;
   position: fixed;
   right: -38px;
   top: 0;
   width: 340px;
+  bottom: 45px;
 }
 
 #sidebar {
   background-color: rgba(8, 48, 78, 0.9);
   border-left: 1px solid #20A8B1;
   color: #888;
-  height: 100%;
   position: relative;
   left: 0;
   top: 0;
+  max-height: 100%;
   overflow-y:scroll;
   overflow-x:hidden;
   z-index: 3000;
@@ -523,16 +523,14 @@ aside:nth-child(odd) span {
 }
 
 #spacer {
-  /* cheap hack to prevent sidebar content being overlayed by the map
-   * status box */
-  height: 55px;
+  height: 10px;
 }
 
 /* a common portal display takes this much space (prevents moving
  * content when first selecting a portal) */
 
 #portaldetails {
-  min-height: 532px;
+  min-height: 553px;
 }
 
 
@@ -541,12 +539,14 @@ aside:nth-child(odd) span {
   background-color: rgba(8, 48, 78, 1);
   border-bottom: 0;
   border-top: 1px solid #20A8B1;
+  border-left: 1px solid #20A8B1;
   bottom: 0;
   color: #ffce00;
   font-size:13px;
   padding: 4px;
   position: fixed;
   right: 0;
+  z-index:3002;
 }
 
 

From c170995da704b0804bbe15d6d07e025824a84fc1 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 12:36:14 +0100
Subject: [PATCH 09/16] fix style sheet link (thanks cmrn)

---
 main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.js b/main.js
index a9242ec3..0a229350 100644
--- a/main.js
+++ b/main.js
@@ -53,9 +53,9 @@ for(var i = 0; i < d.length; i++) {
 // security context so we can access the API easily. Setup as much as
 // possible without requiring scripts.
 document.getElementsByTagName('head')[0].innerHTML = ''
-  + '<link rel="stylesheet" type="text/css" href="http://0.0.0.0:8000/style.css"/>'
+  //~ + '<link rel="stylesheet" type="text/css" href="http://0.0.0.0:8000/style.css"/>'
   + '<title>Ingress Intel Map</title>'
-  //~ + '<link rel="stylesheet" type="text/css" href="http://breunigs.github.com/ingress-intel-total-conversion/style.css?@@BUILDDATE@@"/>'
+  + '<link rel="stylesheet" type="text/css" href="http://breunigs.github.com/ingress-intel-total-conversion/style.css?@@BUILDDATE@@"/>'
   + '<link rel="stylesheet" type="text/css" href="http://cdn.leafletjs.com/leaflet-0.5/leaflet.css"/>'
   + '<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Coda"/>';
 

From 63083407ed3704f3e77ea6a06efcd22b331400b3 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 13:14:03 +0100
Subject: [PATCH 10/16] add info about other types

---
 code/utils_misc.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/utils_misc.js b/code/utils_misc.js
index 2f982f7e..75cd1d72 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -160,6 +160,10 @@ window.getTypeByGuid = function(guid) {
   // .c  == player/creator
   // .d  == chat messages
   //
+  // others, not used in web:
+  // .5  == resources (burster/resonator)
+  // .6  == XM
+  // .4  == media items, maybe all droppped resources (?)
   // resonator guid is [portal guid]-resonator-[slot]
   switch(guid.slice(33)) {
     case '11':

From 8b94121bb25aa1a974a9b6efbd9ba7fce4258d1e Mon Sep 17 00:00:00 2001
From: Peter Sorger <sorgo@cool.sk>
Date: Mon, 11 Feb 2013 13:48:05 +0100
Subject: [PATCH 11/16] z-index for #scrollwallpaper

had problem with sidebar not showing in Chrome 25, the sidebar got under the map layer. Added z-index 1001;
---
 style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style.css b/style.css
index f23b7799..ebe3d41d 100644
--- a/style.css
+++ b/style.css
@@ -17,6 +17,7 @@ body {
   top: 0;
   width: 340px;
   bottom: 45px;
+  z-index: 1001;
 }
 
 #sidebar {

From 2850d44dace2812005f77762de8bc205037e8b4f Mon Sep 17 00:00:00 2001
From: Jakub Ludwig <domaci.pirozek@gmail.com>
Date: Mon, 11 Feb 2013 13:53:35 +0100
Subject: [PATCH 12/16] Added field count formula

---
 code/portal_detail_display_tools.js | 23 ++++++++++++++---------
 main.js                             |  3 ++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index 42cf0c95..4e082670 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -137,19 +137,24 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick) {
 window.getDestroyAP = function(d) {
   console.log('rendering destroy AP');
   var res_count = 0;
-  var links = 0;
+  var links_count = 0;
+  var fields_count
 
-  $.each(d.resonatorArray.resonators, function(ind, reso) 
-  {
+  $.each(d.resonatorArray.resonators, function(ind, reso) {
     res_count += 1;
   });
 
-  if(d.portalV2.linkedEdges) $.each(d.portalV2.linkedEdges, function(ind, link) 
-  {
-    links++;
-  });
+  if(d.portalV2.linkedEdges) {
+    $.each(d.portalV2.linkedEdges, function(ind, link) {
+      links_count++;
+    });
+  }
 
-  var ap_count = (res_count * DESTROY_RESONATOR) + (links * DESTROY_LINK);
+  if(d.portalV2.linkedFields) {
+    fields_count = d.portalV2.linkedFields.length;
+  }
+
+  var ap_count = (res_count * DESTROY_RESONATOR) + (links_count * DESTROY_LINK) + (fields_count * DESTROY_FIELD);
   
-  return 'Destroy ' + res_count + 'x res + ' + links + 'x link -> <strong style="color: #FFCE00">' + ap_count + '</strong>AP';
+  return 'Destroy ' + res_count + 'x res + ' + links_count + 'x link → <span style="color: #FFCE00">' + ap_count + '</span>AP';
 }
diff --git a/main.js b/main.js
index b99017df..f36b3b70 100644
--- a/main.js
+++ b/main.js
@@ -129,7 +129,8 @@ var HACK_RANGE = 35; // in meters, max. distance from portal to be able to acces
 var OCTANTS = ['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'];
 var DEFAULT_PORTAL_IMG = 'http://commondatastorage.googleapis.com/ingress/img/default-portal-image.png';
 var DESTROY_RESONATOR = 75; //AP for destroying portal
-var DESTROY_LINK = 187; //AP fro destroying link
+var DESTROY_LINK = 187; //AP for destroying link
+var DESTROY_FIELD = 750; //AP for destroying field
 
 // OTHER MORE-OR-LESS CONSTANTS //////////////////////////////////////
 var NOMINATIM = 'http://nominatim.openstreetmap.org/search?format=json&limit=1&q=';

From 0c3a9ef4fc1aa774dfd68b15029af5f3e125d970 Mon Sep 17 00:00:00 2001
From: Cameron Moon <cameron@moon.net.au>
Date: Tue, 12 Feb 2013 00:14:27 +1100
Subject: [PATCH 13/16] Made sidebar look less broken when using out-of-date
 plugin

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

diff --git a/style.css b/style.css
index ebe3d41d..c7d2dae7 100644
--- a/style.css
+++ b/style.css
@@ -18,6 +18,13 @@ body {
   width: 340px;
   bottom: 45px;
   z-index: 1001;
+
+  /* 
+   * NOTE: following 2 items are needed for back compatability 
+   * between new css and old plugin versions (0.4) as of 2013-02-11 UTC.
+   */
+  background-color: rgba(8, 48, 78, 1);
+  border-left: 1px solid #20A8B1;
 }
 
 #sidebar {

From 6599f1375ab83a1fd6fb8ba340842d7f3170950b Mon Sep 17 00:00:00 2001
From: Cameron Moon <cameron@moon.net.au>
Date: Tue, 12 Feb 2013 00:20:22 +1100
Subject: [PATCH 14/16] Remove border on #scrollwrapper as it was duplicating
 border on #sidebar

---
 style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/style.css b/style.css
index c7d2dae7..49539198 100644
--- a/style.css
+++ b/style.css
@@ -24,7 +24,6 @@ body {
    * between new css and old plugin versions (0.4) as of 2013-02-11 UTC.
    */
   background-color: rgba(8, 48, 78, 1);
-  border-left: 1px solid #20A8B1;
 }
 
 #sidebar {

From 5e4b3c94ba96dc099fa7489fb16fff3df7a039e4 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 14:22:14 +0100
Subject: [PATCH 15/16] clean up Pirozek 'show AP' patch a bit and handle
 random details differently.

---
 code/portal_detail_display.js       | 14 ++++-----
 code/portal_detail_display_tools.js | 44 +++++++++++++++--------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index d1cc877d..98b33592 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -19,24 +19,23 @@ window.renderPortalDetails = function(guid) {
     links[link.isOrigin ? 'outgoing' : 'incoming']++;
   });
   function linkExpl(t) { return '<tt title="↳ incoming links\n↴ outgoing links\n• is meant to be the portal.">'+t+'</tt>'; }
-  var linksText = linkExpl('links')+':'+linkExpl(' ↳ ' + links.incoming+'&nbsp;&nbsp;•&nbsp;&nbsp;'+links.outgoing+' ↴');
+  var linksText = [linkExpl('links'), linkExpl(' ↳ ' + links.incoming+'&nbsp;&nbsp;•&nbsp;&nbsp;'+links.outgoing+' ↴')];
 
   var player = d.captured && d.captured.capturingPlayerId
     ? getPlayerName(d.captured.capturingPlayerId)
     : null;
-  var playerText = player ? 'owner: ' + player : null;
+  var playerText = player ? ['owner', player] : null;
 
   var time = d.captured ? unixTimeToString(d.captured.capturedTime) : null;
-  var sinceText  = time ? 'since: ' + time : null;
+  var sinceText  = time ? ['since', time] : null;
 
-  var linkedFields = 'fields: ' + d.portalV2.linkedFields.length;
+  var linkedFields = ['fields', d.portalV2.linkedFields.length];
 
   // collect and html-ify random data
-  var randDetails = [playerText, sinceText, getRangeText(d), getEnergyText(d), linksText, getAvgResoDistText(d), linkedFields];
+  var randDetails = [playerText, sinceText, getRangeText(d), getEnergyText(d), linksText, getAvgResoDistText(d), linkedFields, getDestroyAP(d)];
   randDetails = randDetails.map(function(detail) {
     if(!detail) return '';
-    detail = detail.split(':');
-    detail = '<aside>'+detail.shift()+'<span>'+detail.join(':')+'</span></aside>';
+    detail = '<aside>'+detail[0]+'<span>'+detail[1]+'</span></aside>';
     return detail;
   }).join('\n');
 
@@ -68,7 +67,6 @@ window.renderPortalDetails = function(guid) {
         + '<div class="mods">'+getModDetails(d)+'</div>'
         + '<div id="randdetails">'+randDetails+'</div>'
         + '<div id="resodetails">'+getResonatorDetails(d)+'</div>'
-        + '<div id="destroydetails">'+getDestroyAP(d)+'</div>'
         + '<div class="linkdetails">'
         + '<aside><a href="'+perma+'">portal link</a></aside>'
         + '<aside><a onclick="window.reportPortalIssue()">report issue</a></aside>'
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index ee5edb56..94effc4b 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -6,12 +6,12 @@
 // returns displayable text+link about portal range
 window.getRangeText = function(d) {
   var range = getPortalRange(d);
-  return 'range: '
+  return ['range',
     + '<a onclick="window.rangeLinkClick()">'
     + (range > 1000
       ? Math.round(range/1000) + ' km'
       : Math.round(range)      + ' m')
-    + '</a>';
+    + '</a>'];
 }
 
 // generates description text from details for portal
@@ -69,13 +69,12 @@ window.getEnergyText = function(d) {
   var totalNrg = getTotalPortalEnergy(d);
   var inf = currentNrg + ' / ' + totalNrg;
   var fill = prettyEnergy(currentNrg) + ' / ' + prettyEnergy(totalNrg)
-  var meter = 'energy: <tt title="'+inf+'">' + fill + '</tt>';
-  return meter;
+  return ['energy', '<tt title="'+inf+'">' + fill + '</tt>'];
 }
 
 window.getAvgResoDistText = function(d) {
   var avgDist = Math.round(10*getAvgResoDist(d))/10;
-  return '⌀ res dist: ' + avgDist + ' m';
+  return ['⌀ res dist', avgDist + ' m'];
 }
 
 window.getResonatorDetails = function(d) {
@@ -142,26 +141,29 @@ window.renderResonatorDetails = function(slot, level, nrg, dist, nick, isLeft) {
 // calculate AP gain from destroying portal
 // so far it counts only resonators + links
 window.getDestroyAP = function(d) {
-  console.log('rendering destroy AP');
-  var res_count = 0;
-  var links_count = 0;
-  var fields_count
+  var resoCount = 0;
 
   $.each(d.resonatorArray.resonators, function(ind, reso) {
-    res_count += 1;
+    if(!reso) return true;
+    resoCount += 1;
   });
 
-  if(d.portalV2.linkedEdges) {
-    $.each(d.portalV2.linkedEdges, function(ind, link) {
-      links_count++;
-    });
+  var linkCount = d.portalV2.linkedEdges ? d.portalV2.linkedEdges.length : 0;
+  var fieldCount = d.portalV2.linkedFields ? d.portalV2.linkedFields.length : 0;
+
+  var resoAp = resoCount * DESTROY_RESONATOR;
+  var linkAp = linkCount * DESTROY_LINK;
+  var fieldAp = fieldCount * DESTROY_FIELD;
+  var sum = resoAp + linkAp + fieldAp;
+
+  function tt(text) {
+    var t = 'Destroy:\n';
+    t += resoCount  + '×\tResonators\t= ' + digits(resoAp) + '\n';
+    t += linkCount  + '×\tLinks\t\t= ' + digits(linkAp) + '\n';
+    t += fieldCount + '×\tFields\t\t= ' + digits(fieldAp) + '\n';
+    t += 'Sum: ' + digits(sum) + ' AP';
+    return '<tt title="'+t+'">' + digits(text) + '</tt>';
   }
 
-  if(d.portalV2.linkedFields) {
-    fields_count = d.portalV2.linkedFields.length;
-  }
-
-  var ap_count = (res_count * DESTROY_RESONATOR) + (links_count * DESTROY_LINK) + (fields_count * DESTROY_FIELD);
-  
-  return 'Destroy ' + res_count + 'x res + ' + links_count + 'x link → <span style="color: #FFCE00">' + ap_count + '</span>AP';
+  return [tt('AP Gain'), tt(sum)];
 }

From 0f6422b48e42a8161214d9c09a3d85fac3995ba9 Mon Sep 17 00:00:00 2001
From: Stefan Breunig <stefan@mathphys.fsk.uni-heidelberg.de>
Date: Mon, 11 Feb 2013 14:23:17 +0100
Subject: [PATCH 16/16] add Pirozek to contribs

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

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