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

rewrite default base map layer handling. it remembers by name, rather than id (so will work if order changes), and also works if plugins add additional base layers

Browse Source
This commit is contained in:
Jon Atkins 2013-05-19 15:29:36 +01:00
parent 9a30c13413
commit 653a6cc82d
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
code/boot.js
View File

@ -200,14 +200,6 @@ window.setupMap = function() {
map.addControl(window.layerChooser);
// set the map AFTER adding the layer chooser, or Chrome reorders the
// layers. This likely leads to broken layer selection because the
// views/cookie order does not match the layer chooser order.
try {
convertCookieToLocalStorage('ingress.intelmap.type');
map.addLayer(views[localStorage['ingress.intelmap.type']]);
} catch(e) { map.addLayer(views[0]); }
map.attributionControl.setPrefix('');
// listen for changes and store them in cookies
map.on('moveend', window.storeMapPosition);
@ -228,10 +220,6 @@ window.setupMap = function() {
console.log('Remove all resonators');
});
map.on('baselayerchange', function () {
var selInd = $('[name=leaflet-base-layers]:checked').parent().index();
localStorage['ingress.intelmap.type']=selInd;
});
// map update status handling & update map hooks
// ensures order of calls
@ -248,6 +236,36 @@ window.setupMap = function() {
};
//adds a base layer to the map. done separately from the above, so that plugins that add base layers can be the default
window.setMapBaseLayer = function() {
//create a map name -> layer mapping - depends on internals of L.Control.Layers
var nameToLayer = {};
var firstLayer = null;
for (i in window.layerChooser._layers) {
var obj = window.layerChooser._layers[i];
if (!obj.overlay) {
nameToLayer[obj.name] = obj.layer;
if (!firstLayer) firstLayer = obj.layer;
}
}
var baseLayer = nameToLayer[localStorage['iitc-base-map']] || firstLayer;
map.addLayer(baseLayer);
map.on('baselayerchange', function() {
for(i in window.layerChooser._layers) {
var obj = window.layerChooser._layers[i];
if (!obj.overlay && map.hasLayer(obj.layer)) {
localStorage['iitc-base-map'] = obj.name;
break;
}
}
});
}
// renders player details into the website. Since the player info is
// included as inline script in the original site, the data is static
// and cannot be updated.
@ -412,6 +430,8 @@ function boot() {
}
});
window.setMapBaseLayer();
window.runOnSmartphonesAfterBoot();
// workaround for #129. Not sure why this is required.