Skip to content

Commit

Permalink
fix missing repeats of CanvasSource when it crosses the antimeridian (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ansis authored and ryanhamley committed Sep 12, 2018
1 parent 1b3bcef commit 62ed01e
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 6 deletions.
18 changes: 13 additions & 5 deletions src/geo/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,21 @@ class Transform {
* @private
*/
getVisibleUnwrappedCoordinates(tileID: CanonicalTileID) {
const ul = this.pointCoordinate(new Point(0, 0), 0);
const ur = this.pointCoordinate(new Point(this.width, 0), 0);
const w0 = Math.floor(ul.column);
const w1 = Math.floor(ur.column);
const result = [new UnwrappedTileID(0, tileID)];
if (this._renderWorldCopies) {
for (let w = w0; w <= w1; w++) {
const utl = this.pointCoordinate(new Point(0, 0), 0);
const utr = this.pointCoordinate(new Point(this.width, 0), 0);
const ubl = this.pointCoordinate(new Point(this.width, this.height), 0);
const ubr = this.pointCoordinate(new Point(0, this.height), 0);
const w0 = Math.floor(Math.min(utl.column, utr.column, ubl.column, ubr.column));
const w1 = Math.floor(Math.max(utl.column, utr.column, ubl.column, ubr.column));

// Add an extra copy of the world on each side to properly render ImageSources and CanvasSources.
// Both sources draw outside the tile boundaries of the tile that "contains them" so we need
// to add extra copies on both sides in case offscreen tiles need to draw into on-screen ones.
const extraWorldCopy = 1;

for (let w = w0 - extraWorldCopy; w <= w1 + extraWorldCopy; w++) {
if (w === 0) continue;
result.push(new UnwrappedTileID(w, tileID));
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"version": 8,
"metadata": {
"test": {
"width": 512,
"height": 64
}
},
"center": [
-10,
0
],
"zoom": 0,
"sources": {
"image": {
"type": "image",
"coordinates": [
[
-270,
-80
],
[
90,
-80
],
[
90,
80
],
[
-270,
80
]
],
"url": "local://image/0.png"
}
},
"layers": [
{
"id": "image",
"type": "raster",
"source": "image",
"paint": {
"raster-fade-duration": 0
}
}
]
}
2 changes: 1 addition & 1 deletion test/unit/geo/transform.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ test('transform', (t) => {
transform.center = { lng: -170.01, lat: 0.01 };

let unwrappedCoords = transform.getVisibleUnwrappedCoordinates(new CanonicalTileID(0, 0, 0));
t.equal(unwrappedCoords.length, 2);
t.equal(unwrappedCoords.length, 4);

//getVisibleUnwrappedCoordinates should honor _renderWorldCopies
transform._renderWorldCopies = false;
Expand Down

0 comments on commit 62ed01e

Please sign in to comment.