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

simplify map data request batching - doesn't need to be so complex now we never request more than 4 tiles per request

Browse Source
This commit is contained in:
Jon Atkins 2014-02-21 07:29:42 +00:00
parent ea45d0f447
commit cdf9c83801
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
code/map_data_request.js
View File

@ -20,13 +20,8 @@ window.MapDataRequest = function() {
// using our own queue limit ensures that other requests (e.g. chat, portal details) don't get delayed // using our own queue limit ensures that other requests (e.g. chat, portal details) don't get delayed
this.MAX_REQUESTS = 5; this.MAX_REQUESTS = 5;
// no more than this many tiles in one request // this many tiles in one request
// as of 2013-11-11, or possibly the release before that, the stock site was changed to only request four tiles at a time this.NUM_TILES_PER_REQUEST = 4;
// (which matches the number successfully returned for a *long* time!)
this.MAX_TILES_PER_REQUEST = 4;
// try to maintain at least this may tiles in each request, by reducing the number of requests as needed
this.MIN_TILES_PER_REQUEST = 4;
// number of times to retry a tile after a 'bad' error (i.e. not a timeout) // number of times to retry a tile after a 'bad' error (i.e. not a timeout)
this.MAX_TILE_RETRIES = 2; this.MAX_TILE_RETRIES = 2;
@ -363,26 +358,13 @@ window.MapDataRequest.prototype.processRequestQueue = function(isFirstPass) {
var requestBuckets = this.MAX_REQUESTS - this.activeRequestCount; var requestBuckets = this.MAX_REQUESTS - this.activeRequestCount;
if (pendingTiles.length > 0 && requestBuckets > 0) { if (pendingTiles.length > 0 && requestBuckets > 0) {
// the stock site calculates bucket grouping with the simplistic <8 tiles: 1 bucket, otherwise 4 buckets
var maxBuckets = Math.ceil(pendingTiles.length/this.MIN_TILES_PER_REQUEST);
requestBuckets = Math.min (maxBuckets, requestBuckets);
var lastTileIndex = Math.min(requestBuckets*this.MAX_TILES_PER_REQUEST, pendingTiles.length);
for (var bucket=0; bucket < requestBuckets; bucket++) { for (var bucket=0; bucket < requestBuckets; bucket++) {
// create each request by taking tiles interleaved from the request var tiles = pendingTiles.splice(0, this.NUM_TILES_PER_REQUEST);
var tiles = [];
for (var i=bucket; i<lastTileIndex; i+=requestBuckets) {
tiles.push (pendingTiles[i]);
}
if (tiles.length > 0) { if (tiles.length > 0) {
// console.log('-- new request: '+tiles.length+' tiles');
this.sendTileRequest(tiles); this.sendTileRequest(tiles);
} }
} }
} }