Merge branch 'master' into release

code/game_status.js

@@ -37,7 +37,8 @@ window.updateGameScore = function(data) {
 
   window.updateGameScoreFailCount = 0;
 
-  var r = parseInt(data.result.resistanceScore), e = parseInt(data.result.enlightenedScore);
+  var e = parseInt(data[0]); //enlightened score in data[0]
+  var r = parseInt(data[1]); //resistance score in data[1]
   var s = r+e;
   var rp = r/s*100, ep = e/s*100;
   r = digits(r), e = digits(e);

code/map_data_calc_tools.js

@@ -48,8 +48,9 @@ window.getDataZoomForMapZoom = function(zoom) {
   //NOTE: the specifics of this are tightly coupled with the above ZOOM_TO_LEVEL and ZOOM_TO_TILES_PER_EDGE arrays
 
   // firstly, some of IITCs zoom levels, depending on base map layer, can be higher than stock. limit zoom level
-  if (zoom > 18) {
-    zoom = 18;
+  // (stock site max zoom may vary depending on google maps detail in the area - 20 or 21 max is common)
+  if (zoom > 20) {
+    zoom = 20;
   }
 
   if (!window.CONFIG_ZOOM_DEFAULT_DETAIL_LEVEL) {
@@ -109,7 +110,7 @@ window.getDataZoomForMapZoom = function(zoom) {
   }
 
   if (window.CONFIG_ZOOM_SHOW_MORE_PORTALS) {
-    if (zoom >= 15) {
+    if (zoom >= 15 && zoom <= 16) {
       //L1+ and closer zooms. the 'all portals' zoom uses the same tile size, so it's no harm to request things at that zoom level
       zoom = 17;
     }
@@ -138,7 +139,10 @@ window.tileToLat = function(y, params) {
 }
 
 window.pointToTileId = function(params, x, y) {
-  return params.zoom + "_" + x + "_" + y;
+//change to quadkey construction
+//as of 2014-05-06: zoom_x_y_minlvl_maxlvl_maxhealth
+
+  return params.zoom + "_" + x + "_" + y + "_" + params.level + "_8_100";
 }
 
 

code/portal_marker.js

@@ -4,7 +4,10 @@
 
 window.portalMarkerScale = function() {
   var zoom = map.getZoom();
-  return zoom >= 14 ? 1 : zoom >= 11 ? 0.8 : zoom >= 8 ? 0.65 : 0.5;
+  if (L.Browser.mobile)
+    return zoom >= 16 ? 1 : zoom >= 14 ? 0.8 : zoom >= 11 ? 0.65 : zoom >= 8 ? 0.5 : 0.35;
+  else
+    return zoom >= 14 ? 1 : zoom >= 11 ? 0.8 : zoom >= 8 ? 0.65 : 0.5;
 }
 
 // create a new marker. 'data' contain the IITC-specific entity data to be stored in the object options

main.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             ingress-intel-total-conversion@jonatkins
 // @name           IITC: Ingress intel map total conversion
-// @version        0.16.7.@@DATETIMEVERSION@@
+// @version        0.16.8.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@

mobile/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cradle.iitc_mobile"
     android:installLocation="auto"
-    android:versionCode="68"
-    android:versionName="0.10.7">
+    android:versionCode="69"
+    android:versionName="0.10.8">
 
     <uses-sdk
         android:minSdkVersion="14"

website/page/home.php

@@ -13,39 +13,19 @@ offers many more features. It is available for
 
 <h3>Latest news</h3>
 
-<h4>14th March 2014</h4>
+<h4>6th May 2014</h4>
 <p>
-IITC 0.16.6 and IITC Mobile 0.10.6 have just been released. This is a critical update required to successfully load
-portals when zoomed in (L3+ or closer) to the map. Changes include:
+IITC 0.16.8 and IITC Mobile 0.10.8 have just been released. This is a critical update that is needed for IITC to correctly
+load the map data.
 </p>
-<ul>
-<li>debug tiles fade for completed tiles</li>
-<li>warning in sidebar when standard layers are turned off</li>
-<li>player level: fixed AP values for L2/L3</li>
-<li>Plugins:
-<ul>
-<li>portal-counts: percentage in pie chart</li>
-<li>guess-player-levels: guess level based on portal attacks (attack range as calculated from log)</li>
-</ul></li>
-<li>Mobile:
-<ul>
-<li>send screenshot from menu</li>
-<li>fixed sharing interface (caused crash on some devices)</li>
-<li>show loading indicator while log is being loaded</li>
-<li>configurable menu</li>
-</ul></li>
-</ul>
 
-<h4>22nd February 2014</h4>
+<h4>29th April 2014</h4>
 <p>
-IITC 0.16.5 and IITC Mobile 0.10.5 have just been released. This version is required to work with a change made to the
-standard intel site. Also, the following changes have been made:
+IITC 0.16.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes.
+</p>
+<p>
+There have also been a few tweaks to improve performance, and an optional alternative rendering mode
+that might give a good performance boost in some cases when there's lots of portals on screen.
 </p>
-<ul>
-<li>The new Artifacts are now supported</li>
-<li>Bookmarks plugin updated</li>
-<li>Draw tools plugin: markers updated to also support colours</li>
-</ul>
-
 
 <a class="btn btn-default btn-sm" href="?page=news">Older news</a>

website/page/news.php

@@ -1,5 +1,20 @@
 <h2>News</h2>
 
+<h4>6th May 2014</h4>
+<p>
+IITC 0.16.8 and IITC Mobile 0.10.8 have just been released. This is a critical update that is needed for IITC to correctly
+load the map data.
+</p>
+
+<h4>29th April 2014</h4>
+<p>
+IITC 0.16.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes.
+</p>
+<p>
+There have also been a few tweaks to improve performance, and an optional alternative rendering mode
+that might give a good performance boost in some cases when there's lots of portals on screen.
+</p>
+
 <h4>14th March 2014</h4>
 <p>
 IITC 0.16.6 and IITC Mobile 0.10.6 have just been released. This is a critical update required to successfully load