From ce3ce97cdb660e7ba0571c017cc955902d13ae95 Mon Sep 17 00:00:00 2001
From: cody s <cody@simtable.com>
Date: Tue, 1 Oct 2019 10:35:01 -0600
Subject: [PATCH 1/6] Attempt at getting float32 working. Needs testing

---
 src/geotiffwriter.js | 6 ++++--
 test/index.html      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index f043bde7..45821d38 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -250,13 +250,15 @@ const encodeImage = (values, width, height, metadata) => {
     }
   }
 
+  const DataType = values.constructor
+
   const prfx = new Uint8Array(encodeIfds([ifd]));
 
-  const img = new Uint8Array(values);
+  const img = new Uint8Array(values.buffer);
 
   const samplesPerPixel = ifd[277];
 
-  const data = new Uint8Array(numBytesInIfd + (width * height * samplesPerPixel));
+  const data = new Uint8Array(numBytesInIfd + (img.length * samplesPerPixel));
   times(prfx.length, (i) => { data[i] = prfx[i]; });
   forEach(img, (value, i) => {
     data[numBytesInIfd + i] = value;
diff --git a/test/index.html b/test/index.html
index 237c8a6e..bb02838e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -8,7 +8,7 @@
 <select id="bands">
 </select>
 
-<script src="geotiff.bundle.js"></script>
+<script src="../dist/geotiff.bundle.js"></script>
 <script src="lib/plotty.min.js"></script>
 
 <script>

From 4881a37fdbd75520c212433f18e50499725106ca Mon Sep 17 00:00:00 2001
From: cody s <cody@simtable.com>
Date: Tue, 1 Oct 2019 10:46:17 -0600
Subject: [PATCH 2/6] Attempt at getting float32 working. Needs testing

---
 src/geotiffwriter.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index 45821d38..60cd630b 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -250,10 +250,9 @@ const encodeImage = (values, width, height, metadata) => {
     }
   }
 
-  const DataType = values.constructor
-
   const prfx = new Uint8Array(encodeIfds([ifd]));
 
+  // This should allow other kinds of typed arrays to be used. Uint8 is just a view of the real underlying data.
   const img = new Uint8Array(values.buffer);
 
   const samplesPerPixel = ifd[277];

From 6a38bf573a6ce9dfedbbcc470893b34ecc4a74f4 Mon Sep 17 00:00:00 2001
From: cody s <cody@simtable.com>
Date: Tue, 8 Oct 2019 16:27:20 -0600
Subject: [PATCH 3/6] handle normal js array too

---
 src/geotiffwriter.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index 60cd630b..f8625d2d 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -253,7 +253,12 @@ const encodeImage = (values, width, height, metadata) => {
   const prfx = new Uint8Array(encodeIfds([ifd]));
 
   // This should allow other kinds of typed arrays to be used. Uint8 is just a view of the real underlying data.
-  const img = new Uint8Array(values.buffer);
+  let img = undefined
+  if (ArrayBuffer.isView(values)) { // It is a typed array
+    img = new Uint8Array(values.buffer);
+  } else { // It is a normal js array
+    img = new Uint8Array(values)
+  }
 
   const samplesPerPixel = ifd[277];
 

From 16a691c4d29818a2ce67f1471290226e654c0775 Mon Sep 17 00:00:00 2001
From: cody s <cody@simtable.com>
Date: Wed, 9 Oct 2019 18:03:54 -0600
Subject: [PATCH 4/6] setting headers

---
 src/geotiffwriter.js | 21 +++++++++++++++++----
 src/utils.js         | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index f8625d2d..b6d4fc6d 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -7,7 +7,7 @@
 
 
 import { fieldTagNames, fieldTagTypes, fieldTypeNames, geoKeyNames } from './globals';
-import { assign, endsWith, forEach, invert, times } from './utils';
+import { assign, endsWith, forEach, invert, times, isTypedFloatArray, isTypedUintArray, isTypedIntArray } from './utils';
 
 
 const tagName2Code = invert(fieldTagNames);
@@ -339,9 +339,12 @@ const writeGeotiff = (data, metadata) => {
   delete metadata.width;
 
   // consult https://www.loc.gov/preservation/digital/formats/content/tiff_tags.shtml
-
+  let bitsPerSample = 8
+  if (ArrayBuffer.isView(flattenedValues)) {
+    bitsPerSample = 8 * flattenedValues.BYTES_PER_ELEMENT
+  }
   if (!metadata.BitsPerSample) {
-    metadata.BitsPerSample = times(numBands, () => 8);
+    metadata.BitsPerSample = times(numBands, () => bitsPerSample);
   }
 
   metadataDefaults.forEach((tag) => {
@@ -373,8 +376,18 @@ const writeGeotiff = (data, metadata) => {
     metadata.ModelPixelScale = [360 / width, 180 / height, 0];
   }
 
+  let sampleFormat = 1
+  if (isTypedFloatArray(flattenedValues)) {
+    sampleFormat = 3
+  }
+  if (isTypedIntArray(flattenedValues)) {
+    sampleFormat = 2
+  }
+  if (isTypedUintArray(flattenedValues)) {
+    sampleFormat = 1
+  }
   if (!metadata.SampleFormat) {
-    metadata.SampleFormat = times(numBands, () => 1);
+    metadata.SampleFormat = times(numBands, () => sampleFormat);
   }
 
 
diff --git a/src/utils.js b/src/utils.js
index 75e8092c..1b177675 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -76,3 +76,36 @@ export function toArrayRecursively(input) {
   }
   return input;
 }
+
+export function isTypedFloatArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr === Float32Array || ctr === Float32Array) {
+      return true
+    }
+  }
+  return false
+}
+
+export function isTypedIntArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr == Int8Array || ctr === Int16Array || ctr === Int32Array) {
+      return true
+    }
+  }
+  return false
+}
+
+export function isTypedUintArray(input) {
+  if (ArrayBuffer.isView(input)) {
+    const ctr = input.constructor
+    if (ctr == Uint8Array || ctr === Uint16Array || ctr === Uint32Array || ctr === Uint8ClampedArray) {
+      return true
+    }
+  }
+  return false
+}
+
+
+

From aae5ab74691b42280ba7455e0df8b428ffcb6482 Mon Sep 17 00:00:00 2001
From: cody s <cody@simtable.com>
Date: Wed, 9 Oct 2019 23:33:48 -0600
Subject: [PATCH 5/6] got write tests working. Not changing js array in
 accordance with metadata yet

---
 src/geotiffwriter.js | 28 ++++++++++++++--------------
 src/utils.js         |  2 ++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/geotiffwriter.js b/src/geotiffwriter.js
index b6d4fc6d..b2ab9ac8 100644
--- a/src/geotiffwriter.js
+++ b/src/geotiffwriter.js
@@ -339,11 +339,11 @@ const writeGeotiff = (data, metadata) => {
   delete metadata.width;
 
   // consult https://www.loc.gov/preservation/digital/formats/content/tiff_tags.shtml
-  let bitsPerSample = 8
-  if (ArrayBuffer.isView(flattenedValues)) {
-    bitsPerSample = 8 * flattenedValues.BYTES_PER_ELEMENT
-  }
   if (!metadata.BitsPerSample) {
+    let bitsPerSample = 8
+    if (ArrayBuffer.isView(flattenedValues)) {
+      bitsPerSample = 8 * flattenedValues.BYTES_PER_ELEMENT
+    }
     metadata.BitsPerSample = times(numBands, () => bitsPerSample);
   }
 
@@ -376,17 +376,17 @@ const writeGeotiff = (data, metadata) => {
     metadata.ModelPixelScale = [360 / width, 180 / height, 0];
   }
 
-  let sampleFormat = 1
-  if (isTypedFloatArray(flattenedValues)) {
-    sampleFormat = 3
-  }
-  if (isTypedIntArray(flattenedValues)) {
-    sampleFormat = 2
-  }
-  if (isTypedUintArray(flattenedValues)) {
-    sampleFormat = 1
-  }
   if (!metadata.SampleFormat) {
+    let sampleFormat = 1
+    if (isTypedFloatArray(flattenedValues)) {
+      sampleFormat = 3
+    }
+    if (isTypedIntArray(flattenedValues)) {
+      sampleFormat = 2
+    }
+    if (isTypedUintArray(flattenedValues)) {
+      sampleFormat = 1
+    }
     metadata.SampleFormat = times(numBands, () => sampleFormat);
   }
 
diff --git a/src/utils.js b/src/utils.js
index 1b177675..bbbeea50 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -109,3 +109,5 @@ export function isTypedUintArray(input) {
 
 
 
+
+

From 178b9e7f74b07589d34ba1b8cc6db4c4d0a8afd5 Mon Sep 17 00:00:00 2001
From: m0ose <cody@simtable.com>
Date: Thu, 10 Oct 2019 12:58:35 -0600
Subject: [PATCH 6/6] Update utils.js

woops. Fixed duplicated float32 check.
---
 src/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils.js b/src/utils.js
index bbbeea50..6a88227f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -80,7 +80,7 @@ export function toArrayRecursively(input) {
 export function isTypedFloatArray(input) {
   if (ArrayBuffer.isView(input)) {
     const ctr = input.constructor
-    if (ctr === Float32Array || ctr === Float32Array) {
+    if (ctr === Float32Array || ctr === Float64Array) {
       return true
     }
   }