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

Fix for #4208 with extra unit tests

Browse Source
This commit is contained in:
Iván Sánchez Ortega 2016-02-09 09:56:33 +01:00
parent 70c692f214
commit 8dee2d3591
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,6 +763,43 @@ describe("Map", function () {
});
describe('#fitBounds after layers set', function () {
var center = L.latLng(22, 33),
bounds = L.latLngBounds(L.latLng(1, 102), L.latLng(11, 122)),
boundsCenter = bounds.getCenter();
beforeEach(function () {
// fitBounds needs a map container with non-null area
var container = map.getContainer();
container.style.width = container.style.height = "100px";
document.body.appendChild(container);
});
afterEach(function () {
document.body.removeChild(map.getContainer());
});
it('Snaps to a number after adding tile layer', function (done) {
L.Browser.any3d = true;
map.addLayer(L.tileLayer('file:///dev/null'));
expect(map.getZoom()).to.be(undefined);
map.fitBounds(bounds);
expect(map.getZoom()).to.be(2);
done();
});
it('Snaps to a number after adding marker', function (done) {
L.Browser.any3d = true;
map.addLayer(L.marker(center));
expect(map.getZoom()).to.be(undefined);
map.fitBounds(bounds);
expect(map.getZoom()).to.be(2);
done();
});
});
describe('#DOM events', function () {
var c, map;
@ -927,4 +964,15 @@ describe("Map", function () {
expect(Math.round(map.getZoomScale(scale, fromZoom) * 100) / 100).to.eql(toZoom);
});
});
describe('#getZoom', function () {
it("returns undefined if map not initialized", function () {
expect(map.getZoom()).to.be(undefined);
});
it("returns undefined if map not initialized but layers added", function () {
map.addLayer(L.tileLayer('file:///dev/null'));
expect(map.getZoom()).to.be(undefined);
});
});
});

2
src/map/Map.js
View File

@ -333,7 +333,7 @@ L.Map = L.Evented.extend({
bounds = L.latLngBounds(bounds);
padding = L.point(padding || [0, 0]);
var zoom = this.getZoom(),
var zoom = this.getZoom() || 0,
min = this.getMinZoom(),
max = this.getMaxZoom(),
nw = bounds.getNorthWest(),