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

draw resonator lines below resonators when selecting a portal. Also reduce code duplication

Browse Source
This commit is contained in:
Stefan Breunig 2013-02-15 19:01:18 +01:00
parent 146c061a3b
commit e69ba16a23
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
code/map_data.js
View File

@ -337,7 +337,7 @@ window.renderResonators = function(ent, portalLayer) {
var resoGuid = portalResonatorGuid(ent[0], i); var resoGuid = portalResonatorGuid(ent[0], i);
// the resonator // the resonator
var resoStyle = var resoStyle =
ent[0] === selectedPortal ? OPTIONS_RESONATOR_SELECTED : OPTIONS_RESONATOR_NON_SELECTED; ent[0] === selectedPortal ? OPTIONS_RESONATOR_SELECTED : OPTIONS_RESONATOR_NON_SELECTED;
var resoProperty = $.extend({ var resoProperty = $.extend({
opacity: 1, opacity: 1,
@ -350,7 +350,7 @@ window.renderResonators = function(ent, portalLayer) {
var reso = L.circleMarker(Rlatlng, resoProperty); var reso = L.circleMarker(Rlatlng, resoProperty);
// line connecting reso to portal // line connecting reso to portal
var connStyle = var connStyle =
ent[0] === selectedPortal ? OPTIONS_RESONATOR_LINE_SELECTED : OPTIONS_RESONATOR_LINE_NON_SELECTED; ent[0] === selectedPortal ? OPTIONS_RESONATOR_LINE_SELECTED : OPTIONS_RESONATOR_LINE_NON_SELECTED;
var connProperty = $.extend({ var connProperty = $.extend({
color: '#FFA000', color: '#FFA000',
@ -376,9 +376,9 @@ window.renderResonators = function(ent, portalLayer) {
// doesn’t matter to which element these are bound since Leaflet // doesn’t matter to which element these are bound since Leaflet
// will add/remove all elements of the LayerGroup at once. // will add/remove all elements of the LayerGroup at once.
reso.on('remove', function() { delete window.resonators[this.options.guid]; }); reso.on('remove', function() { delete window.resonators[this.options.guid]; });
reso.on('add', function() { reso.on('add', function() {
if(window.resonators[this.options.guid]) throw('duplicate resonator detected'); if(window.resonators[this.options.guid]) throw('duplicate resonator detected');
window.resonators[this.options.guid] = r; window.resonators[this.options.guid] = r;
}); });
r.addTo(portalsLayers[parseInt(portalLevel)]); r.addTo(portalsLayers[parseInt(portalLevel)]);
@ -412,33 +412,26 @@ window.portalResetColor = function(portal) {
} }
window.resonatorsResetStyle = function(portalGuid) { window.resonatorsResetStyle = function(portalGuid) {
for(var i = 0; i < 8; i++) { window.resonatorsSetStyle(portalGuid, OPTIONS_RESONATOR_NON_SELECTED, OPTIONS_RESONATOR_LINE_NON_SELECTED);
resonatorLayerGroup = resonators[portalResonatorGuid(portalGuid, i)];
if(!resonatorLayerGroup) continue;
resonatorLayerGroup.eachLayer(function(layer) {
if (layer.options.guid) {
// Resonator
layer.setStyle(OPTIONS_RESONATOR_NON_SELECTED);
} else {
// Resonator line
layer.setStyle(OPTIONS_RESONATOR_LINE_NON_SELECTED);
}
});
}
} }
window.resonatorsSetSelectStyle = function(portalGuid) { window.resonatorsSetSelectStyle = function(portalGuid) {
window.resonatorsSetStyle(portalGuid, OPTIONS_RESONATOR_SELECTED, OPTIONS_RESONATOR_LINE_SELECTED);
}
window.resonatorsSetStyle = function(portalGuid, resoStyle, lineStyle) {
for(var i = 0; i < 8; i++) { for(var i = 0; i < 8; i++) {
resonatorLayerGroup = resonators[portalResonatorGuid(portalGuid, i)]; resonatorLayerGroup = resonators[portalResonatorGuid(portalGuid, i)];
if(!resonatorLayerGroup) continue; if(!resonatorLayerGroup) continue;
// bring resonators and their connection lines to front separately.
// this way the resonators are drawn on top of the lines.
resonatorLayerGroup.eachLayer(function(layer) { resonatorLayerGroup.eachLayer(function(layer) {
if (layer.options.guid) { if (!layer.options.guid) // Resonator line
// Resonator layer.bringToFront().setStyle(lineStyle);
layer.bringToFront().setStyle(OPTIONS_RESONATOR_SELECTED); });
} else { resonatorLayerGroup.eachLayer(function(layer) {
// Resonator line if (layer.options.guid) // Resonator
layer.bringToFront().setStyle(OPTIONS_RESONATOR_LINE_SELECTED); layer.bringToFront().setStyle(resoStyle);
}
}); });
} }
} }