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

Merge pull request #4377 from Leaflet/fix-get-bounds-fit-bounds

Browse Source 
Round bounds size.
This commit is contained in:
Zsolt Ero 2016-04-02 19:56:52 +02:00
commit cd9c813ee6
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,7 +714,7 @@ describe("Map", function () {
});
describe('#fitBounds', function () {
var center = L.latLng(22, 33),
var center = L.latLng(50.5, 30.51),
bounds = L.latLngBounds(L.latLng(1, 102), L.latLng(11, 122)),
boundsCenter = bounds.getCenter();
@ -723,7 +723,7 @@ describe("Map", function () {
var container = map.getContainer();
container.style.width = container.style.height = "100px";
document.body.appendChild(container);
map.setView(center, 10);
map.setView(center, 15);
});
afterEach(function () {
@ -777,6 +777,18 @@ describe("Map", function () {
}).to.throwError();
});
it('Fits to same scale and zoom', function (done) {
var bounds = map.getBounds(),
zoom = map.getZoom();
map.once('moveend zoomend', function () {
var newBounds = map.getBounds();
expect(newBounds.getSouthWest()).to.nearLatLng(bounds.getSouthWest());
expect(newBounds.getNorthEast()).to.nearLatLng(bounds.getNorthEast());
expect(map.getZoom()).to.eql(zoom);
done();
});
map.fitBounds(bounds, {animate: false});
});
});

2
src/map/Map.js
View File

@ -514,7 +514,7 @@ L.Map = L.Evented.extend({
nw = bounds.getNorthWest(),
se = bounds.getSouthEast(),
size = this.getSize(),
boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding),
boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding)._round(),
snap = L.Browser.any3d ? this.options.zoomSnap : 1;
var scale = Math.min(size.x / boundsSize.x, size.y / boundsSize.y);