Skip to content

Prevent the browser's tab to crash for extent having a non-number height or width #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Prevent the browser's tab to crash for extent having a non-number height or width #103

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f5780e
Do not try to initialize an unassigned tile
qgerome Jul 22, 2022
ac4bbb7
Always return the created tile directly
qgerome Jul 22, 2022
fee7eb7
Remove unnecessary variable & move zoom near to its use
qgerome Jul 22, 2022
cb1398c
Width and height of the raster extent bbox may be NaN
qgerome Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 28 additions & 32 deletions src/georaster-layer-for-leaflet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,13 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C
tile.style.visibility = "hidden";

const context = tile.getContext("2d");

// note that we aren't setting the tile height or width here
// drawTile dynamically sets the width and padding based on
// how much the georaster takes up the tile area
return this.drawTile({ tile, coords, context, done });
this.drawTile({ tile, coords, context, done });

return tile;
},

drawTile: function ({ tile, coords, context, done }: DrawTileOptions) {
Expand All @@ -308,10 +311,6 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C

if (debugLevel >= 2) console.log("starting drawTile with", { tile, coords, context, done });

let error: Error;

const { z: zoom } = coords;

// stringified hash of tile coordinates for caching purposes
const cacheKey = [coords.x, coords.y, coords.z].join(",");
if (debugLevel >= 2) log({ cacheKey });
Expand Down Expand Up @@ -436,26 +435,24 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C
// Reprojecting the bounding box back to the map CRS would expand it
// (unless the projection is purely scaling and translation),
// so instead just extend the old map bounding box proportionately.
{
const oldrb = new GeoExtent(oldExtentOfInnerTileInRasterCRS.bbox);
const newrb = new GeoExtent(extentOfInnerTileInRasterCRS.bbox);
const oldmb = new GeoExtent(extentOfInnerTileInMapCRS.bbox);
if (oldrb.width !== 0 && oldrb.height !== 0) {
let n0 = ((newrb.xmin - oldrb.xmin) / oldrb.width) * oldmb.width;
let n1 = ((newrb.ymin - oldrb.ymin) / oldrb.height) * oldmb.height;
let n2 = ((newrb.xmax - oldrb.xmax) / oldrb.width) * oldmb.width;
let n3 = ((newrb.ymax - oldrb.ymax) / oldrb.height) * oldmb.height;
if (!overdrawTileAcross) {
n0 = Math.max(n0, 0);
n2 = Math.min(n2, 0);
}
if (!overdrawTileDown) {
n1 = Math.max(n1, 0);
n3 = Math.min(n3, 0);
}
const newbox = [oldmb.xmin + n0, oldmb.ymin + n1, oldmb.xmax + n2, oldmb.ymax + n3];
extentOfInnerTileInMapCRS = new GeoExtent(newbox, { srs: extentOfInnerTileInMapCRS.srs });
const oldrb = new GeoExtent(oldExtentOfInnerTileInRasterCRS.bbox);
const newrb = new GeoExtent(extentOfInnerTileInRasterCRS.bbox);
const oldmb = new GeoExtent(extentOfInnerTileInMapCRS.bbox);
if (oldrb.width && oldrb.height) {
let n0 = ((newrb.xmin - oldrb.xmin) / oldrb.width) * oldmb.width;
let n1 = ((newrb.ymin - oldrb.ymin) / oldrb.height) * oldmb.height;
let n2 = ((newrb.xmax - oldrb.xmax) / oldrb.width) * oldmb.width;
let n3 = ((newrb.ymax - oldrb.ymax) / oldrb.height) * oldmb.height;
if (!overdrawTileAcross) {
n0 = Math.max(n0, 0);
n2 = Math.min(n2, 0);
}
if (!overdrawTileDown) {
n1 = Math.max(n1, 0);
n3 = Math.min(n3, 0);
}
const newbox = [oldmb.xmin + n0, oldmb.ymin + n1, oldmb.xmax + n2, oldmb.ymax + n3];
extentOfInnerTileInMapCRS = new GeoExtent(newbox, { srs: extentOfInnerTileInMapCRS.srs });
}

// create outline around raster pixels
Expand Down Expand Up @@ -544,6 +541,7 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C

// render asynchronously so tiles show up as they finish instead of all at once (which blocks the UI)
setTimeout(async () => {
const { z: zoom } = coords;
try {
let tileRasters: number[][][] | null = null;
if (!rasters) {
Expand Down Expand Up @@ -626,7 +624,7 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C
return band[yInRasterPixels][xInRasterPixels];
});
} else {
done && done(Error("no rasters are available for, so skipping value generation"));
done(new Error("no rasters are available for, so skipping value generation"));
return;
}

Expand Down Expand Up @@ -687,22 +685,20 @@ const GeoRasterLayer: (new (options: GeoRasterLayerOptions) => any) & typeof L.C
}

tile.style.visibility = "visible"; // set to default
} catch (e: any) {
error = e;
done(undefined, tile);
} catch (error: any) {
done(error, tile);
}
done && done(error, tile);
}, 0);

// return the tile so it can be rendered on screen
return tile;
} catch (error: any) {
done && done(error, tile);
done(error, tile);
}
},

// copied from Leaflet with slight modifications,
// including removing the lines that set the tile size
_initTile: function (tile: HTMLCanvasElement) {
if (!tile) return;
L.DomUtil.addClass(tile, "leaflet-tile");

tile.onselectstart = L.Util.falseFn;
Expand Down