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

re-write map initial position setting. before, if the initial zoom was invalid for the selected layer, things would get stuck in an odd way

Browse Source
This commit is contained in:
Jon Atkins
2013-08-30 06:54:22 +01:00
parent 7b838af6e3
commit 13d247019c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/boot.js
View File

@ -127,10 +127,8 @@ window.setupMap = function() {
/*5*/ new L.Google('TERRAIN',{maxZoom:15}) /*5*/ new L.Google('TERRAIN',{maxZoom:15})
]; ];
// proper initial position is now delayed until all plugins are loaded and the base layer is set
window.map = new L.Map('map', $.extend(getPosition(), window.map = new L.Map('map', {center: [0,0], zoom: 1, zoomControl: window.showZoom, minZoom: 1});
{zoomControl: window.showZoom, minZoom: 1}
));
// add empty div to leaflet control areas - to force other leaflet controls to move around IITC UI elements // add empty div to leaflet control areas - to force other leaflet controls to move around IITC UI elements
// TODO? move the actual IITC DOM into the leaflet control areas, so dummy <div>s aren't needed // TODO? move the actual IITC DOM into the leaflet control areas, so dummy <div>s aren't needed
@ -221,9 +219,10 @@ window.setMapBaseLayer = function() {
var baseLayer = nameToLayer[localStorage['iitc-base-map']] || firstLayer; var baseLayer = nameToLayer[localStorage['iitc-base-map']] || firstLayer;
map.addLayer(baseLayer); map.addLayer(baseLayer);
//after choosing a base layer, ensure the zoom is valid for this layer // now we have a base layer we can set the map position
//(needs to be done here - as we don't know the base layer zoom limit before this) // (setting an initial position, before a base layer is added, causes issues with leaflet)
map.setZoom(map.getZoom()); var pos = getPosition();
map.setView (pos.center, pos.zoom, {reset:true});
//event to track layer changes and store the name //event to track layer changes and store the name