').width(708).height(108).addClass('leaflet-control').css('margin','0'));
+ }
+
var addLayers = {};
var hiddenLayer = [];
@@ -197,7 +206,7 @@ window.setupMap = function() {
map.on('movestart zoomstart', function() { window.mapRunsUserAction = true; window.requests.abort(); window.startRefreshTimeout(-1); });
map.on('moveend zoomend', function() { window.mapRunsUserAction = false; window.startRefreshTimeout(ON_MOVE_REFRESH*1000); });
- window.addResumeFunction(window.requestData);
+ window.addResumeFunction(function() { window.startRefreshTimeout(ON_MOVE_REFRESH*1000); });
window.requests.addRefreshFunction(window.requestData);
// start the refresh process with a small timeout, so the first data request happens quickly
diff --git a/code/chat.js b/code/chat.js
index 2f029556..8ca9377d 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -41,16 +41,22 @@ window.chat._oldBBox = null;
window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
if(typeof isFaction !== 'boolean') throw('Need to know if public or faction chat.');
+ // get window bounds, and extend to the minimum chat radius
chat._localRangeCircle.setLatLng(map.getCenter());
var b = map.getBounds().extend(chat._localRangeCircle.getBounds());
- var ne = b.getNorthEast();
- var sw = b.getSouthWest();
- // round bounds in order to ignore rounding errors
- var bbs = $.map([ne.lat, ne.lng, sw.lat, sw.lng], function(x) { return Math.round(x*1E4) }).join();
- if(chat._oldBBox && chat._oldBBox !== bbs) {
+ // set a current bounding box if none set so far
+ if (!chat._oldBBox) chat._oldBBox = b;
+
+ // to avoid unnecessary chat refreshes, a small difference compared to the previous bounding box
+ // is not considered different
+ var CHAT_BOUNDINGBOX_SAME_FACTOR = 0.1;
+ // if the old and new box contain each other, after expanding by the factor, don't reset chat
+ if (!(b.pad(CHAT_BOUNDINGBOX_SAME_FACTOR).contains(chat._oldBBox) && chat._oldBBox.pad(CHAT_BOUNDINGBOX_SAME_FACTOR).contains(b))) {
+ console.log('Bounding Box changed, chat will be cleared (old: '+chat._oldBBox.toBBoxString()+'; new: '+b.toBBoxString()+')');
+
$('#chat > div').data('needsClearing', true);
- console.log('Bounding Box changed, chat will be cleared (old: '+chat._oldBBox+' ; new: '+bbs+' )');
+
// need to reset these flags now because clearing will only occur
// after the request is finished – i.e. there would be one almost
// useless request.
@@ -61,8 +67,9 @@ window.chat.genPostData = function(isFaction, storageHash, getOlderMsgs) {
chat._public.data = {};
chat._public.oldestTimestamp = -1;
chat._public.newestTimestamp = -1;
+
+ chat._oldBBox = b;
}
- chat._oldBBox = bbs;
var ne = b.getNorthEast();
var sw = b.getSouthWest();
@@ -119,7 +126,7 @@ window.chat.requestFaction = function(getOlderMsgs, isRetry) {
var r = window.postAjax(
'getPaginatedPlextsV2',
d,
- chat.handleFaction,
+ function(data, textStatus, jqXHR) { chat.handleFaction(data, getOlderMsgs); },
isRetry
? function() { window.chat._requestFactionRunning = false; }
: function() { window.chat.requestFaction(getOlderMsgs, true) }
@@ -130,7 +137,7 @@ window.chat.requestFaction = function(getOlderMsgs, isRetry) {
window.chat._faction = {data:{}, oldestTimestamp:-1, newestTimestamp:-1};
-window.chat.handleFaction = function(data, textStatus, jqXHR) {
+window.chat.handleFaction = function(data, olderMsgs) {
chat._requestFactionRunning = false;
if(!data || !data.result) {
@@ -141,7 +148,7 @@ window.chat.handleFaction = function(data, textStatus, jqXHR) {
if(data.result.length === 0) return;
var old = chat._faction.oldestTimestamp;
- chat.writeDataToHash(data, chat._faction, false);
+ chat.writeDataToHash(data, chat._faction, false, olderMsgs);
var oldMsgsWereAdded = old !== chat._faction.oldestTimestamp;
runHooks('factionChatDataAvailable', {raw: data, processed: chat._faction.data});
@@ -170,7 +177,7 @@ window.chat.requestPublic = function(getOlderMsgs, isRetry) {
var r = window.postAjax(
'getPaginatedPlextsV2',
d,
- chat.handlePublic,
+ function(data, textStatus, jqXHR) { chat.handlePublic(data, getOlderMsgs); },
isRetry
? function() { window.chat._requestPublicRunning = false; }
: function() { window.chat.requestPublic(getOlderMsgs, true) }
@@ -180,7 +187,7 @@ window.chat.requestPublic = function(getOlderMsgs, isRetry) {
}
window.chat._public = {data:{}, oldestTimestamp:-1, newestTimestamp:-1};
-window.chat.handlePublic = function(data, textStatus, jqXHR) {
+window.chat.handlePublic = function(data, olderMsgs) {
chat._requestPublicRunning = false;
if(!data || !data.result) {
@@ -191,7 +198,7 @@ window.chat.handlePublic = function(data, textStatus, jqXHR) {
if(data.result.length === 0) return;
var old = chat._public.oldestTimestamp;
- chat.writeDataToHash(data, chat._public, true);
+ chat.writeDataToHash(data, chat._public, true, olderMsgs);
var oldMsgsWereAdded = old !== chat._public.oldestTimestamp;
runHooks('publicChatDataAvailable', {raw: data, processed: chat._public.data});
@@ -249,7 +256,7 @@ window.chat.nicknameClicked = function(event, nickname) {
}
}
-window.chat.writeDataToHash = function(newData, storageHash, isPublicChannel) {
+window.chat.writeDataToHash = function(newData, storageHash, isPublicChannel, isOlderMsgs) {
$.each(newData.result, function(ind, json) {
// avoid duplicates
if(json[0] in storageHash.data) return true;
@@ -344,7 +351,10 @@ window.chat.writeDataToHash = function(newData, storageHash, isPublicChannel) {
// format: timestamp, autogenerated, HTML message, player guid
storageHash.data[json[0]] = [json[1], auto, chat.renderMsg(msg, nick, time, team, msgToPlayer, systemNarrowcast), pguid];
- window.setPlayerName(pguid, nick); // free nick name resolves
+ // if we're processing older messages, we could be looking at pre-name change mentions or similar
+ // so in that case, flag it so we don't overwrite existing name cache entries.
+ // (it's not perfect - the initial request has the wrong value here)
+ window.setPlayerName(pguid, nick, isOlderMsgs); // free nick name resolves.
});
}
@@ -598,8 +608,6 @@ window.chat.setup = function() {
if(scrollBottom(t) === 0) chat.requestPublic(false);
});
- chat.request();
- window.addResumeFunction(chat.request);
window.requests.addRefreshFunction(chat.request);
var cls = PLAYER.team === 'ALIENS' ? 'enl' : 'res';
diff --git a/code/dialog.js b/code/dialog.js
index 81c196d5..15664a9e 100644
--- a/code/dialog.js
+++ b/code/dialog.js
@@ -19,6 +19,11 @@ window.DIALOG_COUNT = 0;
*/
window.DIALOG_FOCUS = null;
+/* Controls how quickly the slide toggle animation
+ * should play for dialog collapsing and expanding.
+ */
+window.DIALOG_SLIDE_DURATION = 100;
+
/* Creates a dialog and puts it onscreen. Takes one argument: options, a JS object.
* == Common options
* (text|html): The text or HTML to display in the dialog. Text is auto-converted to HTML.
@@ -48,6 +53,7 @@ window.dialog = function(options) {
options = options || {};
if(isSmartphone()) {
options.modal = true;
+ options.width = 'auto';
}
// Build an identifier for this dialog
@@ -55,6 +61,11 @@ window.dialog = function(options) {
var jqID = '#' + id;
var html = '';
+ // hint for iitc mobile that a dialog was opened
+ if (typeof android !== 'undefined' && android && android.dialogOpened) {
+ android.dialogOpened(id, true);
+ }
+
// Convert text to HTML if necessary
if(options.text) {
html = window.convertTextToTableMagic(options.text);
@@ -127,12 +138,14 @@ window.dialog = function(options) {
var dialog = $(this).closest('.ui-dialog');
var selector = dialog.find('.ui-dialog-content,.ui-dialog-buttonpane');
var button = dialog.find('.ui-dialog-titlebar-button-collapse');
+
+ // Slide toggle
+ $(selector).slideToggle({duration: window.DIALOG_SLIDE_DURATION});
+
if(collapsed) {
- $(selector).removeClass('ui-dialog-content-hidden');
$(button).removeClass('ui-dialog-titlebar-button-collapse-collapsed');
$(button).addClass('ui-dialog-titlebar-button-collapse-expanded');
} else {
- $(selector).addClass('ui-dialog-content-hidden');
$(button).removeClass('ui-dialog-titlebar-button-collapse-expanded');
$(button).addClass('ui-dialog-titlebar-button-collapse-collapsed');
}
@@ -167,6 +180,10 @@ window.dialog = function(options) {
window.DIALOG_COUNT--;
console.log('window.dialog: ' + $(this).data('id') + ' (' + $(this).dialog('option', 'title') + ') closed. ' + window.DIALOG_COUNT + ' remain.');
+ // hint for iitc mobile that a dialog was closed
+ if (typeof android !== 'undefined' && android && android.dialogOpened) {
+ android.dialogOpened(id, false);
+ }
// remove from DOM and destroy
$(this).dialog('destroy').remove();
@@ -189,6 +206,10 @@ window.dialog = function(options) {
// This dialog is now in focus
window.DIALOG_FOCUS = this;
+ // hint for iitc mobile that a dialog was focused
+ if (typeof android !== 'undefined' && android && android.dialogFocused) {
+ android.dialogFocused($(window.DIALOG_FOCUS).data('id'));
+ }
$(this).closest('.ui-dialog').find('.ui-dialog-title').removeClass('ui-dialog-title-inactive').addClass('ui-dialog-title-active');
}
}, options));
diff --git a/code/idle.js b/code/idle.js
index 39a4ab83..bc21a378 100644
--- a/code/idle.js
+++ b/code/idle.js
@@ -1,8 +1,22 @@
// IDLE HANDLING /////////////////////////////////////////////////////
-window.idleTime = 0; // in minutes
+window.idleTime = 0; // in seconds
+window._idleTimeLimit = MAX_IDLE_TIME;
+
+var IDLE_POLL_TIME = 10;
+
+var idlePoll = function() {
+ window.idleTime += IDLE_POLL_TIME;
+
+ var hidden = (document.hidden || document.webkitHidden || document.mozHidden || document.msHidden || false);
+ if (hidden) {
+ // window hidden - use the refresh time as the idle limit, rather than the max time
+ window._idleTimeLimit = window.REFRESH;
+ }
+}
+
+setInterval(idlePoll, IDLE_POLL_TIME*1000);
-setInterval('window.idleTime += 1', 60*1000);
var idleReset = function () {
// update immediately when the user comes back
if(isIdle()) {
@@ -12,11 +26,29 @@ var idleReset = function () {
});
}
window.idleTime = 0;
+ window._idleTimeLimit = MAX_IDLE_TIME;
};
-$('body').mousemove(idleReset).keypress(idleReset);
+
+// only reset idle on mouse move where the coordinates are actually different.
+// some browsers send the event when not moving!
+var _lastMouseX=-1, _lastMouseY=-1;
+var idleMouseMove = function(e) {
+ var dX = _lastMouseX-e.clientX;
+ var dY = _lastMouseY-e.clientY;
+ var deltaSquared = dX*dX + dY*dY;
+ // only treat movements over 3 pixels as enough to reset us
+ if (deltaSquared > 3*3) {
+ _lastMouseX = e.clientX;
+ _lastMouseY = e.clientY;
+ idleReset();
+ }
+}
+
+$('body').keypress(idleReset);
+$('body').mousemove(idleMouseMove);
window.isIdle = function() {
- return window.idleTime >= MAX_IDLE_TIME;
+ return window.idleTime >= window._idleTimeLimit;
}
window._onResumeFunctions = [];
diff --git a/code/map_data.js b/code/map_data.js
index 4c26642f..89696b27 100644
--- a/code/map_data.js
+++ b/code/map_data.js
@@ -1,9 +1,100 @@
-
// MAP DATA //////////////////////////////////////////////////////////
// these functions handle how and which entities are displayed on the
// map. They also keep them up to date, unless interrupted by user
// action.
+// debug - display a set of rectangles on the map representing each data tile. the colour will represent it's state
+window._debugDataTileStateLayer = undefined;
+
+window.debugDataTileReset = function() {
+ if (!window._debugDataTileStateLayer) {
+ window._debugDataTileStateLayer = L.layerGroup();
+ window.addLayerGroup("DEBUG Data Tiles", window._debugDataTileStateLayer, false);
+ }
+
+ window._debugDataTileIdToRectangle = {};
+ window._debugDataTileStateLayer.clearLayers();
+}
+
+window.debugCreateTile = function(qk,bounds) {
+ var s = {color: '#888', weight: 3, opacity: 0.7, fillColor: '#888', fillOpacity: 0.4, clickable: false};
+
+ bounds = new L.LatLngBounds(bounds);
+ bounds = bounds.pad(-0.02);
+
+ var l = L.rectangle(bounds,s);
+ window._debugDataTileIdToRectangle[qk] = l;
+ window._debugDataTileStateLayer.addLayer(l);
+}
+
+window.debugSetTileColour = function(qk,bordercol,fillcol) {
+ var l = window._debugDataTileIdToRectangle[qk];
+ if (l) {
+ var s = {color: bordercol, weight: 3, opacity: 0.3, fillColor: fillcol, fillOpacity: 0.1, clickable: false};
+ l.setStyle(s);
+ }
+}
+
+
+// cache for data tiles. indexed by the query key (qk)
+window._requestCache = {}
+
+// cache entries older than the fresh age, and younger than the max age, are stale. they're used in the case of an error from the server
+window.REQUEST_CACHE_FRESH_AGE = 60; // if younger than this, use data in the cache rather than fetching from the server
+window.REQUEST_CACHE_MAX_AGE = 60*60; // maximum cache age. entries are deleted from the cache after this time
+window.REQUEST_CACHE_MIN_SIZE = 200; // if fewer than this many entries, don't expire any
+window.REQUEST_CACHE_MAX_SIZE = 2000; // if more than this many entries, expire early
+
+window.storeDataCache = function(qk,data) {
+ // fixme? common behaviour for objects is that properties are kept in the order they're added
+ // this is handy, as it allows easy retrieval of the oldest entries for expiring
+ // however, this is not guaranteed by the standards, but all our supported browsers work this way
+
+ delete window._requestCache[qk];
+
+ var d = new Date();
+ window._requestCache[qk] = { time: d.getTime(), data: data };
+}
+
+window.getDataCache = function(qk) {
+ if (qk in window._requestCache) {
+ return window._requestCache[qk].data;
+ }
+ return undefined;
+}
+
+window.isDataCacheFresh = function(qk) {
+ if (qk in window._requestCache) {
+ var d = new Date();
+ var t = d.getTime()-REQUEST_CACHE_FRESH_AGE*1000;
+ if (window._requestCache[qk].time > t) {
+ return true;
+ }
+ }
+ return false;
+}
+
+window.expireDataCache = function() {
+ var d = new Date();
+ var t = d.getTime()-window.REQUEST_CACHE_MAX_AGE*1000;
+
+ var cacheSize = Object.keys(window._requestCache).length;
+
+ for(var qk in window._requestCache) {
+ // stop processing once we hit the minimum size
+ if (cacheSize < window.REQUEST_CACHE_MIN_SIZE) break;
+
+ // fixme? our MAX_SIZE test here assumes we're processing the oldest first. this relies
+ // on looping over object properties in the order they were added. this is true in most browsers,
+ // but is not a requirement of the standards
+ if (cacheSize > window.REQUEST_CACHE_MAX_SIZE || window._requestCache[qk].time < t) {
+ delete window._requestCache[qk];
+ cacheSize--;
+ }
+ }
+
+}
+
// requests map data for current viewport. For details on how this
// works, refer to the description in “MAP DATA REQUEST CALCULATORS”
@@ -11,14 +102,27 @@ window.requestData = function() {
console.log('refreshing data');
requests.abort();
cleanUp();
+ window.statusTotalMapTiles = 0;
+ window.statusCachedMapTiles = 0;
+ window.statusSuccessMapTiles = 0;
+ window.statusStaleMapTiles = 0;
+ window.statusErrorMapTiles = 0;
+
+
+ debugDataTileReset();
+
+ expireDataCache();
//a limit on the number of map tiles to be pulled in a single request
- var MAX_TILES_PER_BUCKET = 20;
+ var MAX_TILES_PER_BUCKET = 11;
+ // the number of separate buckets. more can be created if the size exceeds MAX_TILES_PER_BUCKET
+ var BUCKET_COUNT = 4;
var bounds = clampLatLngBounds(map.getBounds());
//we query the server as if the zoom level was this. it may not match the actual map zoom level
var z = getPortalDataZoom();
+ console.log('requesting data tiles at zoom '+z+' (L'+getMinPortalLevelForZoom(z)+'+ portals), map zoom is '+map.getZoom());
var x1 = lngToTile(bounds.getWest(), z);
var x2 = lngToTile(bounds.getEast(), z);
@@ -29,45 +133,114 @@ window.requestData = function() {
tiles = {};
fullBucketCount = 0;
+ var cachedData = { result: { map: {} } };
+ var requestTileCount = 0;
+
// walk in x-direction, starts right goes left
for (var x = x1; x <= x2; x++) {
for (var y = y1; y <= y2; y++) {
var tile_id = pointToTileId(z, x, y);
- var bucket = (x % 2) + ":" + (y % 2);
- if (!tiles[bucket]) {
- //create empty bucket
- tiles[bucket] = [];
- }
- else if(tiles[bucket].length >= MAX_TILES_PER_BUCKET) {
- //too many items in bucket. rename it, and create a new empty one
- tiles[bucket+'_'+fullBucketCount] = tiles[bucket];
- fullBucketCount++;
- tiles[bucket] = [];
+ var latNorth = tileToLat(y,z);
+ var latSouth = tileToLat(y+1,z);
+ var lngWest = tileToLng(x,z);
+ var lngEast = tileToLng(x+1,z);
+
+ debugCreateTile(tile_id,[[latSouth,lngWest],[latNorth,lngEast]]);
+ window.statusTotalMapTiles++;
+
+ // TODO?: if the selected portal is in this tile, always fetch the data
+ if (isDataCacheFresh(tile_id)) {
+ // TODO: don't add tiles from the cache when 1. they were fully visible before, and 2. the zoom level is unchanged
+ // TODO?: if a closer zoom level has all four tiles in the cache, use them instead?
+ cachedData.result.map[tile_id] = getDataCache(tile_id);
+ debugSetTileColour(tile_id,'#0f0','#ff0');
+ window.statusCachedMapTiles++;
+ } else {
+ // group requests into buckets based on the tile coordinate.
+ var bucket = Math.floor(x+y*(BUCKET_COUNT/2))%BUCKET_COUNT;
+
+ if (!tiles[bucket]) {
+ //create empty bucket
+ tiles[bucket] = [];
+ }
+ else if(tiles[bucket].length >= MAX_TILES_PER_BUCKET) {
+ //too many items in bucket. rename it, and create a new empty one
+ tiles[bucket+'_'+fullBucketCount] = tiles[bucket];
+ fullBucketCount++;
+ tiles[bucket] = [];
+ }
+
+ requestTileCount++;
+
+ var boundsParam = generateBoundsParams(
+ tile_id,
+ latSouth,
+ lngWest,
+ latNorth,
+ lngEast
+ );
+
+ // when the server is returning 'timeout' errors for some tiles in the list, it's always the tiles
+ // at the end of the request. therefore, let's push tiles we don't have cache entries for to the front, and those we do to the back
+ if (getDataCache(tile_id)) {
+ // cache entry exists - push to back
+ tiles[bucket].push(boundsParam);
+ } else {
+ // no cache entry - unshift to front
+ tiles[bucket].unshift(boundsParam);
+ }
+
+ debugSetTileColour(tile_id,'#00f','#000');
}
- tiles[bucket].push(generateBoundsParams(
- tile_id,
- tileToLat(y + 1, z),
- tileToLng(x, z),
- tileToLat(y, z),
- tileToLng(x + 1, z)
- ));
}
}
// Reset previous result of Portal Render Limit handler
portalRenderLimit.init();
- // finally send ajax requests
+ // send ajax requests
+ console.log('requesting '+requestTileCount+' tiles in '+Object.keys(tiles).length+' requests');
$.each(tiles, function(ind, tls) {
data = { zoom: z };
data.boundsParamsList = tls;
- window.requests.add(window.postAjax('getThinnedEntitiesV2', data, window.handleDataResponse, window.handleFailedRequest));
+ // keep a list of tile_ids with each request. in the case of a server error, we can try and use cached tiles if available
+ var tile_ids = []
+ $.each(tls,function(i,req) { tile_ids.push(req.qk); });
+ window.requests.add(window.postAjax('getThinnedEntitiesV2', data, function(data, textStatus, jqXHR) { window.handleDataResponse(data,false,tile_ids); }, function() { window.handleFailedRequest(tile_ids); }));
});
+
+ // process the requests from the cache
+ console.log('got '+Object.keys(cachedData.result.map).length+' data tiles from cache');
+ if(Object.keys(cachedData.result.map).length > 0) {
+ handleDataResponse(cachedData, true);
+ }
+
}
// Handle failed map data request
-window.handleFailedRequest = function() {
+window.handleFailedRequest = function(tile_ids) {
+ console.log('request failed: tiles '+tile_ids.join(','));
+
+ var cachedData = { result: { map: {} } };
+ $.each(tile_ids, function(ind,tile_id) {
+ var cached = getDataCache(tile_id);
+ if (cached) {
+ // we have stale cached data - use it
+ cachedData.result.map[tile_id] = cached;
+ debugSetTileColour(tile_id,'#800','#ff0');
+ console.log('(using stale cache entry for map tile '+tile_id+')');
+ window.statusStaleMapTiles++;
+ } else {
+ // no cached data
+ debugSetTileColour(tile_id,'#800','#f00');
+ window.statusErrorMapTiles++;
+ }
+ });
+ if(Object.keys(cachedData.result.map).length > 0) {
+ handleDataResponse(cachedData, true);
+ }
+
if(requests.isLastRequest('getThinnedEntitiesV2')) {
var leftOverPortals = portalRenderLimit.mergeLowLevelPortals(null);
handlePortalsRender(leftOverPortals);
@@ -76,12 +249,12 @@ window.handleFailedRequest = function() {
}
// works on map data response and ensures entities are drawn/updated.
-window.handleDataResponse = function(data, textStatus, jqXHR) {
+window.handleDataResponse = function(data, fromCache, tile_ids) {
// remove from active ajax queries list
if(!data || !data.result) {
window.failedRequestCount++;
console.warn(data);
- handleFailedRequest();
+ handleFailedRequest(tile_ids);
return;
}
@@ -94,8 +267,35 @@ window.handleDataResponse = function(data, textStatus, jqXHR) {
var ppp = {};
var p2f = {};
$.each(m, function(qk, val) {
- if('error' in val) {
- console.log('map data tile '+qk+' response error: '+val.error);
+
+ // if this request wasn't from the cache, check it's status. store in the cache if good
+ // for debugging, we set the debug tile colours. cached tiles have colours set elsewhere so are not set here
+ if (!fromCache) {
+
+ if('error' in val) {
+ console.log('map data tile '+qk+' response error: '+val.error);
+
+ // try to use data in the cache, even if it's stale
+ var cacheVal = getDataCache(qk);
+
+ if (!cacheVal) {
+ debugSetTileColour(qk, '#f00','#f00');
+ // no data in cache for this tile. continue processing - it's possible it also has some valid data
+ window.statusErrorMapTiles++;
+ } else {
+ // stale cache entry exists - use it
+ val = cacheVal;
+ debugSetTileColour(qk, '#f00','#ff0');
+ console.log('(using stale cache entry for map tile '+qk+')');
+ window.statusStaleMapTiles++;
+ }
+ } else {
+ // not an error - store this tile into the cache
+ storeDataCache(qk,val);
+ debugSetTileColour(qk, '#0f0','#0f0');
+ window.statusSuccessMapTiles++;
+ }
+
}
$.each(val.deletedGameEntityGuids || [], function(ind, guid) {
@@ -299,6 +499,32 @@ window.removeByGuid = function(guid) {
}
+// Separation of marker style setting from the renderPortal method
+// Having this as a separate function allows subsituting alternate marker rendering (for plugins)
+window.getMarker = function(ent, portalLevel, latlng, team) {
+ var lvWeight = Math.max(2, Math.floor(portalLevel) / 1.5);
+ var lvRadius = Math.floor(portalLevel) + 4;
+ if(team === window.TEAM_NONE) {
+ lvRadius = 7;
+ }
+
+ var p = L.circleMarker(latlng, {
+ radius: lvRadius + (L.Browser.mobile ? PORTAL_RADIUS_ENLARGE_MOBILE : 0),
+ color: ent[0] === selectedPortal ? COLOR_SELECTED_PORTAL : COLORS[team],
+ opacity: 1,
+ weight: lvWeight,
+ fillColor: COLORS[team],
+ fillOpacity: 0.5,
+ clickable: true,
+ level: portalLevel,
+ team: team,
+ ent: ent,
+ details: ent[2],
+ guid: ent[0]});
+
+ return p;
+}
+
// renders a portal on the map from the given entity
window.renderPortal = function(ent) {
@@ -347,25 +573,7 @@ window.renderPortal = function(ent) {
// pre-loads player names for high zoom levels
loadPlayerNamesForPortal(ent[2]);
- var lvWeight = Math.max(2, Math.floor(portalLevel) / 1.5);
- var lvRadius = Math.floor(portalLevel) + 4;
- if(team === window.TEAM_NONE) {
- lvRadius = 7;
- }
-
- var p = L.circleMarker(latlng, {
- radius: lvRadius + (L.Browser.mobile ? PORTAL_RADIUS_ENLARGE_MOBILE : 0),
- color: ent[0] === selectedPortal ? COLOR_SELECTED_PORTAL : COLORS[team],
- opacity: 1,
- weight: lvWeight,
- fillColor: COLORS[team],
- fillOpacity: 0.5,
- clickable: true,
- level: portalLevel,
- team: team,
- ent: ent,
- details: ent[2],
- guid: ent[0]});
+ var p = getMarker(ent, portalLevel, latlng, team);
p.on('remove', function() {
var portalGuid = this.options.guid
diff --git a/code/panes.js b/code/panes.js
index 99ffdc59..cea82b51 100644
--- a/code/panes.js
+++ b/code/panes.js
@@ -2,6 +2,9 @@
//
window.show = function(id) {
window.hideall();
+ if (typeof android !== 'undefined' && android && android.switchToPane) {
+ android.switchToPane(id);
+ }
switch(id) {
case 'full':
window.chat.show('full');
diff --git a/code/player_names.js b/code/player_names.js
index 1ad0183c..ab7f247d 100644
--- a/code/player_names.js
+++ b/code/player_names.js
@@ -80,7 +80,11 @@ window.resolvePlayerNames = function() {
}
-window.setPlayerName = function(guid, nick) {
+window.setPlayerName = function(guid, nick, uncertain) {
+ // the 'uncertain' flag is set when we're scrolling back through chat. it's possible in this case
+ // to come across a message from before a name change. these should be ignored if existing cache entries exist
+ if(uncertain && guid in localStorage) return;
+
if($.trim(('' + nick)).slice(0, 5) === '{"L":' && !window.alertFor37WasShown) {
window.alertFor37WasShown = true;
alert('You have run into bug #37. Please help me solve it!\nCopy and paste this text and post it here:\nhttps://github.com/breunigs/ingress-intel-total-conversion/issues/37\nIf copy & pasting doesn’t work, make a screenshot instead.\n\n\n' + window.debug.printStackTrace() + '\n\n\n' + JSON.stringify(nick));
diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js
index c3ba306b..cb2e79a7 100644
--- a/code/portal_detail_display.js
+++ b/code/portal_detail_display.js
@@ -50,6 +50,41 @@ window.renderPortalDetails = function(guid) {
var perma = '/intel?ll='+lat+','+lng+'&z=17&pll='+lat+','+lng;
var imgTitle = 'title="'+getPortalDescriptionFromDetails(d)+'\n\nClick to show full image."';
var poslinks = 'window.showPortalPosLinks('+lat+','+lng+',\''+escapeJavascriptString(d.portalV2.descriptiveText.TITLE)+'\')';
+ var portalDetailObj = window.getPortalDescriptionFromDetailsExtended(d);
+
+
+ var portalDetailedDescription = '';
+
+ if(portalDetailObj) {
+ portalDetailedDescription = '';
+
+ // TODO (once the data supports it) - portals can have multiple photos. display all, with navigation between them
+ // (at this time the data isn't returned from the server - although a count of images IS returned!)
+
+ if(portalDetailObj.submitter.name.length > 0) {
+ if(portalDetailObj.submitter.team) {
+ submitterSpan = '';
+ } else {
+ submitterSpan = '';
+ }
+ portalDetailedDescription += '
';
+ }
+
$('#portaldetails')
.attr('class', TEAM_TO_CSS[getTeam(d)])
@@ -58,8 +93,9 @@ window.renderPortalDetails = function(guid) {
+ 'X'
// help cursor via ".imgpreview img"
+ '
'
+ '| Photo by: | ' + submitterSpan + + escapeHtmlSpecialChars(portalDetailObj.submitter.name) + ' (' + portalDetailObj.submitter.voteCount + ' votes) |
|---|---|
| Photo from: | ' + escapeHtmlSpecialChars(portalDetailObj.submitter.link) + ' |
| Description: | ' + escapeHtmlSpecialChars(portalDetailObj.description) + ' |
| Address: | ' + escapeHtmlSpecialChars(d.portalV2.descriptiveText.ADDRESS) + ' |
'
- + '
'
+ ''+Math.floor(getPortalLevel(d))+''
+ + '
'
+ ''+ portalDetailedDescription + '
'
+ + ''+getModDetails(d)+'
'
+ randDetails
@@ -129,5 +165,9 @@ window.unselectOldPortal = function() {
if(oldPortal) portalResetColor(oldPortal);
selectedPortal = null;
$('#portaldetails').html('');
+ if(isSmartphone()) {
+ $('.fullimg').remove();
+ $('#mobileinfo').html('');
+ }
clearPortalIndicators();
}
diff --git a/code/portal_detail_display_tools.js b/code/portal_detail_display_tools.js
index 446f141f..085887cc 100644
--- a/code/portal_detail_display_tools.js
+++ b/code/portal_detail_display_tools.js
@@ -8,8 +8,8 @@ window.getRangeText = function(d) {
return ['range',
''
+ (range > 1000
- ? Math.round(range/1000) + ' km'
- : Math.round(range) + ' m')
+ ? Math.floor(range/1000) + ' km'
+ : Math.floor(range) + ' m')
+ ''];
}
@@ -23,6 +23,43 @@ window.getPortalDescriptionFromDetails = function(details) {
return desc;
}
+// Grabs more info, including the submitter name for the current main
+// portal image
+window.getPortalDescriptionFromDetailsExtended = function(details) {
+ var descObj = details.portalV2.descriptiveText;
+ var photoStreamObj = details.photoStreamInfo;
+
+ var submitterObj = new Object();
+ submitterObj.type = "";
+ submitterObj.name = "Unknown";
+ submitterObj.team = "";
+ submitterObj.link = "";
+ submitterObj.voteCount = 0;
+
+ if(photoStreamObj && photoStreamObj.hasOwnProperty("coverPhoto") && photoStreamObj.coverPhoto.hasOwnProperty("attributionMarkup")) {
+ var attribution = photoStreamObj.coverPhoto.attributionMarkup;
+ submitterObj.type = attribution[0];
+ if(attribution[1].hasOwnProperty("plain"))
+ submitterObj.name = attribution[1].plain;
+ if(attribution[1].hasOwnProperty("team"))
+ submitterObj.team = attribution[1].team;
+ if(attribution[1].hasOwnProperty("attributionLink"))
+ submitterObj.link = attribution[1].attributionLink;
+ if(photoStreamObj.coverPhoto.hasOwnProperty("voteCount"))
+ submitterObj.voteCount = photoStreamObj.coverPhoto.voteCount;
+ }
+
+
+ var portalDetails = {
+ title: descObj.TITLE,
+ description: descObj.DESCRIPTION,
+ address: descObj.ADDRESS,
+ submitter: submitterObj
+ };
+
+ return portalDetails;
+}
+
// given portal details, returns html code to display mod details.
window.getModDetails = function(d) {
@@ -30,29 +67,61 @@ window.getModDetails = function(d) {
var modsTitle = [];
var modsColor = [];
$.each(d.portalV2.linkedModArray, function(ind, mod) {
- if(!mod) {
- mods.push('');
- modsTitle.push('');
- modsColor.push('#000');
- } else if(mod.type === 'RES_SHIELD') {
+ var modName = '';
+ var modTooltip = '';
+ var modColor = '#000';
- var title = mod.rarity.capitalize() + ' ' + mod.displayName + '\n';
- title += 'Installed by: '+ getPlayerName(mod.installingUser);
+ if (mod) {
+ // all mods seem to follow the same pattern for the data structure
+ // but let's try and make this robust enough to handle possible future differences
- title += '\nStats:';
- for (var key in mod.stats) {
- if (!mod.stats.hasOwnProperty(key)) continue;
- title += '\n+' + mod.stats[key] + ' ' + key.capitalize();
+ if (mod.displayName) {
+ modName = mod.displayName;
+ } else if (mod.type) {
+ modName = mod.type;
+ } else {
+ modName = '(unknown mod)';
}
- mods.push(mod.rarity.capitalize().replace('_', ' ') + ' ' + mod.displayName);
- modsTitle.push(title);
- modsColor.push(COLORS_MOD[mod.rarity]);
- } else {
- mods.push(mod.type);
- modsTitle.push('Unknown mod. No further details available.');
- modsColor.push('#FFF');
+ if (mod.rarity) {
+ modName = mod.rarity.capitalize().replace(/_/g,' ') + ' ' + modName;
+ }
+
+ modTooltip = modName + '\n';
+ if (mod.installingUser) {
+ modTooltip += 'Installed by: '+ getPlayerName(mod.installingUser) + '\n';
+ }
+
+ if (mod.stats) {
+ modTooltip += 'Stats:';
+ for (var key in mod.stats) {
+ if (!mod.stats.hasOwnProperty(key)) continue;
+ var val = mod.stats[key];
+
+ if (key === 'REMOVAL_STICKINESS' && val == 0) continue; // stat on all mods recently - unknown meaning, not displayed in stock client
+
+ // special formatting for known mod stats, where the display of the raw value is less useful
+ if (mod.type === 'HEATSINK' && key === 'HACK_SPEED') val = (val/10000)+'%'; // 500000 = 50%
+ else if (mod.type === 'FORCE_AMP' && key === 'FORCE_AMPLIFIER') val = (val/1000)+'x'; // 2000 = 2x
+ else if (mod.type === 'LINK_AMPLIFIER' && key === 'LINK_RANGE_MULTIPLIER') val = (val/1000)+'x' // 2000 = 2x
+ else if (mod.type === 'TURRET' && key === 'HIT_BONUS') val = (val/10000)+'%'; // 2000 = 0.2% (although this seems pretty small to be useful?)
+ else if (mod.type === 'TURRET' && key === 'ATTACK_FREQUENCY') val = (val/1000)+'x' // 2000 = 2x
+ // else display unmodified. correct for shield mitigation and multihack - unknown for future/other mods
+
+ modTooltip += '\n+' + val + ' ' + key.capitalize().replace(/_/g,' ');
+ }
+ }
+
+ if (mod.rarity) {
+ modColor = COLORS_MOD[mod.rarity];
+ } else {
+ modColor = '#fff';
+ }
}
+
+ mods.push(modName);
+ modsTitle.push(modTooltip);
+ modsColor.push(modColor);
});
var t = 'portals: ';
+ var t = 'portals: ';
var minlvl = getMinPortalLevel();
if(minlvl === 0)
t += 'all';
@@ -52,12 +58,22 @@ window.renderUpdateStatus = function() {
t += 'paused 0)
- t += window.activeRequests.length + ' requests';
else if(window.requests._quickRefreshPending)
t += 'refreshing';
- else
- t += 'Up to date';
+ else if(window.activeRequests.length > 0)
+ t += window.activeRequests.length + ' requests';
+ else {
+ // tooltip with detailed tile counts
+ t += '';
+
+ // basic error/out of date/up to date message
+ if (window.statusErrorMapTiles) t += 'Errors';
+ else if (window.statusStaleMapTiles) t += 'Out of date';
+ else t += 'Up to date';
+
+ t += '';
+
+ }
t += '';
if(renderLimitReached())
@@ -66,8 +82,6 @@ window.renderUpdateStatus = function() {
if(window.failedRequestCount > 0)
t += ' ' + window.failedRequestCount + ' failed'
- t += '
';
-
var portalSelection = $('.leaflet-control-layers-overlays label');
//it's an array - 0=unclaimed, 1=lvl 1, 2=lvl 2, ..., 8=lvl 8 - 9 relevant entries
//mark all levels below (but not at) minlvl as disabled
@@ -76,7 +90,7 @@ window.renderUpdateStatus = function() {
portalSelection.slice(minlvl, 8+1).removeClass('disabled').attr('title', '');
- $('#updatestatus').html(t);
+ $('#innerstatus').html(t);
//$('#updatestatus').click(function() { startRefreshTimeout(10); });
//. ⟳';
}
@@ -120,7 +134,7 @@ window.requests._callOnRefreshFunctions = function() {
startRefreshTimeout();
if(isIdle()) {
- console.log('user has been idle for ' + idleTime + ' minutes. Skipping refresh.');
+ console.log('user has been idle for ' + idleTime + ' seconds, or window hidden. Skipping refresh.');
renderUpdateStatus();
return;
}
diff --git a/code/smartphone.js b/code/smartphone.js
index 59acb7af..9d913c22 100644
--- a/code/smartphone.js
+++ b/code/smartphone.js
@@ -68,12 +68,30 @@ window.runOnSmartphonesBeforeBoot = function() {
});
}
+window.smartphoneInfo = function(data) {
+ var d = data.portalDetails;
+ var t = 'L' + Math.floor(getPortalLevel(d));
+ var percentage = '0%';
+ var totalEnergy = getTotalPortalEnergy(d);
+ if(getTotalPortalEnergy(d) > 0) {
+ percentage = Math.floor((getCurrentPortalEnergy(d) / getTotalPortalEnergy(d) * 100)) + '%';
+ }
+ t += ' ' + percentage + ' ';
+ t += d.portalV2.descriptiveText.TITLE;
+
+ $('#mobileinfo').html(t);
+}
+
window.runOnSmartphonesAfterBoot = function() {
if(!isSmartphone()) return;
console.warn('running smartphone post boot stuff');
smartphone.mapButton.click();
+ // add a div/hook for updating mobile info
+ $('#updatestatus').prepend('');
+ window.addHook('portalDetailsUpdated', window.smartphoneInfo);
+
// disable img full view
$('#portaldetails').off('click', '**');
@@ -90,12 +108,8 @@ window.runOnSmartphonesAfterBoot = function() {
// this is a hack, accessing Leaflet’s private _container is evil
$(this._container).on('taphold', function() {
- if (typeof android !== 'undefined' && android && android.portalLongPressed) {
- android.portalLongPressed();
- } else {
- window.renderPortalDetails(guid);
- window.smartphone.sideButton.click();
- }
+ window.renderPortalDetails(guid);
+ window.show('info');
});
});
});
diff --git a/code/utils_misc.js b/code/utils_misc.js
index 91147c1b..781fd378 100644
--- a/code/utils_misc.js
+++ b/code/utils_misc.js
@@ -249,23 +249,20 @@ window.getPortalDataZoom = function() {
// limiting the mazimum zoom level for data retrieval reduces the number of requests at high zoom levels
// (as all portal data is retrieved at z=17, why retrieve multiple z=18 tiles when fewer z=17 would do?)
- // a potential downside - we end up requesting more data than we needed from the larger tiles that go off
- // the window edge.
+ // very effective along with the new cache code
if (z > 17) z=17;
// we could consider similar zoom-level consolidation, as, e.g. level 16 and 15 both return L1+, always
// request zoom 15 tiles. however, there are quirks in the current data stream, where small fields aren't
// returned by the server. using larger tiles always would amplify this issue.
-
//sanity check - should never happen
if (z < 0) z=0;
return z;
}
-window.getMinPortalLevel = function() {
- var z = getPortalDataZoom();
+window.getMinPortalLevelForZoom = function(z) {
if(z >= 17) return 0;
if(z < 0) return 8;
var conv = [8,8,8,8,7,7,6,6,5,4,4,3,3,2,2,1,1];
@@ -276,6 +273,12 @@ window.getMinPortalLevel = function() {
return result;
}
+
+window.getMinPortalLevel = function() {
+ var z = getPortalDataZoom();
+ return getMinPortalLevelForZoom(z);
+}
+
// returns number of pixels left to scroll down before reaching the
// bottom. Works similar to the native scrollTop function.
window.scrollBottom = function(elm) {
diff --git a/external/Control.MiniMap.css b/external/Control.MiniMap.css
new file mode 100644
index 00000000..c558467f
--- /dev/null
+++ b/external/Control.MiniMap.css
@@ -0,0 +1,31 @@
+.leaflet-control-minimap {
+ border:solid rgba(255, 255, 255, 0.7) 3px;
+ box-shadow: 0 1px 7px #999;
+ background: #f8f8f9;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+}
+
+.leaflet-control-minimap a {
+ background-color: rgba(255, 255, 255, 0.75);
+ background-position: 1px 2px;
+ background-repeat: no-repeat;
+ display: block;
+ outline: none;
+ z-index: 99999;
+}
+
+.leaflet-control-minimap a.minimized {
+ background-position: 1px -18px;
+}
+
+.leaflet-control-minimap-toggle-display {
+ background-image: url(@@INCLUDEIMAGE:images/minimap-toggle.png@@);
+ border-radius: 4px 4px 4px 4px;
+ height: 19px;
+ width: 19px;
+ position: absolute;
+ bottom: 0;
+ right: 0;
+}
diff --git a/external/Control.MiniMap.js b/external/Control.MiniMap.js
new file mode 100644
index 00000000..db912307
--- /dev/null
+++ b/external/Control.MiniMap.js
@@ -0,0 +1,243 @@
+L.Control.MiniMap = L.Control.extend({
+ options: {
+ position: 'bottomright',
+ toggleDisplay: false,
+ zoomLevelOffset: -5,
+ zoomLevelFixed: false,
+ zoomAnimation: false,
+ autoToggleDisplay: false,
+ width: 150,
+ height: 150
+ },
+
+ hideText: 'Hide MiniMap',
+
+ showText: 'Show MiniMap',
+
+ //layer is the map layer to be shown in the minimap
+ initialize: function (layer, options) {
+ L.Util.setOptions(this, options);
+ this._layer = layer;
+ },
+
+ onAdd: function (map) {
+
+ this._mainMap = map;
+
+ //Creating the container and stopping events from spilling through to the main map.
+ this._container = L.DomUtil.create('div', 'leaflet-control-minimap');
+ this._container.style.width = this.options.width + 'px';
+ this._container.style.height = this.options.height + 'px';
+ L.DomEvent.disableClickPropagation(this._container);
+ L.DomEvent.on(this._container, 'mousewheel', L.DomEvent.stopPropagation);
+
+
+ this._miniMap = new L.Map(this._container,
+ {
+ attributionControl: false,
+ zoomControl: false,
+ zoomAnimation: this.options.zoomAnimation,
+ autoToggleDisplay: this.options.autoToggleDisplay,
+ touchZoom: !this.options.zoomLevelFixed,
+ scrollWheelZoom: !this.options.zoomLevelFixed,
+ doubleClickZoom: !this.options.zoomLevelFixed,
+ boxZoom: !this.options.zoomLevelFixed,
+ crs: map.options.crs
+ });
+
+ this._miniMap.addLayer(this._layer);
+
+ //These bools are used to prevent infinite loops of the two maps notifying each other that they've moved.
+ this._mainMapMoving = false;
+ this._miniMapMoving = false;
+
+ //Keep a record of this to prevent auto toggling when the user explicitly doesn't want it.
+ this._userToggledDisplay = false;
+ this._minimized = false;
+
+ if (this.options.toggleDisplay) {
+ this._addToggleButton();
+ }
+
+ this._miniMap.whenReady(L.Util.bind(function () {
+ this._aimingRect = L.rectangle(this._mainMap.getBounds(), {color: "#ff7800", weight: 1, clickable: false}).addTo(this._miniMap);
+ this._shadowRect = L.rectangle(this._mainMap.getBounds(), {color: "#000000", weight: 1, clickable: false,opacity:0,fillOpacity:0}).addTo(this._miniMap);
+ this._mainMap.on('moveend', this._onMainMapMoved, this);
+ this._mainMap.on('move', this._onMainMapMoving, this);
+ this._miniMap.on('movestart', this._onMiniMapMoveStarted, this);
+ this._miniMap.on('move', this._onMiniMapMoving, this);
+ this._miniMap.on('moveend', this._onMiniMapMoved, this);
+ }, this));
+
+ return this._container;
+ },
+
+ addTo: function (map) {
+ L.Control.prototype.addTo.call(this, map);
+ this._miniMap.setView(this._mainMap.getCenter(), this._decideZoom(true));
+ this._setDisplay(this._decideMinimized());
+ return this;
+ },
+
+ onRemove: function (map) {
+ this._mainMap.off('moveend', this._onMainMapMoved, this);
+ this._mainMap.off('move', this._onMainMapMoving, this);
+ this._miniMap.off('moveend', this._onMiniMapMoved, this);
+
+ this._miniMap.removeLayer(this._layer);
+ },
+
+ _addToggleButton: function () {
+ this._toggleDisplayButton = this.options.toggleDisplay ? this._createButton(
+ '', this.hideText, 'leaflet-control-minimap-toggle-display', this._container, this._toggleDisplayButtonClicked, this) : undefined;
+ },
+
+ _createButton: function (html, title, className, container, fn, context) {
+ var link = L.DomUtil.create('a', className, container);
+ link.innerHTML = html;
+ link.href = '#';
+ link.title = title;
+
+ var stop = L.DomEvent.stopPropagation;
+
+ L.DomEvent
+ .on(link, 'click', stop)
+ .on(link, 'mousedown', stop)
+ .on(link, 'dblclick', stop)
+ .on(link, 'click', L.DomEvent.preventDefault)
+ .on(link, 'click', fn, context);
+
+ return link;
+ },
+
+ _toggleDisplayButtonClicked: function () {
+ this._userToggledDisplay = true;
+ if (!this._minimized) {
+ this._minimize();
+ this._toggleDisplayButton.title = this.showText;
+ }
+ else {
+ this._restore();
+ this._toggleDisplayButton.title = this.hideText;
+ }
+ },
+
+ _setDisplay: function (minimize) {
+ if (minimize != this._minimized) {
+ if (!this._minimized) {
+ this._minimize();
+ }
+ else {
+ this._restore();
+ }
+ }
+ },
+
+ _minimize: function () {
+ // hide the minimap
+ if (this.options.toggleDisplay) {
+ this._container.style.width = '19px';
+ this._container.style.height = '19px';
+ this._toggleDisplayButton.className += ' minimized';
+ }
+ else {
+ this._container.style.display = 'none';
+ }
+ this._minimized = true;
+ },
+
+ _restore: function () {
+ if (this.options.toggleDisplay) {
+ this._container.style.width = this.options.width + 'px';
+ this._container.style.height = this.options.height + 'px';
+ this._toggleDisplayButton.className = this._toggleDisplayButton.className
+ .replace(/(?:^|\s)minimized(?!\S)/g, '');
+ }
+ else {
+ this._container.style.display = 'block';
+ }
+ this._minimized = false;
+ },
+
+ _onMainMapMoved: function (e) {
+ if (!this._miniMapMoving) {
+ this._mainMapMoving = true;
+ this._miniMap.setView(this._mainMap.getCenter(), this._decideZoom(true));
+ this._setDisplay(this._decideMinimized());
+ } else {
+ this._miniMapMoving = false;
+ }
+ this._aimingRect.setBounds(this._mainMap.getBounds());
+ },
+
+ _onMainMapMoving: function (e) {
+ this._aimingRect.setBounds(this._mainMap.getBounds());
+ },
+
+ _onMiniMapMoveStarted:function (e) {
+ var lastAimingRect = this._aimingRect.getBounds();
+ var sw = this._miniMap.latLngToContainerPoint(lastAimingRect.getSouthWest());
+ var ne = this._miniMap.latLngToContainerPoint(lastAimingRect.getNorthEast());
+ this._lastAimingRectPosition = {sw:sw,ne:ne};
+ },
+
+ _onMiniMapMoving: function (e) {
+ if (!this._mainMapMoving && this._lastAimingRectPosition) {
+ this._shadowRect.setBounds(new L.LatLngBounds(this._miniMap.containerPointToLatLng(this._lastAimingRectPosition.sw),this._miniMap.containerPointToLatLng(this._lastAimingRectPosition.ne)));
+ this._shadowRect.setStyle({opacity:1,fillOpacity:0.3});
+ }
+ },
+
+ _onMiniMapMoved: function (e) {
+ if (!this._mainMapMoving) {
+ this._miniMapMoving = true;
+ this._mainMap.setView(this._miniMap.getCenter(), this._decideZoom(false));
+ this._shadowRect.setStyle({opacity:0,fillOpacity:0});
+ } else {
+ this._mainMapMoving = false;
+ }
+ },
+
+ _decideZoom: function (fromMaintoMini) {
+ if (!this.options.zoomLevelFixed) {
+ if (fromMaintoMini)
+ return this._mainMap.getZoom() + this.options.zoomLevelOffset;
+ else
+ return this._miniMap.getZoom() - this.options.zoomLevelOffset;
+ } else {
+ if (fromMaintoMini)
+ return this.options.zoomLevelFixed;
+ else
+ return this._mainMap.getZoom();
+ }
+ },
+
+ _decideMinimized: function () {
+ if (this._userToggledDisplay) {
+ return this._minimized;
+ }
+
+ if (this.options.autoToggleDisplay) {
+ if (this._mainMap.getBounds().contains(this._miniMap.getBounds())) {
+ return true;
+ }
+ return false;
+ }
+
+ return this._minimized;
+ }
+});
+
+L.Map.mergeOptions({
+ miniMapControl: false
+});
+
+L.Map.addInitHook(function () {
+ if (this.options.miniMapControl) {
+ this.miniMapControl = (new L.Control.MiniMap()).addTo(this);
+ }
+});
+
+L.control.minimap = function (options) {
+ return new L.Control.MiniMap(options);
+};
diff --git a/external/delaunay.js b/external/delaunay.js
index c4533930..e9ec5b4b 100644
--- a/external/delaunay.js
+++ b/external/delaunay.js
@@ -18,7 +18,7 @@
/* If the points of the triangle are collinear, then just find the
* extremes and use the midpoint as the center of the circumcircle. */
- if(Math.abs(G) < 0.000001) {
+ if(Math.abs(G) < 1e-12) {
minx = Math.min(a.x, b.x, c.x)
miny = Math.min(a.y, b.y, c.y)
dx = (Math.max(a.x, b.x, c.x) - minx) * 0.5
@@ -166,4 +166,4 @@
/* Yay, we're done! */
return closed
- }
\ No newline at end of file
+ }
diff --git a/images/minimap-toggle.png b/images/minimap-toggle.png
new file mode 100644
index 00000000..026d4c8b
Binary files /dev/null and b/images/minimap-toggle.png differ
diff --git a/main.js b/main.js
index c39d2c61..5ee9ac47 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.12.1.@@DATETIMEVERSION@@
+// @version 0.12.3.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@@ -21,6 +21,7 @@ window.iitcBuildDate = '@@BUILDDATE@@';
// disable vanilla JS
window.onload = function() {};
+document.body.onload = function() {};
// rescue user data from original page
@@ -92,14 +93,15 @@ document.getElementsByTagName('body')[0].innerHTML = ''
+ ' 
'
+ '