From 06ec9b36e70626f98b5602f203aac86d9e751987 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 29 Apr 2014 04:52:41 +0100 Subject: [PATCH 1/7] update website for 0.16.7 release --- website/page/home.php | 34 ++++------------------------------ website/page/news.php | 9 +++++++++ 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/website/page/home.php b/website/page/home.php index 463081f1..498ab031 100644 --- a/website/page/home.php +++ b/website/page/home.php @@ -13,39 +13,13 @@ offers many more features. It is available for

Latest news

-

14th March 2014

+

29th April 2014

-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.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes.

- - -

22nd February 2014

-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: +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.

- - Older news diff --git a/website/page/news.php b/website/page/news.php index 814fa95d..bc075122 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -1,5 +1,14 @@

News

+

29th April 2014

+

+IITC 0.16.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes. +

+

+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. +

+

14th March 2014

IITC 0.16.6 and IITC Mobile 0.10.6 have just been released. This is a critical update required to successfully load From ae2c9ad4aa11277004a6a3a28fc8ef5da8ad4a47 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 29 Apr 2014 04:55:49 +0100 Subject: [PATCH 2/7] bumpped version numbers to 0.16.8/mobile 0.10.8 - as a release has just been made --- main.js | 2 +- mobile/AndroidManifest.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index 9f7c9717..be09e135 100644 --- a/main.js +++ b/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@@ diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index c39c6020..e0f41dd5 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="69" + android:versionName="0.10.8"> Date: Sat, 3 May 2014 13:44:32 +0200 Subject: [PATCH 3/7] more fine granular portal marker scaling on mobile devices (see #311) --- code/portal_marker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/portal_marker.js b/code/portal_marker.js index 5c5f9389..ba6cfe03 100644 --- a/code/portal_marker.js +++ b/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 From 7ee40b5b45e2841c885d35c0be21612e40dbb621 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Sun, 4 May 2014 03:10:50 +0100 Subject: [PATCH 4/7] make the 'default intel detail level' act more like the stock map - a partial workaround for some portals not being returned for zoom levels 16/17 sometimes also, 'show more portals' plugin has less impact in this case too --- code/map_data_calc_tools.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/map_data_calc_tools.js b/code/map_data_calc_tools.js index d8891fd9..98fbca52 100755 --- a/code/map_data_calc_tools.js +++ b/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; } From abb0fcd638bdf023c56897abc2a3ac4124d8165e Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 6 May 2014 01:44:10 +0100 Subject: [PATCH 5/7] latest stock site update changed the quadkey construction - updated to match --- code/map_data_calc_tools.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/map_data_calc_tools.js b/code/map_data_calc_tools.js index 98fbca52..c5adef2a 100755 --- a/code/map_data_calc_tools.js +++ b/code/map_data_calc_tools.js @@ -139,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"; } From 7138e3e5cd492b2498d2cb2e359f29a2e4e4f899 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 6 May 2014 01:56:19 +0100 Subject: [PATCH 6/7] update game score to support changed format --- code/game_status.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game_status.js b/code/game_status.js index 0e630b77..fdeac3d8 100644 --- a/code/game_status.js +++ b/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); From 83117ca79814856804977aa532761cbb2f73ad0d Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Tue, 6 May 2014 02:07:36 +0100 Subject: [PATCH 7/7] website update for new release --- website/page/home.php | 6 ++++++ website/page/news.php | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/website/page/home.php b/website/page/home.php index 498ab031..87ff55b5 100644 --- a/website/page/home.php +++ b/website/page/home.php @@ -13,6 +13,12 @@ offers many more features. It is available for

Latest news

+

6th May 2014

+

+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. +

+

29th April 2014

IITC 0.16.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes. diff --git a/website/page/news.php b/website/page/news.php index bc075122..4be7889e 100644 --- a/website/page/news.php +++ b/website/page/news.php @@ -1,5 +1,11 @@

News

+

6th May 2014

+

+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. +

+

29th April 2014

IITC 0.16.7 and IITC Mobile 0.10.7 have been released, to fix things to work with the latest Niantic changes.