autumnplot-gl 3.1.0 → 4.0.0-beta

package/lib/cpp/marchingsquares_embind.d.ts

@@ -1,6 +1,26 @@
-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;
+// TypeScript bindings for emscripten-generated code.  Automatically generated at compile time.
+declare namespace RuntimeExports {
+    let HEAPF32: any;
+    let HEAPF64: any;
+    let HEAP_DATA_VIEW: any;
+    let HEAP8: any;
+    let HEAPU8: any;
+    let HEAP16: any;
+    let HEAPU16: any;
+    let HEAP32: any;
+    let HEAPU32: any;
+    let HEAP64: any;
+    let HEAPU64: any;
+}
+interface WasmModule {
+}
+
+interface EmbindModule {
+  makeContoursFloat32(_0: any, _1: any, _2: any, _3: any, _4: any, _5: any): any;
+  makeContoursFloat16(_0: any, _1: any, _2: any, _3: any, _4: any, _5: any): any;
   getContourLevelsFloat32(_0: any, _1: number, _2: number, _3: number): any;
   getContourLevelsFloat16(_0: any, _1: number, _2: number, _3: number): any;
 }
+
+export type MainModule = WasmModule & typeof RuntimeExports & EmbindModule;
+export default function MainModuleFactory (options?: unknown): Promise<MainModule>;

package/lib/index.d.ts

@@ -4,13 +4,16 @@ import { ContourFill, Raster, ContourFillOptions, RasterOptions } from "./Fill";
 import Barbs, { BarbsOptions } from "./Barbs";
 import Paintball, { PaintballOptions } from "./Paintball";
 import Hodographs, { HodographOptions } from './Hodographs';
+import StationPlot, { StationPlotOptions, SPPosition, SPNumberConfig, SPStringConfig, SPBarbConfig, SPSymbolConfig, SPConfig, SPDataConfig, SPSymbol } from "./StationPlot";
 import { PlotLayer, MultiPlotLayer } from './PlotLayer';
 import { WindProfile, WebGLAnyRenderingContext, TypedArray, ContourData } from "./AutumnTypes";
 import { MapLikeType } from "./Map";
-import { ColorMap, ColorMapOptions, Color } from './Colormap';
+import { ColorMap, ColorMapOptions } from './Colormap';
+import { Color } from "./Color";
 import { makeColorBar, makePaintballKey, ColorbarOrientation, ColorbarTickDirection, ColorBarOptions, PaintballKeyOptions } from "./ColorBar";
-import { RawScalarField, RawVectorField, RawProfileField, VectorRelativeTo, RawVectorFieldOptions } from "./RawField";
-import { Grid, GridType, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from './Grid';
+import { LineStyle } from "./PolylineCollection";
+import { RawScalarField, RawVectorField, RawProfileField, VectorRelativeTo, RawVectorFieldOptions, RawObsField, ObsRawData } from "./RawField";
+import { Grid, GridType, StructuredGrid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, UnstructuredGrid } from './Grid';
 import { FieldContourOpts } from './ContourCreator';
 declare const colormaps: {
     bluered: (level_min: number, level_max: number, n_colors: number) => ColorMap;
@@ -27,4 +30,4 @@ declare const colormaps: {
  * 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 };
+export { PlotComponent, Barbs, BarbsOptions, Contour, ContourOptions, ContourLabels, ContourLabelOptions, ContourFill, Raster, ContourFillOptions, RasterOptions, Paintball, PaintballOptions, Hodographs, HodographOptions, WindProfile, StationPlot, StationPlotOptions, SPPosition, SPNumberConfig, SPStringConfig, SPBarbConfig, SPSymbolConfig, SPConfig, SPDataConfig, SPSymbol, PlotLayer, MultiPlotLayer, MapLikeType, LineStyle, ColorMap, ColorMapOptions, colormaps, makeColorBar, makePaintballKey, Color, ColorbarOrientation, ColorbarTickDirection, ColorBarOptions, PaintballKeyOptions, RawScalarField, RawVectorField, RawProfileField, RawObsField, ObsRawData, Grid, GridType, StructuredGrid, VectorRelativeTo, RawVectorFieldOptions, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, UnstructuredGrid, WebGLAnyRenderingContext, TypedArray, ContourData, initAutumnPlot, FieldContourOpts };

package/lib/index.js

@@ -4,11 +4,13 @@ import { ContourFill, Raster } from "./Fill";
 import Barbs from "./Barbs";
 import Paintball from "./Paintball";
 import Hodographs from './Hodographs';
+import StationPlot from "./StationPlot";
 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 { Color } from "./Color";
 import { makeColorBar, makePaintballKey } from "./ColorBar";
-import { RawScalarField, RawVectorField, RawProfileField } from "./RawField";
-import { Grid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid } from './Grid';
+import { RawScalarField, RawVectorField, RawProfileField, RawObsField } from "./RawField";
+import { Grid, StructuredGrid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, UnstructuredGrid } from './Grid';
 import { initMSModule } from './ContourCreator';
 const colormaps = {
     bluered: bluered,
@@ -27,4 +29,4 @@ const colormaps = {
 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 };
+export { PlotComponent, Barbs, Contour, ContourLabels, ContourFill, Raster, Paintball, Hodographs, StationPlot, PlotLayer, MultiPlotLayer, ColorMap, colormaps, makeColorBar, makePaintballKey, Color, RawScalarField, RawVectorField, RawProfileField, RawObsField, Grid, StructuredGrid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, UnstructuredGrid, initAutumnPlot };

package/lib/utils.d.ts

@@ -1,12 +1,7 @@
-declare const hex2rgba: (hexstr: string, out_type?: string) => [number, number, number, number];
-declare const rgba2hex: (rgba: [number, number, number, number], in_type?: string) => string;
-declare const hex2rgb: (hexstr: string, out_type?: string) => [number, number, number];
-declare const rgb2hex: (rgb: [number, number, number], in_type?: string) => string;
-declare const rgb2hsv: (rgb: [number, number, number]) => [number, number, number];
-declare const hsv2rgb: (hsv: [number, number, number]) => [number, number, number];
+import { TypedArray } from "./AutumnTypes";
 declare function getMinZoom(jlat: number, ilon: number, thin_fac_base: number): number;
 declare function zip(...args: any[]): Generator<any[], void, unknown>;
-declare function getOS(): string;
+declare function getOS(): string | null;
 declare class Cache<A extends unknown[], R> {
     private cached_values;
     private readonly compute_value;
@@ -15,4 +10,6 @@ declare class Cache<A extends unknown[], R> {
     getValue(...args: A): R;
 }
 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 };
+declare function getArrayConstructor<ArrayType extends TypedArray>(ary: ArrayType): new (...args: any[]) => ArrayType;
+declare function mergeShaderCode(snippet: string, main: string): string;
+export { zip, getMinZoom, getOS, Cache, normalizeOptions, getArrayConstructor, mergeShaderCode };

package/lib/utils.js

@@ -1,85 +1,3 @@
-const hex2rgba = (hexstr, out_type) => {
-    out_type = out_type === undefined ? 'float' : out_type;
-    const match = hexstr.match(/#([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?/i);
-    if (match === null) {
-        throw `Got '${hexstr}' in hex2rgba, which does not look like a hex color`;
-    }
-    let rgba = match.slice(1).filter(c => c !== undefined).map(c => parseInt(c, 16));
-    if (out_type == 'float') {
-        rgba = rgba.map(c => c / 255);
-    }
-    return rgba[3] === undefined ? [rgba[0], rgba[1], rgba[2], 1] : [rgba[0], rgba[1], rgba[2], rgba[3]];
-};
-const rgba2hex = (rgba, in_type) => {
-    in_type = in_type === undefined ? 'float' : in_type;
-    let rgba_ = rgba;
-    if (in_type == 'float') {
-        rgba_ = rgba_.map(c => Math.round(c * 255));
-    }
-    return '#' + rgba_.map(c => c.toString(16).padStart(2, '0').toUpperCase()).join('');
-};
-const hex2rgb = (hexstr, out_type) => {
-    const [r, g, b, a] = hex2rgba(hexstr, out_type);
-    return [r, g, b];
-};
-const rgb2hex = (rgb, in_type) => {
-    const [r, g, b] = rgb;
-    return rgba2hex([r, g, b, 0], in_type).slice(0, -2);
-};
-const rgb2hsv = (rgb) => {
-    const [r, g, b] = rgb;
-    const Cmax = Math.max(r, g, b);
-    const Cmin = Math.min(r, g, b);
-    const Delta = Cmax - Cmin;
-    let H;
-    if (Delta == 0) {
-        H = 0;
-    }
-    else if (Cmax == r) {
-        H = 60 * ((g - b) / Delta) % 6;
-    }
-    else if (Cmax == g) {
-        H = 60 * ((b - r) / Delta + 2);
-    }
-    else if (Cmax == b) {
-        H = 60 * ((r - g) / Delta + 4);
-    }
-    let S = Cmax == 0 ? 0 : Delta / Cmax;
-    let V = Cmax;
-    return [H, S, V];
-};
-const hsv2rgb = (hsv) => {
-    const [H, S, V] = hsv;
-    const C = V * S;
-    const X = C * (1 - Math.abs(H / 60 % 2 - 1));
-    const m = V - C;
-    let r_prime, g_prime, b_prime;
-    if (0 <= H && H < 60) {
-        r_prime = C;
-        g_prime = X, b_prime = 0;
-    }
-    else if (60 <= H && H < 120) {
-        r_prime = X;
-        g_prime = C, b_prime = 0;
-    }
-    else if (120 <= H && H < 180) {
-        r_prime = 0;
-        g_prime = C, b_prime = X;
-    }
-    else if (180 <= H && H < 240) {
-        r_prime = 0;
-        g_prime = X, b_prime = C;
-    }
-    else if (240 <= H && H < 300) {
-        r_prime = X;
-        g_prime = 0, b_prime = C;
-    }
-    else if (300 <= H && H < 360) {
-        r_prime = C;
-        g_prime = 0, b_prime = X;
-    }
-    return [r_prime + m, g_prime + m, b_prime + m];
-};
 function getMinZoom(jlat, ilon, thin_fac_base) {
     const zoom_base = 1;
     let zoom = zoom_base;
@@ -143,4 +61,15 @@ function normalizeOptions(opts, defaults) {
     }
     return ret;
 }
-export { hex2rgba, rgba2hex, hex2rgb, rgb2hex, rgb2hsv, hsv2rgb, zip, getMinZoom, getOS, Cache, normalizeOptions };
+function getArrayConstructor(ary) {
+    return ary.constructor;
+}
+function mergeShaderCode(snippet, main) {
+    const ES3_SHADER_MAGIC = '#version 300 es\n';
+    const is_es3_shader = main.startsWith(ES3_SHADER_MAGIC);
+    if (is_es3_shader) {
+        return ES3_SHADER_MAGIC + snippet + "\n" + main.slice(ES3_SHADER_MAGIC.length);
+    }
+    return snippet + "\n" + main;
+}
+export { zip, getMinZoom, getOS, Cache, normalizeOptions, getArrayConstructor, mergeShaderCode };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "autumnplot-gl",
-    "version": "3.1.0",
+    "version": "4.0.0-beta",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -34,7 +34,7 @@
     },
     "dependencies": {
         "@petamoriken/float16": "^3.8.4",
-        "autumn-wgl": "^1.4.0",
+        "autumn-wgl": "^1.5.3",
         "comlink": "^4.3.1",
         "kd-tree-javascript": "^1.0.3",
         "pbf": "^3.2.1",