modernized identify

Author: DanielJDufour

src/identify/identify.module.js

@@ -1,11 +1,13 @@
-import convertGeometry from '../convert-geometry';
-import load from "../load";
-
-const identifySync = (georaster, geometry) => {
+/**
+ * @prettier
+ */
+import convertGeometry from "../convert-geometry";
+import wrap from "../wrap-func";
 
+const identify = (georaster, geometry) => {
   // The convertGeometry function takes the input
   // geometry and converts it to a standard format.
-  const [xInCrs, yInCrs] = convertGeometry('point', geometry);
+  const [xInCrs, yInCrs] = convertGeometry("point", geometry);
 
   // By normalizing the difference in latitude and longitude between the image
   // origin and the point geometry by the cell height and width respectively,
@@ -17,7 +19,6 @@ const identifySync = (georaster, geometry) => {
   const y = Math.floor((georaster.ymax - yInCrs) / georaster.pixelHeight);
 
   try {
-
     // iterate through the bands
     // get the row and then the column of the pixel that you want
     if (x > 0 && x < georaster.width && y > 0 && y < georaster.height) {
@@ -30,19 +31,10 @@ const identifySync = (georaster, geometry) => {
     } else {
       return null;
     }
-
-  } catch(e) {
+  } catch (e) {
     console.error(e);
     throw e;
   }
 };
 
-function identify (georaster, geometry) {
-  if (typeof georaster === "string") {
-    return load(georaster).then(georasterLoaded => identifySync(georasterLoaded, geometry));
-  } else {
-    return identifySync(georaster, geometry);
-  }
-}
-
-export default identify;
+export default wrap(identify);

src/identify/identify.test.js

@@ -1,32 +1,58 @@
-import test from 'flug';
-import fetch from 'cross-fetch';
-import load from '../load';
-import identify from './identify.module';
+/**
+ * @prettier
+ */
+import test from "flug";
+import { serve } from "srvd";
+import load from "../load";
+import identify from "./identify.module";
 
-const url = 'http://localhost:3000/data/test.tiff';
+const url = "http://localhost:3000/data/test.tiff";
 const point = [80.63, 7.42];
 const expectedValue = 350.7;
 
-test('Identified Point Correctly from file', async ({ eq }) => {
-  const georaster = await fetch(url).then(r => r.arrayBuffer()).then(load);
+if (require.main === module) serve({ debug: true, port: 3000, wait: 3 });
+
+test("(Legacy) Identified Point Correctly from file", async ({ eq }) => {
+  const georaster = await load(url);
   const values = identify(georaster, point)[0];
   eq(values, expectedValue);
 });
 
-test('Try to identify point outside raster and correctly returned null from file', async ({ eq }) => {
-  const georaster = await fetch(url).then(r => r.arrayBuffer()).then(load);
-  const value = identify(georaster, [-200, 7.42]);
-  eq(value, null);
+test("(Legacy) Try to identify point outside raster and correctly returned null from file", async ({ eq }) => {
+  const georaster = await load(url);
+  const values = identify(georaster, [-200, 7.42]);
+  eq(values, null);
 });
 
-test('Identified Point Correctly from URL', async ({ eq }) => {
+test("(Legacy) Identified Point Correctly from URL", async ({ eq }) => {
   const georaster = await load(url);
-  const values = await identify(georaster, point);
+  const values = identify(georaster, point);
   eq(values[0], expectedValue);
 });
 
-test('Try to identify point outside raster and correctly returned null from URL', async ({ eq }) => {
+test("(Legacy) Try to identify point outside raster and correctly returned null from URL", async ({ eq }) => {
   const georaster = await load(url);
-  const value = await identify(georaster, [-200, 7.42]);
-  eq(value, null);
+  const values = identify(georaster, [-200, 7.42]);
+  eq(values, null);
+});
+
+// modern
+test("(Modern) Identified Point Correctly from file", async ({ eq }) => {
+  const values = await identify(url, point);
+  eq(values, [expectedValue]);
+});
+
+test("(Modern) Try to identify point outside raster and correctly returned null from file", async ({ eq }) => {
+  const values = await identify(url, [-200, 7.42]);
+  eq(values, null);
+});
+
+test("(Modern) Identified Point Correctly from URL", async ({ eq }) => {
+  const values = await identify(url, point);
+  eq(values, [expectedValue]);
+});
+
+test("(Modern) Try to identify point outside raster and correctly returned null from URL", async ({ eq }) => {
+  const values = await identify(url, [-200, 7.42]);
+  eq(values, null);
 });

src/identify/index.js

@@ -1,4 +1,7 @@
-import identify from './identify.module';
+/**
+ * @prettier
+ */
+import identify from "./identify.module";
 
 /**
   Given a raster and a point geometry,