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

Fix logic bug in addLayerGroup

Browse Source
This commit is contained in:
Xelio 2013-05-03 13:10:25 +08:00
parent 61d83567a6
commit 50f4004ac5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/utils_misc.js
View File

@ -360,20 +360,20 @@ window.updateDisplayedLayerGroup = function(name, display) {
// Read layerGroup status from window.overlayStatus if it was added to map, // Read layerGroup status from window.overlayStatus if it was added to map,
// read from cookie if it has not added to map yet. // read from cookie if it has not added to map yet.
// return true if both overlayStatus and cookie didn't have the record // return true if both overlayStatus and cookie didn't have the record
window.isLayerGroupDisplayed = function(name) { window.isLayerGroupDisplayed = function(name, defaultDisplay) {
if(typeof(overlayStatus[name]) !== 'undefined') return overlayStatus[name]; if(typeof(overlayStatus[name]) !== 'undefined') return overlayStatus[name];
var layersJSON = readCookie('ingress.intelmap.layergroupdisplayed'); var layersJSON = readCookie('ingress.intelmap.layergroupdisplayed');
if(!layersJSON) return true; if(!layersJSON) return defaultDisplay;
var layers = JSON.parse(layersJSON); var layers = JSON.parse(layersJSON);
// keep latest overlayStatus // keep latest overlayStatus
overlayStatus = $.extend(layers, overlayStatus); overlayStatus = $.extend(layers, overlayStatus);
if(typeof(overlayStatus[name]) === 'undefined') return true; if(typeof(overlayStatus[name]) === 'undefined') return defaultDisplay;
return overlayStatus[name]; return overlayStatus[name];
} }
window.addLayerGroup = function(name, layerGroup, defaultDisplay) { window.addLayerGroup = function(name, layerGroup, defaultDisplay) {
if(isLayerGroupDisplayed(name) || defaultDisplay) map.addLayer(layerGroup); if(isLayerGroupDisplayed(name, defaultDisplay)) map.addLayer(layerGroup);
layerChooser.addOverlay(layerGroup, name); layerChooser.addOverlay(layerGroup, name);
} }