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

convert IITC-only cookies to use localStorage instead - otherwise they're sent to the ingress servers and are a clear indentifier of IITC use (and wasteful of data too)

Browse Source 
fix #251
This commit is contained in:
Jon Atkins 2013-05-10 04:40:21 +01:00
parent 35397c0c35
commit 3982c64b2f
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/boot.js
View File

@ -203,7 +203,8 @@ window.setupMap = function() {
// layers. This likely leads to broken layer selection because the // layers. This likely leads to broken layer selection because the
// views/cookie order does not match the layer chooser order. // views/cookie order does not match the layer chooser order.
try { try {
map.addLayer(views[readCookie('ingress.intelmap.type')]); convertCookieToLocalStorage('ingress.intelmap.type');
map.addLayer(views[localStorage['ingress.intelmap.type']]);
} catch(e) { map.addLayer(views[0]); } } catch(e) { map.addLayer(views[0]); }
map.attributionControl.setPrefix(''); map.attributionControl.setPrefix('');
@ -228,7 +229,7 @@ window.setupMap = function() {
map.on('baselayerchange', function () { map.on('baselayerchange', function () {
var selInd = $('[name=leaflet-base-layers]:checked').parent().index(); var selInd = $('[name=leaflet-base-layers]:checked').parent().index();
writeCookie('ingress.intelmap.type', selInd); localStorage['ingress.intelmap.type']=selInd;
}); });
// map update status handling // map update status handling

23
code/utils_misc.js
View File

@ -72,6 +72,22 @@ window.writeCookie = function(name, val) {
document.cookie = name + "=" + val + '; expires=Thu, 31 Dec 2020 23:59:59 GMT; path=/'; document.cookie = name + "=" + val + '; expires=Thu, 31 Dec 2020 23:59:59 GMT; path=/';
} }
window.eraseCookie = function(name) {
document.cookie = name + '=; expires=Thu, 1 Jan 1970 00:00:00 GMT; path=/';
}
//certain values were stored in cookies, but we're better off using localStorage instead - make it easy to convert
window.convertCookieToLocalStorage = function(name) {
var cookie=readCookie(name);
if(cookie !== undefined) {
console.log('converting cookie '+name+' to localStorage');
if(localStorage[name] === undefined) {
localStorage[name] = cookie;
}
eraseCookie(name);
}
}
// add thousand separators to given number. // add thousand separators to given number.
// http://stackoverflow.com/a/1990590/1684530 by Doug Neiner. // http://stackoverflow.com/a/1990590/1684530 by Doug Neiner.
window.digits = function(d) { window.digits = function(d) {
@ -364,10 +380,10 @@ window.calcTriArea = function(p) {
return Math.abs((p[0].lat*(p[1].lng-p[2].lng)+p[1].lat*(p[2].lng-p[0].lng)+p[2].lat*(p[0].lng-p[1].lng))/2); return Math.abs((p[0].lat*(p[1].lng-p[2].lng)+p[1].lat*(p[2].lng-p[0].lng)+p[2].lat*(p[0].lng-p[1].lng))/2);
} }
// Update layerGroups display status to window.overlayStatus and cookie 'ingress.intelmap.layergroupdisplayed' // Update layerGroups display status to window.overlayStatus and localStorage 'ingress.intelmap.layergroupdisplayed'
window.updateDisplayedLayerGroup = function(name, display) { window.updateDisplayedLayerGroup = function(name, display) {
overlayStatus[name] = display; overlayStatus[name] = display;
writeCookie('ingress.intelmap.layergroupdisplayed', JSON.stringify(overlayStatus)); localStorage['ingress.intelmap.layergroupdisplayed'] = JSON.stringify(overlayStatus);
} }
// Read layerGroup status from window.overlayStatus if it was added to map, // Read layerGroup status from window.overlayStatus if it was added to map,
@ -376,7 +392,8 @@ window.updateDisplayedLayerGroup = function(name, display) {
window.isLayerGroupDisplayed = function(name, defaultDisplay) { 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'); convertCookieToLocalStorage('ingress.intelmap.layergroupdisplayed');
var layersJSON = localStorage['ingress.intelmap.layergroupdisplayed'];
if(!layersJSON) return defaultDisplay; if(!layersJSON) return defaultDisplay;
var layers = JSON.parse(layersJSON); var layers = JSON.parse(layersJSON);