zaprange plugin: has had broken team support for a while - fixed

https://plus.google.com/104096045622750660984/posts/DMT25KG6ZFo
This commit is contained in:
Jon Atkins
2015-02-23 19:16:46 +00:00
parent a98809ccd5
commit b0006ae5ad

View File

@ -2,7 +2,7 @@
// @id iitc-plugin-zaprange@zaso // @id iitc-plugin-zaprange@zaso
// @name IITC plugin: Zaprange // @name IITC plugin: Zaprange
// @category Layer // @category Layer
// @version 0.1.3.@@DATETIMEVERSION@@ // @version 0.1.4.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@ // @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@ // @downloadURL @@DOWNLOADURL@@
@ -25,18 +25,18 @@
window.plugin.zaprange.portalAdded = function(data) { window.plugin.zaprange.portalAdded = function(data) {
data.portal.on('add', function() { data.portal.on('add', function() {
window.plugin.zaprange.draw(this.options.guid, this.options.data.team); window.plugin.zaprange.draw(this.options.guid, this.options.team);
}); });
data.portal.on('remove', function() { data.portal.on('remove', function() {
window.plugin.zaprange.remove(this.options.guid, this.options.data.team); window.plugin.zaprange.remove(this.options.guid, this.options.team);
}); });
} }
window.plugin.zaprange.remove = function(guid, faction) { window.plugin.zaprange.remove = function(guid, faction) {
var previousLayer = window.plugin.zaprange.zapLayers[guid]; var previousLayer = window.plugin.zaprange.zapLayers[guid];
if(previousLayer) { if(previousLayer) {
if(faction === 'ENLIGHTENED') { if(faction === TEAM_ENL) {
window.plugin.zaprange.zapCircleEnlHolderGroup.removeLayer(previousLayer); window.plugin.zaprange.zapCircleEnlHolderGroup.removeLayer(previousLayer);
} else { } else {
window.plugin.zaprange.zapCircleResHolderGroup.removeLayer(previousLayer); window.plugin.zaprange.zapCircleResHolderGroup.removeLayer(previousLayer);
@ -48,7 +48,7 @@
window.plugin.zaprange.draw = function(guid, faction) { window.plugin.zaprange.draw = function(guid, faction) {
var d = window.portals[guid]; var d = window.portals[guid];
if(faction !== "NEUTRAL") { if(faction !== TEAM_NONE) {
var coo = d._latlng; var coo = d._latlng;
var latlng = new L.LatLng(coo.lat,coo.lng); var latlng = new L.LatLng(coo.lat,coo.lng);
var portalLevel = d.options.level; var portalLevel = d.options.level;
@ -57,7 +57,7 @@
var circle = new L.Circle(latlng, range, optCircle); var circle = new L.Circle(latlng, range, optCircle);
if(faction === 'ENLIGHTENED') { if(faction === TEAM_ENL) {
circle.addTo(window.plugin.zaprange.zapCircleEnlHolderGroup); circle.addTo(window.plugin.zaprange.zapCircleEnlHolderGroup);
} else { } else {
circle.addTo(window.plugin.zaprange.zapCircleResHolderGroup); circle.addTo(window.plugin.zaprange.zapCircleResHolderGroup);