Merge pull request #451 from Rdataflow/feat--add_zstd

Author: constantinius

.eslintrc.cjs

@@ -42,7 +42,8 @@ module.exports = {
     'max-classes-per-file': 0,
     'max-len': ['error', { code: 130 }],
     'import/prefer-default-export': 0,
-    'import/extensions': ['error', 'always'],
+    'import/extensions': 0,
+    'import/no-unresolved': 0,
     'prefer-default-export': 0,
     'func-names': 0,
     'arrow-body-style': 0,

package-lock.json

@@ -89,7 +89,7 @@
     "quick-lru": "^6.1.1",
     "web-worker": "^1.5.0",
     "xml-utils": "^1.10.2",
-    "zstddec": "^0.1.0"
+    "zstddec": "^0.2.0-alpha.3"
   },
   "devDependencies": {
     "@babel/core": "^7.8.7",

package.json

@@ -61,4 +61,11 @@ addDecoder(34887, () => import('./lerc.js')
   })
   .then((m) => m.default),
 );
+addDecoder(50000, () => import('./zstd.js')
+  .then(async (m) => {
+    await m.zstd.init();
+    return m;
+  })
+  .then((m) => m.default),
+);
 addDecoder(50001, () => import('./webimage.js').then((m) => m.default), false);

src/compression/index.js

@@ -0,0 +1,10 @@
+import { ZSTDDecoder } from 'zstddec/stream';
+import BaseDecoder from './basedecoder.js';
+
+export const zstd = new ZSTDDecoder();
+
+export default class ZstdDecoder extends BaseDecoder {
+  decodeBlock(buffer) {
+    return zstd.decode(new Uint8Array(buffer)).buffer;
+  }
+}

src/compression/zstd.js

@@ -26,10 +26,12 @@ gdal_translate -of GTiff -co COMPRESS=LERC -co MAX_Z_ERROR=1000 stripped.tiff le
 gdal_translate -of GTiff -co COMPRESS=LERC -co MAX_Z_ERROR=1000 -co INTERLEAVE=BAND stripped.tiff lerc_interleave.tiff
 gdal_translate -of GTiff -co COMPRESS=LERC_DEFLATE -co MAX_Z_ERROR=1000 stripped.tiff lerc_deflate.tiff
 gdal_translate -of GTiff -co COMPRESS=LERC_ZSTD -co MAX_Z_ERROR=1000 stripped.tiff lerc_zstd.tiff
+gdal_translate -of GTiff -co COMPRESS=ZSTD stripped.tiff zstd.tiff
 gdal_translate -of GTiff -ot Float32 -co COMPRESS=LERC -co MAX_Z_ERROR=1000 stripped.tiff float32lerc.tiff
 gdal_translate -of GTiff -ot Float32 -co COMPRESS=LERC -co MAX_Z_ERROR=1000 -co INTERLEAVE=BAND stripped.tiff float32lerc_interleave.tiff
 gdal_translate -of GTiff -ot Float32 -co COMPRESS=LERC_DEFLATE -co MAX_Z_ERROR=1000 stripped.tiff float32lerc_deflate.tiff
 gdal_translate -of GTiff -ot Float32 -co COMPRESS=LERC_ZSTD -co MAX_Z_ERROR=1000 stripped.tiff float32lerc_zstd.tiff
+gdal_translate -of GTiff -ot Float32 -co COMPRESS=ZSTD stripped.tiff float32zstd.tiff
 
 gdal_translate -of COG initial.tiff cog.tiff
 

test/data/setup_data.sh

@@ -298,6 +298,11 @@ describe('GeoTIFF', () => {
     await performTiffTests(tiff, 539, 448, 15, Uint16Array);
   });
 
+  it('should work on Zstandard compressed tiffs', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('zstd.tiff'));
+    await performTiffTests(tiff, 539, 448, 15, Uint16Array);
+  });
+
   it('should work on Float32 and LERC compressed tiffs', async () => {
     const tiff = await GeoTIFF.fromSource(createSource('float32lerc.tiff'));
     await performTiffTests(tiff, 539, 448, 15, Float32Array);
@@ -318,6 +323,11 @@ describe('GeoTIFF', () => {
     await performTiffTests(tiff, 539, 448, 15, Float32Array);
   });
 
+  it('should work on Float32 and Zstandard compressed tiffs', async () => {
+    const tiff = await GeoTIFF.fromSource(createSource('float32zstd.tiff'));
+    await performTiffTests(tiff, 539, 448, 15, Float32Array);
+  });
+
   it('should work with worker pool', async () => {
     const testPool = new Pool();
     const tiff = await GeoTIFF.fromSource(createSource('nasa_raster.tiff'));