Merge pull request #227 from GeoTIFF/refactor-stats

Refactored stats

lite/band-arithmetic.js

@@ -1 +1 @@
-export { default } from "../src/band-arithmetic";
+export { default } from "../src/band-arithmetic";

lite/cache.js

@@ -1 +1 @@
-export { default } from "../src/cache";
+export { default } from "../src/cache";

lite/get.js

@@ -1 +1 @@
-export { default } from "../src/get";
+export { default } from "../src/get";

lite/histogram.js

@@ -1 +1 @@
-export { default } from "../src/histogram/histogram.core";
+export { default } from "../src/histogram/histogram.core";

lite/identify.js

@@ -1 +1 @@
-export { default } from "../src/identify/identify.core";
+export { default } from "../src/identify/identify.core";

lite/load.js

@@ -1 +1 @@
-export { default } from "../src/load";
+export { default } from "../src/load";

lite/max.js

@@ -1 +1,5 @@
-export { default } from "../src/max/max.core";
+import stat from "./stat";
+
+export default function max(georaster, geometry, test) {
+  return stat(georaster, geometry, "max", test);
+}

lite/mean.js

@@ -1 +1,5 @@
-export { default } from "../src/mean/mean.core";
+import stat from "./stat";
+
+export default function mean(georaster, geometry, test) {
+  return stat(georaster, geometry, "mean", test);
+}

lite/median.js

@@ -1 +1,5 @@
-export { default } from "../src/median/median.core";
+import stat from "./stat";
+
+export default function median(georaster, geometry, test) {
+  return stat(georaster, geometry, "median", test);
+}

lite/min.js

@@ -1 +1,5 @@
-export { default } from "../src/min/min.core";
+import stat from "./stat";
+
+export default function min(georaster, geometry, test) {
+  return stat(georaster, geometry, "min", test);
+}

lite/mode.js

@@ -1 +1,5 @@
-export { default } from "../src/mode/mode.core";
+import stat from "./stat";
+
+export default function mode(georaster, geometry, test) {
+  return stat(georaster, geometry, "mode", test);
+}

lite/modes.js

@@ -1 +1,5 @@
-export { default } from "../src/modes/modes.core";
+import stat from "./stat";
+
+export default function modes(georaster, geometry, test) {
+  return stat(georaster, geometry, "modes", test);
+}

lite/parse.js

@@ -1 +1 @@
-export { default } from "../src/parse";
+export { default } from "../src/parse";

lite/raster-calculator.js

@@ -1 +1 @@
-export { default } from "../src/raster-calculator";
+export { default } from "../src/raster-calculator";

lite/stat.js

@@ -0,0 +1,6 @@
+import QuickPromise from "quick-promise";
+import stats from "./stats";
+
+export default function stat(georaster, geometry, stat, test) {
+  return QuickPromise.resolve(stats(georaster, geometry, { stats: [stat] }, test)).then(stats => stats.map(it => it[stat]));
+}

lite/stats.js

@@ -1 +1 @@
-export { default } from "../src/stats/stats.core";
+export { default } from "../src/stats/stats.core";

lite/sum.js

@@ -1 +1,5 @@
-export { default } from "../src/sum/sum.core";
+import stat from "./stat";
+
+export default function sum(georaster, geometry, test) {
+  return stat(georaster, geometry, "sum", test);
+}

package.json

@@ -26,7 +26,7 @@
     "dev": "webpack --mode development --target node --watch",
     "document": "npx documentation build src/** --config documentation.yml -f html -o docs && echo 'docs.geoblaze.io' > docs/CNAME",
     "fix": "eslint lite --fix && eslint src --fix",
-    "format": "npx prettier --arrow-parens=avoid --print-width=160 --trailing-comma=none --write src/*.js src/*/*.js",
+    "format": "npx prettier --arrow-parens=avoid --print-width=160 --trailing-comma=none --write lite/*.js src/*.js src/*/*.js ",
     "lint": "eslint lite && eslint src",
     "serve": "npx srvd --debug --port=3000 --wait=120",
     "test": "set -e; for f in src/*/*test*.js; do echo \"\nrunning $f\" && sleep 5 && node -r esm $f; done",
@@ -77,7 +77,6 @@
     "proj4": "^2.9.0",
     "proj4-fully-loaded": "^0.2.0",
     "quick-promise": "^0.1.0",
-    "quick-resolve": "^0.0.1",
     "reproject-bbox": "^0.12.0",
     "reproject-geojson": "^0.5.0",
     "snap-bbox": "^0.5.0",

src/histogram/histogram.core.js

@@ -1,15 +1,14 @@
 import _ from "underscore";
 import fastMin from "fast-min";
 import fastMax from "fast-max";
+import QuickPromise from "quick-promise";
 
 import get from "../get";
 import utils from "../utils";
 import wrap from "../wrap-parse";
 import { convertBbox, convertMultiPolygon } from "../convert-geometry";
 import intersectPolygon from "../intersect-polygon";
 
-const { resolve } = utils;
-
 const getEqualIntervalBins = (values, numClasses) => {
   // get min and max values
   const minValue = fastMin(values);
@@ -152,14 +151,14 @@ const getHistogramsForRaster = (georaster, geom, options) => {
     if (geom === null || geom === undefined) {
       const flat = true;
       const values = get(georaster, null, flat);
-      return resolve(values).then(calc);
+      return QuickPromise.resolve(values).then(calc);
     } else if (utils.isBbox(geom)) {
       geom = convertBbox(geom);
 
       // grab array of values by band
       const flat = true;
       const values = get(georaster, geom, flat);
-      return resolve(values).then(calc);
+      return QuickPromise.resolve(values).then(calc);
     } else if (utils.isPolygonal(geom)) {
       geom = convertMultiPolygon(geom);
       const { noDataValue } = georaster;
@@ -174,7 +173,7 @@ const getHistogramsForRaster = (georaster, geom, options) => {
         }
       });
 
-      return resolve(done).then(() => values.map(band => band.filter(value => value !== noDataValue)).map(band => getHistogram(band, options)));
+      return QuickPromise.resolve(done).then(() => values.map(band => band.filter(value => value !== noDataValue)).map(band => getHistogram(band, options)));
     } else {
       throw "Only Bounding Box and Polygon geometries are currently supported.";
     }

src/index.js

@@ -10,8 +10,10 @@ import median from "./median";
 import min from "./min";
 import mode from "./mode";
 import parse from "./parse";
+import range from "./range";
 import rasterCalculator from "./raster-calculator";
 import sum from "./sum";
+import stat from "./stat";
 import stats from "./stats";
 
 const geoblaze = {
@@ -27,9 +29,11 @@ const geoblaze = {
   min,
   mode,
   parse,
+  range,
   rasterCalculator,
-  sum,
-  stats
+  stat,
+  stats,
+  sum
 };
 
 export default geoblaze;

src/max/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The max function takes a georaster and an optional geometry.
  * If a geometry is included, the function returns the max of all the pixels
@@ -15,4 +17,7 @@
  * // maxs is [red, green, blue, nir]
  * [231, 242, 254, 255]
  */
-export { default } from "./max.module";
+
+export default function max(georaster, geometry, test) {
+  return stat(georaster, geometry, "max", test);
+}

src/max/max.test.js

@@ -3,7 +3,7 @@ import test from "flug";
 import reprojectBoundingBox from "reproject-bbox";
 import { serve } from "srvd";
 import load from "../load";
-import max from "./max.core";
+import max from ".";
 
 serve({ debug: true, max: 1, port: 3000 });
 

src/mean/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The mean function takes a georaster and an optional geometry.
  * If a geometry is included, the function returns the mean of all the pixels
@@ -15,4 +17,7 @@
  * // means is [red, green, blue, nir]
  * [42, 84, 92, 94]
  */
-export { default } from "./mean.module";
+
+export default function mean(georaster, geometry, test) {
+  return stat(georaster, geometry, "mean", test);
+}

src/mean/mean.test.js

@@ -2,7 +2,7 @@ import { readFileSync } from "fs";
 import test from "flug";
 import { serve } from "srvd";
 import load from "../load";
-import mean from "./mean.module";
+import mean from ".";
 import utils from "../utils";
 
 serve({ debug: true, max: 2, port: 3000 });

src/median/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The median function takes a raster and an optional geometry.
  * If a geometry is included, the function returns the median of all the pixels
@@ -15,4 +17,7 @@
  * // medians is [red, green, blue, nir]
  * [42, 84, 92, 94]
  */
-export { default } from "./median.module";
+
+export default function median(georaster, geometry, test) {
+  return stat(georaster, geometry, "median", test);
+}

src/median/median.test.js

@@ -2,7 +2,7 @@ import { readFileSync } from "fs";
 import test from "flug";
 import { serve } from "srvd";
 import load from "../load";
-import median from "./median.module";
+import median from ".";
 
 serve({ debug: true, max: 1, port: 3000 });
 

src/min/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The min function takes a georaster as an input and an optional geometry.
  * If a geometry is included, the function returns the min of all the pixels
@@ -15,4 +17,7 @@
  * // mins is [red, green, blue, nir]
  * [1, 4, 9, 4]
  */
-export { default } from "./min.module";
+
+export default function min(georaster, geometry, test) {
+  return stat(georaster, geometry, "min", test);
+}

src/min/min.test.js

@@ -1,7 +1,7 @@
 import test from "flug";
 import { serve } from "srvd";
 import load from "../load";
-import min from "./min.module";
+import min from ".";
 
 serve({ debug: true, max: 1, port: 3000 });
 

src/mode/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The mode function takes a georaster and an optional geometry.
  * If a geometry is included, the function returns the mode of all the pixels
@@ -16,4 +18,7 @@
  * // results is [red, green, blue, nir]
  * [42, 84, 92, 94]
  */
-export { default } from "./mode.module";
+
+export default function mode(georaster, geometry, test) {
+  return stat(georaster, geometry, "mode", test);
+}

src/mode/mode.test.js

@@ -2,7 +2,7 @@ import { readFileSync } from "fs";
 import test from "flug";
 import { serve } from "srvd";
 import load from "../load";
-import mode from "./mode.module";
+import mode from ".";
 
 serve({ debug: true, max: 1, port: 3000 });
 

src/modes/index.js

@@ -1,3 +1,5 @@
+import stat from "../stat";
+
 /**
  * The modes function takes a georaster and an optional geometry.
  * If a geometry is included, the function returns the modes of all the pixels
@@ -17,4 +19,6 @@
  * [[ 42, 43] , [83, 82, 84], [92], [94]]
  */
 
-export { default } from "./modes.module";
+export default function modes(georaster, geometry, test) {
+  return stat(georaster, geometry, "modes", test);
+}