Fix url links for zoom, add ll param support from stock intel link button
This commit is contained in:
parent
0d51e045a0
commit
15ea225d10
@ -21,11 +21,18 @@ window.storeMapPosition = function() {
|
|||||||
// returns a map that shows the whole world.
|
// returns a map that shows the whole world.
|
||||||
window.getPosition = function() {
|
window.getPosition = function() {
|
||||||
if(getURLParam('latE6') && getURLParam('lngE6')) {
|
if(getURLParam('latE6') && getURLParam('lngE6')) {
|
||||||
console.log("mappos: reading URL params");
|
console.log("mappos: reading email URL params");
|
||||||
var lat = parseInt(getURLParam('latE6'))/1E6 || 0.0;
|
var lat = parseInt(getURLParam('latE6'))/1E6 || 0.0;
|
||||||
var lng = parseInt(getURLParam('lngE6'))/1E6 || 0.0;
|
var lng = parseInt(getURLParam('lngE6'))/1E6 || 0.0;
|
||||||
// google seems to zoom in far more than leaflet
|
var z = parseInt(getURLParam('z')) || 17;
|
||||||
var z = parseInt(getURLParam('z'))+1 || 17;
|
return {center: new L.LatLng(lat, lng), zoom: z > 18 ? 18 : z};
|
||||||
|
}
|
||||||
|
|
||||||
|
if(getURLParam('ll')) {
|
||||||
|
console.log("mappos: reading stock Intel URL params");
|
||||||
|
var lat = parseFloat(getURLParam('ll').split(",")[0]) || 0.0;
|
||||||
|
var lng = parseFloat(getURLParam('ll').split(",")[1]) || 0.0;
|
||||||
|
var z = parseInt(getURLParam('z')) || 17;
|
||||||
return {center: new L.LatLng(lat, lng), zoom: z > 18 ? 18 : z};
|
return {center: new L.LatLng(lat, lng), zoom: z > 18 ? 18 : z};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,7 +257,7 @@ window.setPermaLink = function(elm) {
|
|||||||
var c = map.getCenter();
|
var c = map.getCenter();
|
||||||
var lat = Math.round(c.lat*1E6);
|
var lat = Math.round(c.lat*1E6);
|
||||||
var lng = Math.round(c.lng*1E6);
|
var lng = Math.round(c.lng*1E6);
|
||||||
var qry = 'latE6='+lat+'&lngE6='+lng+'&z=' + (map.getZoom()-1);
|
var qry = 'latE6='+lat+'&lngE6='+lng+'&z=' + map.getZoom();
|
||||||
$(elm).attr('href', '/intel?' + qry);
|
$(elm).attr('href', '/intel?' + qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user