Merge branch 'master' into 241-xml-utils

Author: constantinius

.github/workflows/ci.yml

@@ -1,7 +1,10 @@
 name: Node.js CI
 
 on:
-  [ push ]
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   ci:
@@ -25,4 +28,4 @@ jobs:
         fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-      if: always()
+      if: ${{ github.event_name != 'pull_request'}}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "geotiff",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "GeoTIFF image decoding in JavaScript",
   "repository": "https://github.com/geotiffjs/geotiff.js",
   "keywords": [
@@ -22,12 +22,12 @@
     "browsers": "defaults"
   },
   "dependencies": {
-    "@petamoriken/float16": "^1.0.7",
+    "@petamoriken/float16": "^3.4.7",
     "lerc": "^3.0.0",
     "lru-cache": "^6.0.0",
     "pako": "^2.0.4",
     "parse-headers": "^2.0.2",
-    "threads": "^1.3.1",
+    "threads": "^1.7.0",
     "xml-utils": "^1.0.2"
   },
   "devDependencies": {
@@ -54,7 +54,7 @@
     "parcel-bundler": "^1.12.4",
     "parcel-plugin-bundle-visualiser": "^1.2.0",
     "rimraf": "^3.0.2",
-    "send-ranges": "^3.0.0",
+    "send-ranges": "^4.0.0",
     "serve-static": "^1.14.1"
   },
   "scripts": {
@@ -76,7 +76,8 @@
     "fs": false,
     "http": false,
     "https": false,
-    "url": false
+    "url": false,
+    "./src/txml": "./src/browser/txml"
   },
   "sideEffects": false,
   "contributors": [

package.json

@@ -0,0 +1 @@
+export { parse } from 'txml/dist/txml';

src/browser/txml.js

@@ -413,16 +413,18 @@ class GeoTIFFImage {
     height, resampleMethod, signal) {
     const tileWidth = this.getTileWidth();
     const tileHeight = this.getTileHeight();
+    const imageWidth = this.getWidth();
+    const imageHeight = this.getHeight();
 
     const minXTile = Math.max(Math.floor(imageWindow[0] / tileWidth), 0);
     const maxXTile = Math.min(
       Math.ceil(imageWindow[2] / tileWidth),
-      Math.ceil(this.getWidth() / this.getTileWidth()),
+      Math.ceil(imageWidth / tileWidth),
     );
     const minYTile = Math.max(Math.floor(imageWindow[1] / tileHeight), 0);
     const maxYTile = Math.min(
       Math.ceil(imageWindow[3] / tileHeight),
-      Math.ceil(this.getHeight() / this.getTileHeight()),
+      Math.ceil(imageHeight / tileHeight),
     );
     const windowWidth = imageWindow[2] - imageWindow[0];
 
@@ -462,8 +464,8 @@ class GeoTIFFImage {
             const lastCol = (tile.x + 1) * tileWidth;
             const reader = sampleReaders[si];
 
-            const ymax = Math.min(blockHeight, blockHeight - (lastLine - imageWindow[3]));
-            const xmax = Math.min(tileWidth, tileWidth - (lastCol - imageWindow[2]));
+            const ymax = Math.min(blockHeight, blockHeight - (lastLine - imageWindow[3]), imageHeight - firstLine);
+            const xmax = Math.min(tileWidth, tileWidth - (lastCol - imageWindow[2]), imageWidth - firstCol);
 
             for (let y = Math.max(0, imageWindow[1] - firstLine); y < ymax; ++y) {
               for (let x = Math.max(0, imageWindow[0] - firstCol); x < xmax; ++x) {

src/geotiffimage.js

@@ -0,0 +1 @@
+export { parse } from 'txml';

src/txml.js

@@ -549,6 +549,53 @@ describe('COG tests', async () => {
     expect(ghostValues).to.be.null;
   });
 });
+
+describe('fillValue', async () => {
+  it('should fill pixels outside the image area (to the left and above)', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('cog.tiff'));
+    const image = await tiff.getImage(0);
+    const data = await image.readRasters({ window: [-1, -1, 0, 0], fillValue: 42 });
+    expect(data).to.have.lengthOf(15);
+    for (const band of data) {
+      expect(band).to.have.lengthOf(1);
+      expect(band).to.deep.equal(new Uint16Array([42]));
+    }
+  });
+
+  it('should fill pixels outside the image area (to the right and below)', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('cog.tiff'));
+    const image = await tiff.getImage(0);
+    const data = await image.readRasters({ window: [512, 512, 513, 513], fillValue: 42 });
+    expect(data).to.have.lengthOf(15);
+    for (const band of data) {
+      expect(band).to.have.lengthOf(1);
+      expect(band).to.deep.equal(new Uint16Array([42]));
+    }
+  });
+
+  it('should fill areas in overview tiles outside the image extent (left)', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('cog.tiff'));
+    const image = await tiff.getImage(1);
+    const data = await image.readRasters({ window: [269, 0, 270, 1], fillValue: 42 });
+    expect(data).to.have.lengthOf(15);
+    for (const band of data) {
+      expect(band).to.have.lengthOf(1);
+      expect(band).to.deep.equal(new Uint16Array([42]));
+    }
+  });
+
+  it('should fill areas in overview tiles outside the image extent (below)', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('cog.tiff'));
+    const image = await tiff.getImage(1);
+    const data = await image.readRasters({ window: [0, 224, 1, 225], fillValue: 42 });
+    expect(data).to.have.lengthOf(15);
+    for (const band of data) {
+      expect(band).to.have.lengthOf(1);
+      expect(band).to.deep.equal(new Uint16Array([42]));
+    }
+  });
+});
+
 describe("64 bit tests", () => {
   it("DataView64 uint64 tests", () => {
     const littleEndianBytes = new Uint8Array([