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

wrap tileBounds if noWrap is false by @fyeah (#4908)

Browse Source
This commit is contained in:
Iván Sánchez Ortega 2016-09-12 16:59:21 +02:00 committed by Per Liedman
parent 8b3252797a
commit 63fd4edc76
2 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
spec/suites/layer/tile/GridLayerSpec.js
View File

@ -816,4 +816,76 @@ describe('GridLayer', function () {
clock.tick(250);
});
});
describe("nowrap option", function () {
it("When false, uses same coords at zoom 0 for all tiles", function (done) {
var grid = L.gridLayer({
attribution: 'Grid Layer',
tileSize: L.point(256, 256),
noWrap: false
});
var loadedTileKeys = [];
grid.createTile = function (coords) {
loadedTileKeys.push(coords.x + ':' + coords.y + ':' + coords.z);
return document.createElement('div');
};
map.addLayer(grid).setView([0, 0], 0);
grid.on('load', function () {
expect(loadedTileKeys).to.eql(["0:0:0", "0:0:0", "0:0:0", "0:0:0", "0:0:0"]);
done();
});
});
it("When true, uses different coords at zoom level 0 for all tiles", function (done) {
var grid = L.gridLayer({
attribution: 'Grid Layer',
tileSize: L.point(256, 256),
noWrap: true
});
var loadedTileKeys = [];
grid.createTile = function (coords) {
loadedTileKeys.push(coords.x + ':' + coords.y + ':' + coords.z);
return document.createElement('div');
};
map.addLayer(grid).setView([0, 0], 0);
grid.on('load', function () {
expect(loadedTileKeys).to.eql(['0:0:0', '-1:0:0', '1:0:0', '-2:0:0', '2:0:0']);
done();
});
});
it("When true and with bounds, loads just one tile at zoom level 0", function (done) {
var grid = L.gridLayer({
attribution: 'Grid Layer',
tileSize: L.point(256, 256),
bounds: [[-90, -180], [90, 180]],
noWrap: true
});
var loadedTileKeys = [];
grid.createTile = function (coords) {
loadedTileKeys.push(coords.x + ':' + coords.y + ':' + coords.z);
return document.createElement('div');
};
map.addLayer(grid).setView([0, 0], 0);
grid.on('load', function () {
expect(loadedTileKeys).to.eql(['0:0:0']);
done();
});
});
});
});

9
src/layer/tile/GridLayer.js
View File

@ -688,8 +688,13 @@ L.GridLayer = L.Layer.extend({
nwPoint = coords.scaleBy(tileSize),
sePoint = nwPoint.add(tileSize),
nw = map.wrapLatLng(map.unproject(nwPoint, coords.z)),
se = map.wrapLatLng(map.unproject(sePoint, coords.z));
nw = map.unproject(nwPoint, coords.z),
se = map.unproject(sePoint, coords.z);
if (!this.options.noWrap) {
nw = map.wrapLatLng(nw);
se = map.wrapLatLng(se);
}
return new L.LatLngBounds(nw, se);
},