autumnplot-gl 2.2.3 → 3.1.0

package/lib/cpp/marchingsquares_embind.d.ts

@@ -0,0 +1,6 @@
+export interface MainModule {
+  makeContoursFloat32(_0: any, _1: any, _2: any, _3: any, _4: any): any;
+  makeContoursFloat16(_0: any, _1: any, _2: any, _3: any, _4: any): any;
+  getContourLevelsFloat32(_0: any, _1: number, _2: number, _3: number): any;
+  getContourLevelsFloat16(_0: any, _1: number, _2: number, _3: number): any;
+}

package/lib/index.d.ts

@@ -1,15 +1,17 @@
 import { PlotComponent } from "./PlotComponent";
-import Contour, { ContourOptions } from "./Contour";
+import Contour, { ContourOptions, ContourLabels, ContourLabelOptions } from "./Contour";
 import { ContourFill, Raster, ContourFillOptions, RasterOptions } from "./Fill";
 import Barbs, { BarbsOptions } from "./Barbs";
 import Paintball, { PaintballOptions } from "./Paintball";
 import Hodographs, { HodographOptions } from './Hodographs';
 import { PlotLayer, MultiPlotLayer } from './PlotLayer';
-import { WindProfile, WebGLAnyRenderingContext, TypedArray } from "./AutumnTypes";
-import { MapType } from "./Map";
-import { ColorMap, Color } from './Colormap';
+import { WindProfile, WebGLAnyRenderingContext, TypedArray, ContourData } from "./AutumnTypes";
+import { MapLikeType } from "./Map";
+import { ColorMap, ColorMapOptions, Color } from './Colormap';
 import { makeColorBar, makePaintballKey, ColorbarOrientation, ColorbarTickDirection, ColorBarOptions, PaintballKeyOptions } from "./ColorBar";
-import { RawScalarField, RawVectorField, RawProfileField, Grid, GridType, VectorRelativeTo, RawVectorFieldOptions, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from "./RawField";
+import { RawScalarField, RawVectorField, RawProfileField, VectorRelativeTo, RawVectorFieldOptions } from "./RawField";
+import { Grid, GridType, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from './Grid';
+import { FieldContourOpts } from './ContourCreator';
 declare const colormaps: {
     bluered: (level_min: number, level_max: number, n_colors: number) => ColorMap;
     redblue: (level_min: number, level_max: number, n_colors: number) => ColorMap;
@@ -20,4 +22,9 @@ declare const colormaps: {
     pw_td2m: ColorMap;
     nws_storm_clear_refl: ColorMap;
 };
-export { PlotComponent, Barbs, BarbsOptions, Contour, ContourOptions, ContourFill, Raster, ContourFillOptions, RasterOptions, Paintball, PaintballOptions, Hodographs, HodographOptions, WindProfile, PlotLayer, MultiPlotLayer, MapType, ColorMap, colormaps, makeColorBar, makePaintballKey, Color, ColorbarOrientation, ColorbarTickDirection, ColorBarOptions, PaintballKeyOptions, RawScalarField, RawVectorField, RawProfileField, Grid, GridType, VectorRelativeTo, RawVectorFieldOptions, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, WebGLAnyRenderingContext, TypedArray };
+/**
+ * Initialize the WebAssembly module in autumnplot-gl. It's not strictly necessary to call it first, but if you call it
+ * first, you can prevent races when you contour a bunch of fields at once.
+ */
+declare function initAutumnPlot(): void;
+export { PlotComponent, Barbs, BarbsOptions, Contour, ContourOptions, ContourLabels, ContourLabelOptions, ContourFill, Raster, ContourFillOptions, RasterOptions, Paintball, PaintballOptions, Hodographs, HodographOptions, WindProfile, PlotLayer, MultiPlotLayer, MapLikeType, ColorMap, ColorMapOptions, colormaps, makeColorBar, makePaintballKey, Color, ColorbarOrientation, ColorbarTickDirection, ColorBarOptions, PaintballKeyOptions, RawScalarField, RawVectorField, RawProfileField, Grid, GridType, VectorRelativeTo, RawVectorFieldOptions, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, WebGLAnyRenderingContext, TypedArray, ContourData, initAutumnPlot, FieldContourOpts };

package/lib/index.js

@@ -1,5 +1,5 @@
 import { PlotComponent } from "./PlotComponent";
-import Contour from "./Contour";
+import Contour, { ContourLabels } from "./Contour";
 import { ContourFill, Raster } from "./Fill";
 import Barbs from "./Barbs";
 import Paintball from "./Paintball";
@@ -7,7 +7,9 @@ import Hodographs from './Hodographs';
 import { PlotLayer, MultiPlotLayer } from './PlotLayer';
 import { ColorMap, bluered, redblue, pw_speed500mb, pw_speed850mb, pw_cape, pw_t2m, pw_td2m, nws_storm_clear_refl } from './Colormap';
 import { makeColorBar, makePaintballKey } from "./ColorBar";
-import { RawScalarField, RawVectorField, RawProfileField, Grid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from "./RawField";
+import { RawScalarField, RawVectorField, RawProfileField } from "./RawField";
+import { Grid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from './Grid';
+import { initMSModule } from './ContourCreator';
 const colormaps = {
     bluered: bluered,
     redblue: redblue,
@@ -18,4 +20,11 @@ const colormaps = {
     pw_td2m: pw_td2m,
     nws_storm_clear_refl: nws_storm_clear_refl,
 };
-export { PlotComponent, Barbs, Contour, ContourFill, Raster, Paintball, Hodographs, PlotLayer, MultiPlotLayer, ColorMap, colormaps, makeColorBar, makePaintballKey, RawScalarField, RawVectorField, RawProfileField, Grid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid };
+/**
+ * Initialize the WebAssembly module in autumnplot-gl. It's not strictly necessary to call it first, but if you call it
+ * first, you can prevent races when you contour a bunch of fields at once.
+ */
+function initAutumnPlot() {
+    initMSModule();
+}
+export { PlotComponent, Barbs, Contour, ContourLabels, ContourFill, Raster, Paintball, Hodographs, PlotLayer, MultiPlotLayer, ColorMap, colormaps, makeColorBar, makePaintballKey, RawScalarField, RawVectorField, RawProfileField, Grid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, initAutumnPlot };

package/lib/utils.d.ts

@@ -8,9 +8,11 @@ declare function getMinZoom(jlat: number, ilon: number, thin_fac_base: number):
 declare function zip(...args: any[]): Generator<any[], void, unknown>;
 declare function getOS(): string;
 declare class Cache<A extends unknown[], R> {
-    private cached_value;
+    private cached_values;
     private readonly compute_value;
-    constructor(compute_value: (...args: A) => R);
+    private readonly make_key;
+    constructor(compute_value: (...args: A) => R, make_key?: (...args: A) => string);
     getValue(...args: A): R;
 }
-export { hex2rgba, rgba2hex, hex2rgb, rgb2hex, rgb2hsv, hsv2rgb, zip, getMinZoom, getOS, Cache };
+declare function normalizeOptions<Type extends Record<string, any>>(opts: Type | undefined, defaults: Required<Type>): Required<Type>;
+export { hex2rgba, rgba2hex, hex2rgb, rgb2hex, rgb2hsv, hsv2rgb, zip, getMinZoom, getOS, Cache, normalizeOptions };

package/lib/utils.js

@@ -121,15 +121,26 @@ function getOS() {
     return os;
 }
 class Cache {
-    constructor(compute_value) {
-        this.cached_value = null;
+    constructor(compute_value, make_key) {
+        this.cached_values = {};
         this.compute_value = compute_value;
+        this.make_key = make_key === undefined ? (...args) => JSON.stringify(args) : make_key;
     }
     getValue(...args) {
-        if (this.cached_value === null) {
-            this.cached_value = this.compute_value(...args);
+        const key = this.make_key(...args);
+        if (!(key in this.cached_values)) {
+            this.cached_values[key] = this.compute_value(...args);
         }
-        return this.cached_value;
+        return this.cached_values[key];
     }
 }
-export { hex2rgba, rgba2hex, hex2rgb, rgb2hex, rgb2hsv, hsv2rgb, zip, getMinZoom, getOS, Cache };
+function normalizeOptions(opts, defaults) {
+    const ret = { ...defaults };
+    if (opts !== undefined) {
+        Object.entries(opts).forEach(([k, v]) => {
+            ret[k] = v;
+        });
+    }
+    return ret;
+}
+export { hex2rgba, rgba2hex, hex2rgb, rgb2hex, rgb2hsv, hsv2rgb, zip, getMinZoom, getOS, Cache, normalizeOptions };

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "autumnplot-gl",
-    "version": "2.2.3",
+    "version": "3.1.0",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
-        "lib/**/*"
+        "lib/**/*",
+        "dist/*"
     ],
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -18,13 +19,14 @@
     "author": "Tim Supinie",
     "license": "MIT",
     "devDependencies": {
+        "@types/emscripten": "^1.39.10",
+        "@types/kd-tree-javascript": "^1.0.3",
         "@types/luxon": "^3.2.0",
-        "@types/mapbox-gl": "^2.7.10",
-        "@types/maplibre-gl": "^1.14.0",
+        "@types/pbf": "^3.0.5",
         "ts-loader": "^9.4.2",
-        "typedoc": "^0.23.24",
-        "typedoc-plugin-markdown": "^3.14.0",
-        "typescript": "^4.9.4",
+        "typedoc": "^0.25.13",
+        "typedoc-plugin-markdown": "^4.0.2",
+        "typescript": "^5.4.5",
         "webpack": "^5.75.0",
         "webpack-cli": "^5.0.1",
         "webpack-dev-server": "^4.11.1",
@@ -32,7 +34,10 @@
     },
     "dependencies": {
         "@petamoriken/float16": "^3.8.4",
-        "autumn-wgl": "^1.2.0",
-        "comlink": "^4.3.1"
+        "autumn-wgl": "^1.4.0",
+        "comlink": "^4.3.1",
+        "kd-tree-javascript": "^1.0.3",
+        "pbf": "^3.2.1",
+        "potpack": "^2.0.0"
     }
 }