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

Revert "added a renderlimit for the plugin"

Browse Source 
This reverts commit a94bf4475b.
This commit is contained in:
Florian Sundermann
2013-02-25 08:50:41 +01:00
parent a94bf4475b
commit 1fdad5cfdf
3 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/hooks.js
View File

@ -43,16 +43,13 @@
// redrawn. It is called early on in the // redrawn. It is called early on in the
// code/map_data.js#renderPortal as long as there was an // code/map_data.js#renderPortal as long as there was an
// old portal for the guid. // old portal for the guid.
// checkRenderLimit: callback is passed the argument of
// {reached : false} to indicate that the renderlimit is reached
// set reached to true.
window._hooks = {} window._hooks = {}
window.VALID_HOOKS = ['portalAdded', 'portalDetailsUpdated', window.VALID_HOOKS = ['portalAdded', 'portalDetailsUpdated',
'publicChatDataAvailable', 'portalDataLoaded', 'beforePortalReRender', 'publicChatDataAvailable', 'portalDataLoaded', 'beforePortalReRender'];
'checkRenderLimit'];
window.runHooks = function(event, data) { window.runHooks = function(event, data) {
if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event); if(VALID_HOOKS.indexOf(event) === -1) throw('Unknown event type: ' + event);

4
code/utils_misc.js
View File

@ -128,9 +128,7 @@ window.renderLimitReached = function() {
if(Object.keys(portals).length >= MAX_DRAWN_PORTALS) return true; if(Object.keys(portals).length >= MAX_DRAWN_PORTALS) return true;
if(Object.keys(links).length >= MAX_DRAWN_LINKS) return true; if(Object.keys(links).length >= MAX_DRAWN_LINKS) return true;
if(Object.keys(fields).length >= MAX_DRAWN_FIELDS) return true; if(Object.keys(fields).length >= MAX_DRAWN_FIELDS) return true;
var param = { 'reached': false }; return false;
window.runHooks('checkRenderLimit', param);
return param.reached;
} }
window.getMinPortalLevel = function() { window.getMinPortalLevel = function() {

24
plugins/max-links.user.js
View File

@ -20,10 +20,9 @@ function wrapper() {
// use own namespace for plugin // use own namespace for plugin
window.plugin.maxLinks = function() {}; window.plugin.maxLinks = function() {};
window.plugin.maxLinks.MAX_DRAWN_LINKS = 400;
var MAX_LINK_COLOR = '#FF0000'; var MAX_LINK_COLOR = '#FF0000';
var Triangle = function (a, b, c) { var Triangle = function (a, b, c) {
this.a = a; this.a = a;
this.b = b; this.b = b;
@ -204,8 +203,7 @@ function wrapper() {
window.plugin.maxLinks.layer = null; window.plugin.maxLinks.layer = null;
var updating = false; var updating = false;
var renderLimitReached = false;
window.plugin.maxLinks.updateLayer = function() { window.plugin.maxLinks.updateLayer = function() {
if (updating || window.plugin.maxLinks.layer === null || !window.map.hasLayer(window.plugin.maxLinks.layer)) if (updating || window.plugin.maxLinks.layer === null || !window.map.hasLayer(window.plugin.maxLinks.layer))
return; return;
@ -232,28 +230,14 @@ function wrapper() {
}); });
var triangles = window.plugin.maxLinks.triangulate(locations); var triangles = window.plugin.maxLinks.triangulate(locations);
var drawnLinks = 0;
renderLimitReached = false;
$.each(triangles, function(idx, triangle) { $.each(triangles, function(idx, triangle) {
if (drawnLinks <= window.plugin.maxLinks.MAX_DRAWN_LINKS) { triangle.draw(window.plugin.maxLinks.layer, minX, minY)
triangle.draw(window.plugin.maxLinks.layer, minX, minY);
drawnLinks += 3;
} else {
renderLimitReached = true;
}
}); });
updating = false; updating = false;
window.renderUpdateStatus();
} }
var setup = function() { var setup = function() {
window.plugin.maxLinks.layer = L.layerGroup([]); window.plugin.maxLinks.layer = L.layerGroup([]);
window.addHook('checkRenderLimit', function(e) {
if (window.map.hasLayer(window.plugin.maxLinks.layer) && renderLimitReached)
e.reached = true;
});
window.map.on('layeradd', function(e) { window.map.on('layeradd', function(e) {
if (e.layer === window.plugin.maxLinks.layer) if (e.layer === window.plugin.maxLinks.layer)
window.plugin.maxLinks.updateLayer(); window.plugin.maxLinks.updateLayer();