phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restopre 'show more portals', but at one level of zoom boost instead of two

Browse Source
This commit is contained in:
Jon Atkins 2015-05-06 18:28:08 +01:00
parent bb5d263a73
commit 2fce62117c
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
code/map_data_calc_tools.js
View File

@ -41,27 +41,6 @@ window.setupDataTileParams = function() {
window.TILE_PARAMS.TILES_PER_EDGE = DEFAULT_ZOOM_TO_TILES_PER_EDGE;
}
// disable SHOW_MORE_PORTALS if it would be unfriendly to the servers (i.e. result in more requests)
// needs to be fired a bit later, after plugins have been initialised
setTimeout(function(){
if (window.CONFIG_ZOOM_SHOW_MORE_PORTALS) {
if (window.TILE_PARAMS.TILES_PER_EDGE[17] > window.TILE_PARAMS.TILES_PER_EDGE[15]) {
var edgeScale = window.TILE_PARAMS.TILES_PER_EDGE[17]/window.TILE_PARAMS.TILES_PER_EDGE[15];
var mapScale = edgeScale*edgeScale;
dialog({
title: 'Show more portals plugin disabled',
width: 400,
text: 'The "show-more-portals" plugin has been disabled.\n\n'
+'Niantic have changed the intel site so that zoom level 17 (all portals) now needs '+mapScale+' times more requests than level 15 (L1+ portals), so fetching at the wrong zoom level will be unfriendly to the servers\n\n'
+'Don\'t like this? Ask Niantic to change the standard intel site, then IITC can match and all would benifit.'
});
window.CONFIG_ZOOM_SHOW_MORE_PORTALS=false;
}
}
}, 1);
}
@ -104,7 +83,16 @@ window.getDataZoomForMapZoom = function(zoom) {
zoom = 21;
}
var origTileParams = getMapZoomTileParameters(zoom);
if (window.CONFIG_ZOOM_SHOW_MORE_PORTALS) {
// slightly unfriendly to the servers, requesting more, but smaller, tiles, for the 'unclaimed' level of detail
// however, server load issues are all related to the map area in view, with no real issues related to detail level
// therefore, I believel we can get away with these smaller tiles for one or two further zoom levels without issues
if (zoom == 16) {
zoom = 17;
}
}
if (!window.CONFIG_ZOOM_DEFAULT_DETAIL_LEVEL) {
@ -112,6 +100,8 @@ window.getDataZoomForMapZoom = function(zoom) {
// to avoid impacting server load, we keep ourselves restricted to a zoom level with the sane numbre
// of tilesPerEdge and portal levels visible
var origTileParams = getMapZoomTileParameters(zoom);
while (zoom > MIN_ZOOM) {
var newTileParams = getMapZoomTileParameters(zoom-1);
if (newTileParams.tilesPerEdge != origTileParams.tilesPerEdge || newTileParams.level != origTileParams.level) {
@ -126,15 +116,6 @@ window.getDataZoomForMapZoom = function(zoom) {
}
if (window.CONFIG_ZOOM_SHOW_MORE_PORTALS) {
// this is, in theory, slightly 'unfriendly' to the servers. in practice, this isn't the case - and it can even be nicer
// as it vastly improves cacheing in IITC and also reduces the amount of panning/zooming a user would do
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;
}
}
return zoom;
}

4
plugins/show-more-portals.user.js
View File

@ -2,11 +2,11 @@
// @id iitc-plugin-show-more-portals@jonatkins
// @name IITC plugin: Show more portals
// @category Tweaks
// @version 0.2.0.@@DATETIMEVERSION@@
// @version 0.2.1.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Boost the detail level of portals shown so that unclaimed portals are visible when normally L1+ portals would be shown. Recent protocol changes by Niantic means this no longer sends more requests than the standard intel site, and can mean fewer requests.
// @description [@@BUILDNAME@@-@@BUILDDATE@@] Boost the detail level of portals shown so that unclaimed portals are visible one level saooner.
// @include https://www.ingress.com/intel*
// @include http://www.ingress.com/intel*
// @match https://www.ingress.com/intel*