cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/kapouer/Leaflet into maxbounds

Browse Source 
* 'patch-1' of https://github.com/kapouer/Leaflet:
  test Map#setMaxBounds and Map#panInsideBounds
  panInsideBounds: fit or center, pass options, remove boundsMinZoom
This commit is contained in:
Vladimir Agafonkin 2013-11-14 14:13:45 +02:00
commit be42f7a3b6
2 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spec/suites/map/MapSpec.js
View File

@ -139,6 +139,46 @@ describe("Map", function () {
});
});
describe('#setMaxBounds', function() {
it("aligns pixel-wise map view center with maxBounds center if it cannot move view bounds inside maxBounds (#1908)", function() {
var container = map.getContainer();
// large view, cannot fit within maxBounds
container.style.width = container.style.height = "1000px";
document.body.appendChild(container);
// maxBounds
var bounds = L.latLngBounds([51.5, -0.05], [51.55, 0.05]);
map.setMaxBounds(bounds, {animate: false});
// set view outside
map.setView(L.latLng([53.0, 0.15]), 12, {animate: false});
// get center of bounds in pixels
var boundsCenter = map.project(bounds.getCenter());
boundsCenter = {x: Math.round(boundsCenter.x), y: Math.round(boundsCenter.y)};
expect(map.project(map.getCenter())).to.eql(boundsCenter);
document.body.removeChild(container);
});
it("moves map view within maxBounds by changing one coordinate", function() {
var container = map.getContainer();
// small view, can fit within maxBounds
container.style.width = container.style.height = "200px";
document.body.appendChild(container);
// maxBounds
var bounds = L.latLngBounds([51, -0.2], [52, 0.2]);
map.setMaxBounds(bounds, {animate: false});
// set view outside maxBounds on one direction only
// leaves untouched the other coordinate (that is not already centered)
var initCenter = [53.0, 0.1];
map.setView(L.latLng(initCenter), 16, {animate: false});
// one pixel coordinate hasn't changed, the other has
var pixelCenter = map.project(map.getCenter());
var pixelInit = map.project(initCenter);
expect(pixelCenter.x).to.eql(Math.round(pixelInit.x));
expect(pixelCenter.y).not.to.eql(Math.round(pixelInit.y));
// the view is inside the bounds
expect(bounds.contains(map.getBounds())).to.be(true);
document.body.removeChild(container);
});
});
describe("#getMinZoom and #getMaxZoom", function () {
describe('#getMinZoom', function () {
it('returns 0 if not set by Map options or TileLayer options', function () {

70
src/map/Map.js
View File

@ -132,29 +132,19 @@ L.Map = L.Class.extend({
this.options.maxBounds = bounds;
if (!bounds) {
this._boundsMinZoom = null;
this.off('moveend', this._panInsideMaxBounds, this);
this.off('moveend', L.bind(this._panInsideMaxBounds, this, options), this);
return this;
}
var minZoom = this.getBoundsZoom(bounds, true);
this._boundsMinZoom = minZoom;
if (this._loaded) {
if (this._zoom < minZoom) {
this.setView(bounds.getCenter(), minZoom, options);
} else {
this.panInsideBounds(bounds);
}
this.panInsideBounds(bounds, options);
}
this.on('moveend', this._panInsideMaxBounds, this);
this.on('moveend', L.bind(this._panInsideMaxBounds, this, options), this);
return this;
},
panInsideBounds: function (bounds) {
panInsideBounds: function (bounds, options) {
bounds = L.latLngBounds(bounds);
var viewBounds = this.getPixelBounds(),
@ -162,24 +152,34 @@ L.Map = L.Class.extend({
viewNe = viewBounds.getTopRight(),
sw = this.project(bounds.getSouthWest()),
ne = this.project(bounds.getNorthEast()),
dx = 0,
dy = 0;
dx = 0, dy = 0;
if (viewNe.y < ne.y) { // north
dy = Math.ceil(ne.y - viewNe.y);
function rebound(l, r) {
var s = l + r;
var h = s / 2;
var d = 0;
if (s >= 0) {
if (l < 0) {
d = l;
} else if (r < 0) {
d = -r;
}
} else {
if (l < h) {
d = l - h;
} else if (r < h) {
d = -r + h;
}
}
return Math.round(d);
}
if (viewNe.x > ne.x) { // east
dx = Math.floor(ne.x - viewNe.x);
}
if (viewSw.y > sw.y) { // south
dy = Math.floor(sw.y - viewSw.y);
}
if (viewSw.x < sw.x) { // west
dx = Math.ceil(sw.x - viewSw.x);
}
// set signs so positive l, r means "in bound"
// and positive s + r means the view can fit inside the bounds
dx = rebound(ne.x - viewNe.x, -sw.x + viewSw.x);
dy = rebound(sw.y - viewSw.y, -ne.y + viewNe.y);
if (dx || dy) {
return this.panBy([dx, dy]);
return this.panBy([dx, dy], options);
}
return this;
@ -368,9 +368,9 @@ L.Map = L.Class.extend({
},
getMinZoom: function () {
var z1 = this._layersMinZoom === undefined ? 0 : this._layersMinZoom,
z2 = this._boundsMinZoom === undefined ? 0 : this._boundsMinZoom;
return this.options.minZoom === undefined ? Math.max(z1, z2) : this.options.minZoom;
return this.options.minZoom === undefined ?
(this._layersMinZoom === undefined ? 0 : this._layersMinZoom) :
this.options.minZoom;
},
getMaxZoom: function () {
@ -658,8 +658,8 @@ L.Map = L.Class.extend({
}
},
_panInsideMaxBounds: function () {
this.panInsideBounds(this.options.maxBounds);
_panInsideMaxBounds: function (options) {
this.panInsideBounds(this.options.maxBounds, options);
},
_checkIfLoaded: function () {