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

make max-links limit based on portal count - saves calculating when we wouldn't draw

Browse Source 
show a 'too many portals' error as a marker when not drawn
This commit is contained in:
Jon Atkins 2013-08-28 17:44:46 +01:00
parent ccc13b0131
commit ae88e8276f
1 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,8 @@
window.plugin.maxLinks = function() {}; window.plugin.maxLinks = function() {};
// const values // const values
window.plugin.maxLinks.MAX_DRAWN_LINKS = 400; window.plugin.maxLinks.MAX_PORTALS_TO_LINK = 400;
window.plugin.maxLinks.STROKE_STYLE = { window.plugin.maxLinks.STROKE_STYLE = {
color: '#FF0000', color: '#FF0000',
opacity: 1, opacity: 1,
@ -31,8 +32,8 @@ window.plugin.maxLinks.STROKE_STYLE = {
smoothFactor: 10, smoothFactor: 10,
}; };
window.plugin.maxLinks.layer = null; window.plugin.maxLinks.layer = null;
window.plugin.maxLinks.errorMarker = null;
window.plugin.maxLinks._updating = false;
window.plugin.maxLinks.Point = function(x,y) { window.plugin.maxLinks.Point = function(x,y) {
this.x=x; this.x=x;
@ -42,14 +43,42 @@ window.plugin.maxLinks.Point.prototype.toString = function() {
return this.x+","+this.y; return this.x+","+this.y;
} }
window.plugin.maxLinks.addErrorMarker = function() {
if (window.plugin.maxLinks.errorMarker == null) {
window.plugin.maxLinks.errorMarker = L.marker (window.map.getCenter(), {
icon: L.divIcon({
className: 'max-links-error',
iconSize: [300,30],
html: 'Max Links: too many portals!'
}),
clickable: false
});
window.map.addLayer(window.plugin.maxLinks.errorMarker);
}
}
window.plugin.maxLinks.clearErrorMarker = function() {
if (window.plugin.maxLinks.errorMarker != null) {
window.map.removeLayer(window.plugin.maxLinks.errorMarker);
window.plugin.maxLinks.errorMarker = null;
}
}
window.plugin.maxLinks.updateLayer = function() { window.plugin.maxLinks.updateLayer = function() {
if (window.plugin.maxLinks._updating || if (!window.map.hasLayer(window.plugin.maxLinks.layer))
window.plugin.maxLinks.layer === null ||
!window.map.hasLayer(window.plugin.maxLinks.layer))
return; return;
window.plugin.maxLinks._updating = true;
window.plugin.maxLinks.layer.clearLayers(); window.plugin.maxLinks.layer.clearLayers();
if (Object.keys(window.portals).length > window.plugin.maxLinks.MAX_PORTALS_TO_LINK) {
window.plugin.maxLinks.addErrorMarker();
return;
}
var locations = []; var locations = [];
$.each(window.portals, function(guid, portal) { $.each(window.portals, function(guid, portal) {
@ -61,7 +90,6 @@ window.plugin.maxLinks.updateLayer = function() {
var triangles = window.delaunay.triangulate(locations); var triangles = window.delaunay.triangulate(locations);
var drawnLinkCount = 0; var drawnLinkCount = 0;
window.plugin.maxLinks._renderLimitReached = false;
var orderedPoints = function(a,b) { var orderedPoints = function(a,b) {
if(a.x<b.x) return [a,b]; if(a.x<b.x) return [a,b];
@ -99,15 +127,7 @@ window.plugin.maxLinks.updateLayer = function() {
drawLink(triangle.a,triangle.b); drawLink(triangle.a,triangle.b);
drawLink(triangle.b,triangle.c); drawLink(triangle.b,triangle.c);
drawLink(triangle.c,triangle.a); drawLink(triangle.c,triangle.a);
// we only check the render limit after drawing all three edges of a triangle, for efficency
if (drawnLinkCount > window.plugin.maxLinks.MAX_DRAWN_LINKS ) {
window.plugin.maxLinks._renderLimitReached = true;
return false; //$.each break
}
}); });
window.plugin.maxLinks._updating = false;
window.renderUpdateStatus();
} }
window.plugin.maxLinks.setup = function() { window.plugin.maxLinks.setup = function() {
@ -121,12 +141,22 @@ window.plugin.maxLinks.setup = function() {
window.plugin.maxLinks.updateLayer(); window.plugin.maxLinks.updateLayer();
}); });
window.addHook('mapDataRefreshStart', function(e) {
window.plugin.maxLinks.clearErrorMarker();
});
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();
}); });
window.map.on('zoomend moveend', window.plugin.maxLinks.updateLayer); window.map.on('zoomend moveend', window.plugin.maxLinks.updateLayer);
window.addLayerGroup('Maximum Links', window.plugin.maxLinks.layer, false); window.addLayerGroup('Maximum Links', window.plugin.maxLinks.layer, false);
$('head').append('<style>'+
'.max-links-error { color: #F88; font-size: 20px; font-weight: bold; text-align: center; text-shadow: -1px -1px #000, 1px -1px #000, -1px 1px #000, 1px 1px #000; background-color: rgba(0,0,0,0.6); border-radius: 5px; }'+
'</style>');
} }
var setup = window.plugin.maxLinks.setup; var setup = window.plugin.maxLinks.setup;