Merge pull request #256 from DanielJDufour/updated-writing

updated writing

Author: constantinius

src/geotiffwriter.js

@@ -123,7 +123,7 @@ const _writeIFD = (bin, data, _offset, ifd) => {
 
     let val = ifd[key];
 
-    if (typeof val === 'undefined') {
+    if (val === undefined) {
       throw new Error(`failed to get value for key ${key}`);
     }
 
@@ -290,16 +290,7 @@ const toArray = (input) => {
 const metadataDefaults = [
   ['Compression', 1], // no compression
   ['PlanarConfiguration', 1],
-  ['XPosition', 0],
-  ['YPosition', 0],
-  ['ResolutionUnit', 1], // Code 1 for actual pixel count or 2 for pixels per inch.
-  ['ExtraSamples', 0], // should this be an array??
-  ['GeoAsciiParams', 'WGS 84\u0000'],
-  ['ModelTiepoint', [0, 0, 0, -180, 90, 0]], // raster fits whole globe
-  ['GTModelTypeGeoKey', 2],
-  ['GTRasterTypeGeoKey', 1],
-  ['GeographicTypeGeoKey', 4326],
-  ['GeogCitationGeoKey', 'WGS 84'],
+  ['ExtraSamples', 0],
 ];
 
 export function writeGeotiff(data, metadata) {
@@ -373,10 +364,32 @@ export function writeGeotiff(data, metadata) {
     metadata.SampleFormat = times(numBands, () => 1);
   }
 
+  // if didn't pass in projection information, assume the popular 4326 "geographic projection"
+  if (!metadata.hasOwnProperty('GeographicTypeGeoKey') && !metadata.hasOwnProperty('ProjectedCSTypeGeoKey')) {
+    metadata.GeographicTypeGeoKey = 4326;
+    metadata.ModelTiepoint = [0, 0, 0, -180, 90, 0]; // raster fits whole globe
+    metadata.GeogCitationGeoKey = 'WGS 84';
+    metadata.GTModelTypeGeoKey = 2;
+  }
+
   const geoKeys = Object.keys(metadata)
     .filter((key) => endsWith(key, 'GeoKey'))
     .sort((a, b) => name2code[a] - name2code[b]);
 
+  if (!metadata.GeoAsciiParams) {
+    let geoAsciiParams = '';
+    geoKeys.forEach((name) => {
+      const code = Number(name2code[name]);
+      const tagType = fieldTagTypes[code];
+      if (tagType === 'ASCII') {
+        geoAsciiParams += `${metadata[name].toString()}\u0000`;
+      }
+    });
+    if (geoAsciiParams.length > 0) {
+      metadata.GeoAsciiParams = geoAsciiParams;
+    }
+  }
+
   if (!metadata.GeoKeyDirectory) {
     const NumberOfKeys = geoKeys.length;
 
@@ -421,7 +434,9 @@ export function writeGeotiff(data, metadata) {
     'GTRasterTypeGeoKey',
     'ImageLength', // synonym of ImageHeight
     'ImageWidth',
+    'Orientation',
     'PhotometricInterpretation',
+    'ProjectedCSTypeGeoKey',
     'PlanarConfiguration',
     'ResolutionUnit',
     'SamplesPerPixel',

src/globals.js

@@ -145,6 +145,7 @@ export const fieldTagTypes = {
   286: 'SHORT',
   287: 'RATIONAL',
   296: 'SHORT',
+  297: 'SHORT',
   305: 'ASCII',
   306: 'ASCII',
   338: 'SHORT',
@@ -155,6 +156,8 @@ export const fieldTagTypes = {
   1025: 'SHORT',
   2048: 'SHORT',
   2049: 'ASCII',
+  3072: 'SHORT',
+  3073: 'ASCII',
   33550: 'DOUBLE',
   33922: 'DOUBLE',
   34665: 'LONG',

test/geotiff.spec.js

@@ -656,7 +656,7 @@ describe('fillValue', async () => {
       expect(band).to.have.lengthOf(1);
       expect(band).to.deep.equal(new Uint16Array([42]));
     }
-  });
+  }).timeout(10000);
 
   it('should fill areas in overview tiles outside the image extent (below)', async () => {
     const tiff = await GeoTIFF.fromSource(createSource('cog.tiff'));
@@ -667,7 +667,7 @@ describe('fillValue', async () => {
       expect(band).to.have.lengthOf(1);
       expect(band).to.deep.equal(new Uint16Array([42]));
     }
-  });
+  }).timeout(10000);
 });
 
 describe('64 bit tests', () => {
@@ -972,7 +972,6 @@ describe('writeTests', () => {
     const geoKeys = image.getGeoKeys();
     expect(geoKeys).to.be.an('object');
     expect(geoKeys.GTModelTypeGeoKey).to.equal(2);
-    expect(geoKeys.GTRasterTypeGeoKey).to.equal(1);
     expect(geoKeys.GeographicTypeGeoKey).to.equal(4326);
     expect(geoKeys.GeogCitationGeoKey).to.equal('WGS 84');
 
@@ -1029,7 +1028,6 @@ describe('writeTests', () => {
     const geoKeys = image.getGeoKeys();
     expect(geoKeys).to.be.an('object');
     expect(geoKeys.GTModelTypeGeoKey).to.equal(2);
-    expect(geoKeys.GTRasterTypeGeoKey).to.equal(1);
     expect(geoKeys.GeographicTypeGeoKey).to.equal(4326);
     expect(geoKeys.GeogCitationGeoKey).to.equal('WGS 84');