autumnplot-gl 4.0.0-beta → 4.0.0

package/lib/Map.js

@@ -9,8 +9,8 @@ function lambertConformalConic(params) {
         return Math.cos(lat) / Math.sqrt(1 - eccen * eccen * sin_lat * sin_lat);
     };
     // WGS 84 spheroid
-    const semimajor = 6378137.0;
-    const semiminor = 6356752.314245;
+    const semimajor = params.a;
+    const semiminor = params.b;
     const eccen = Math.sqrt(1 - (semiminor * semiminor) / (semimajor * semimajor));
     const radians = Math.PI / 180;
     let { lon_0, lat_0, lat_std } = params;
@@ -121,6 +121,62 @@ function rotateSphere(params) {
         return opts.inverse ? compute_rotation_inverse(a, b) : compute_rotation(a, b);
     };
 }
+function verticalPerspective(params) {
+    // WGS 84 spheroid
+    const semimajor = params.a;
+    const semiminor = params.b;
+    const eccen = Math.sqrt(1 - (semiminor * semiminor) / (semimajor * semimajor));
+    const radians = Math.PI / 180;
+    let { lat_0, lon_0, alt } = params;
+    const alt_0 = 0;
+    const alt_00 = 0;
+    const eccen2 = eccen * eccen;
+    lat_0 *= radians;
+    lon_0 *= radians;
+    const sin_lat_0 = Math.sin(lat_0);
+    const cos_lat_0 = Math.cos(lat_0);
+    const N1 = semimajor / Math.sqrt(1 - (eccen * sin_lat_0) ** 2);
+    let lat_g = lat_0, P = 0;
+    for (let i = 0; i < 2; i++) {
+        P = Math.cos(lat_0) / Math.cos(lat_g) * (alt + N1 + alt_00) / semimajor;
+        lat_g = lat_0 - Math.asin(N1 * eccen * eccen * sin_lat_0 * cos_lat_0 / (P * semimajor));
+    }
+    const compute_perspective = (lon, lat) => {
+        lon *= radians;
+        lat *= radians;
+        const sin_lat = Math.sin(lat);
+        const cos_lat = Math.cos(lat);
+        const N = semimajor / Math.sqrt(1 - (eccen * sin_lat) ** 2);
+        const C = (N + alt_0) / semimajor * cos_lat;
+        const S = ((N * (1 - eccen * eccen) + alt_0) / semimajor) * sin_lat;
+        const K = alt / (P * Math.cos(lat_0 - lat_g) - S * sin_lat_0 - C * cos_lat_0 * Math.cos(lon - lon_0));
+        const x = K * C * Math.sin(lon - lon_0);
+        const y = K * (P * Math.sin(lat_0 - lat_g) + S * cos_lat_0 - C * sin_lat_0 * Math.cos(lon - lon_0));
+        return [x, y];
+    };
+    const B = P * Math.cos(lat_0 - lat_g);
+    const D = P * Math.sin(lat_0 - lat_g);
+    const L = 1 - eccen2 * cos_lat_0 * cos_lat_0;
+    const G = 1 - eccen2 * sin_lat_0 * sin_lat_0;
+    const J = 2 * eccen2 * sin_lat_0 * cos_lat_0;
+    const E = 1; // If alt_0 = 0, set E = 1
+    const t = P * P * (1 - (eccen * Math.cos(lat_g)) ** 2) - E * (1 - eccen2);
+    const compute_perspective_inverse = (x, y) => {
+        const u = -2 * B * L * alt - 2 * D * G * y + B * J * y + D * J * alt;
+        const v = L * alt * alt + G * y * y - alt * J * y + (1 - eccen2) * x * x;
+        const K_prime = (-u + Math.sqrt(u * u - 4 * t * v)) / (2 * t);
+        const X = semimajor * ((B - alt / K_prime) * cos_lat_0 - (y / K_prime - D) * sin_lat_0);
+        const Y = semimajor * x / K_prime;
+        const S = (y / K_prime - D) * cos_lat_0 + (B - alt / K_prime) * sin_lat_0;
+        const lon = lon_0 + Math.atan2(Y, X);
+        const lat = Math.atan2(S, Math.sqrt((1 - eccen2) * (1 - eccen2 - S * S)));
+        return [lon / radians, lat / radians];
+    };
+    return (a, b, opts) => {
+        opts = opts === undefined ? { inverse: false } : opts;
+        return opts.inverse ? compute_perspective_inverse(a, b) : compute_perspective(a, b);
+    };
+}
 function mercatorXfromLng(lng) {
     return (180 + lng) / 360;
 }
@@ -166,4 +222,4 @@ class LngLat {
         return new LngLat(lngFromMercatorX(x), latFromMercatorY(y));
     }
 }
-export { LngLat, lambertConformalConic, rotateSphere };
+export { LngLat, lambertConformalConic, rotateSphere, verticalPerspective };

package/lib/Paintball.d.ts

@@ -3,6 +3,7 @@ import { StructuredGrid } from "./Grid";
 import { MapLikeType } from "./Map";
 import { PlotComponent } from "./PlotComponent";
 import { RawScalarField } from "./RawField";
+/** Options for {@link Paintball} components */
 interface PaintballOptions {
     /**
      * The list of colors (as hex strings) to use for each member in the paintball plot. The first color corresponds to member 1, the second to member 2, etc.

package/lib/Paintball.js

@@ -76,7 +76,7 @@ class Paintball extends PlotComponent {
         super();
         this.field = field;
         this.opts = normalizeOptions(opts, paintball_opt_defaults);
-        this.color_components = [...this.opts.colors].reverse().map(color => Color.fromHex(color).toRGBATuple()).flat();
+        this.color_components = this.opts.colors.map(color => Color.fromHex(color).toRGBATuple()).flat();
         this.gl_elems = null;
         this.fill_texture = null;
     }

package/lib/PlotComponent.d.ts

@@ -12,6 +12,7 @@ declare const layer_worker: Comlink.Remote<{
     };
     makePolyLines: (lines: import("./AutumnTypes").LineData[]) => import("./AutumnTypes").Polyline;
 }>;
+/** Base class for all plot components */
 declare abstract class PlotComponent<MapType extends MapLikeType> {
     abstract onAdd(map: MapType, gl: WebGLAnyRenderingContext): Promise<void>;
     abstract render(gl: WebGLAnyRenderingContext, arg: RenderMethodArg): void;

package/lib/PlotComponent.js

@@ -3,6 +3,7 @@ import { getOS } from "./utils";
 import { isWebGL2Ctx } from './AutumnTypes';
 const worker = new Worker(new URL('./PlotLayer.worker', import.meta.url));
 const layer_worker = Comlink.wrap(worker);
+/** Base class for all plot components */
 class PlotComponent {
 }
 function getGLFormatTypeAlignment(gl, array_dtype) {

package/lib/PlotLayer.d.ts

@@ -11,7 +11,7 @@ declare abstract class PlotLayerBase<MapType extends MapLikeType> {
     protected repaint(): void;
 }
 /**
- * A static map layer. The data are assumed to be static in time. If the data have a time component (e.g., a model forecast), an {@link MultiPlotLayer}
+ * A static map layer. The data are assumed to be static in time. If the data have a time component (e.g., a model forecast), a {@link MultiPlotLayer}
  * may be more appropriate.
  * @example
  * // Create map layers from provided fields
@@ -39,7 +39,7 @@ declare class PlotLayer<MapType extends MapLikeType> extends PlotLayerBase<MapTy
     render(gl: WebGLAnyRenderingContext, matrix: RenderMethodArg): void;
 }
 /**
- * A varying map layer. If the data don't have a varying component, such as over time, it might be easier to use an {@link PlotLayer} instead.
+ * A varying map layer. If the data don't have a varying component, such as over time, it might be easier to use a {@link PlotLayer} instead.
  * @example
  * // Create a varying map layer
  * height_layer = new MultiPlotLayer('height-contours');

package/lib/PlotLayer.js

@@ -11,7 +11,7 @@ class PlotLayerBase {
     }
 }
 /**
- * A static map layer. The data are assumed to be static in time. If the data have a time component (e.g., a model forecast), an {@link MultiPlotLayer}
+ * A static map layer. The data are assumed to be static in time. If the data have a time component (e.g., a model forecast), a {@link MultiPlotLayer}
  * may be more appropriate.
  * @example
  * // Create map layers from provided fields
@@ -46,7 +46,7 @@ class PlotLayer extends PlotLayerBase {
     }
 }
 /**
- * A varying map layer. If the data don't have a varying component, such as over time, it might be easier to use an {@link PlotLayer} instead.
+ * A varying map layer. If the data don't have a varying component, such as over time, it might be easier to use a {@link PlotLayer} instead.
  * @example
  * // Create a varying map layer
  * height_layer = new MultiPlotLayer('height-contours');

package/lib/PlotLayer.worker.js

@@ -21,7 +21,10 @@ function makeBBElements(field_lats, field_lons, min_zoom, field_ni, field_nj, ma
             const pt_ll = new LngLat(lon, lat).toMercatorCoord();
             pts[istart_pts + 0] = pt_ll.x;
             pts[istart_pts + 1] = pt_ll.y;
-            tex_coords[istart_tc + 0] = ilon / (field_ni - 1) + zoom; // Pack the min zoom in with the texture coordinates; only works because the min zoom is always an integer
+            // Pack the min zoom in with the texture coordinates; only works because the min zoom is always an integer
+            // Another gotcha is that if the i texcoord is 1, then that bump up the zoom that gets unpacked on the GPU, which causes may cause the last column of billboards to
+            //  disappear. To fix this, cap the texcoord at 0.99999, which should be good for textures up to 10^5 pixels in size.
+            tex_coords[istart_tc + 0] = Math.min(ilon / (field_ni - 1), 0.99999) + zoom;
             tex_coords[istart_tc + 1] = ilat / (field_nj - 1);
             istart_pts += n_coords_per_pt_pts;
             istart_tc += n_coords_per_pt_tc;
@@ -204,7 +207,7 @@ function makePolylinesMiter(lines) {
 }
 */
 function makePolylines(lines) {
-    if (lines.length == 0) {
+    if (lines.length == 0 || lines[0].vertices.length == 0) {
         return { vertices: new Float32Array([]), extrusion: new Float32Array([]) };
     }
     const n_points_per_vert = Object.fromEntries(Object.entries(lines[0]).map(([k, v]) => {
@@ -252,6 +255,9 @@ function makePolylines(lines) {
             const v_ll = new LngLat(...v).toMercatorCoord();
             return [v_ll.x, v_ll.y];
         });
+        if (line.vertices.length == 0) {
+            return;
+        }
         const has_offsets = line.offsets !== undefined;
         const extrusion_verts = line.offsets !== undefined ? line.offsets : verts;
         let pt_prev, pt_this = verts[0], pt_next = verts[1];

package/lib/RawField.d.ts

@@ -36,7 +36,9 @@ declare class RawScalarField<ArrayType extends TypedArray, GridType extends Grid
     static aggregateFields<ArrayType extends TypedArray, GridType extends Grid>(func: (...args: number[]) => number, ...args: RawScalarField<ArrayType, GridType>[]): RawScalarField<ArrayType, GridType>;
     sampleField(lon: number, lat: number): number;
 }
+/** The basis vectors for vector fields (i.e, whether vectors a relative to Earth or the grid) */
 type VectorRelativeTo = 'earth' | 'grid';
+/** Options for {@link RawVectorField}s */
 interface RawVectorFieldOptions {
     /**
      * Whether the vectors are relative to the grid ('grid') or Earth ('earth')

package/lib/RawField.js

@@ -1,4 +1,5 @@
 import { Float16Array } from "@petamoriken/float16";
+import { isStormRelativeWindProfile } from "./AutumnTypes";
 import { contourCreator } from "./ContourCreator";
 import { Cache, getArrayConstructor, zip } from "./utils";
 import { getGLFormatTypeAlignment } from "./PlotComponent";
@@ -160,8 +161,14 @@ class RawProfileField {
         const v = new Float16Array(this.grid.ni * this.grid.nj).fill(parseFloat('nan'));
         profiles.forEach(prof => {
             const idx = prof.ilon + this.grid.ni * prof.jlat;
-            u[idx] = prof.smu;
-            v[idx] = prof.smv;
+            if (isStormRelativeWindProfile(prof)) {
+                u[idx] = prof.smu;
+                v[idx] = prof.smv;
+            }
+            else {
+                u[idx] = 0;
+                v[idx] = 0;
+            }
         });
         return new RawVectorField(this.grid, u, v, { relative_to: 'grid' });
     }

package/lib/StationPlot.d.ts

@@ -19,6 +19,7 @@ import { RawObsField } from "./RawField";
  *  | `'c'`   | center       |
  */
 type SPPosition = 'cl' | 'll' | 'lc' | 'lr' | 'cr' | 'ur' | 'uc' | 'ul' | 'c';
+/** Configuration for numerical values on station plots */
 interface SPNumberConfig {
     type: 'number';
     /**
@@ -30,6 +31,16 @@ interface SPNumberConfig {
      * @default '#000000'
      */
     color?: string;
+    /**
+     * Whether to draw a halo (outline) around the number
+     * @default true;
+     */
+    halo?: boolean;
+    /**
+     * The color to use for the halo (outline)
+     * @default '#ffffff'
+     */
+    halo_color?: string;
     /**
      * A function that properly formats the number for display
      * @example (val) => val === null ? '' : val.toFixed(0)
@@ -38,22 +49,34 @@ interface SPNumberConfig {
      */
     formatter?: (val: number | null) => string;
 }
+/** Configuration for strings on station plots */
 interface SPStringConfig {
     type: 'string';
     /**
-     * The position on the station plot at which to place the number
+     * The position on the station plot at which to place the string
      */
     pos: SPPosition;
     /**
-     * The color to use to draw the number
+     * The color to use to draw the string
      * @default '#000000'
      */
     color?: string;
+    /**
+     * Whether to draw a halo (outline) around the string
+     * @default true;
+     */
+    halo?: boolean;
+    /**
+     * The color to use for the halo (outline)
+     * @default '#ffffff'
+     */
+    halo_color?: string;
 }
+/** Configuration for wind barbs on station plots */
 interface SPBarbConfig {
     type: 'barb';
     /**
-     * The color to use to draw the number
+     * The color to use to draw the barb
      * @default '#000000'
      */
     color?: string;
@@ -67,18 +90,30 @@ interface SPBarbConfig {
  * Accepted symbol codes for sky cover and present weather symbols
  */
 type SPSymbol = ('0/8' | '1/8' | '2/8' | '3/8' | '4/8' | '5/8' | '6/8' | '7/8' | '8/8' | 'clr' | 'few' | 'sct' | 'bkn' | 'ovc' | 'obsc' | 'va' | 'fu' | 'hz' | 'du' | 'bldu' | 'sa' | 'blsa' | 'vcblsa' | 'vcbldu' | 'blpy' | 'po' | 'vcpo' | 'vcds' | 'vcss' | 'br' | 'bcbr' | 'bc' | 'mifg' | 'vcts' | 'virga' | 'vcsh' | 'ts' | 'thdr' | 'vctshz' | 'tsfzfg' | 'tsbr' | 'tsdz' | 'vctsup' | '-tsup' | 'tsup' | '+tsup' | 'sq' | 'fc' | '+fc' | 'ds' | 'ss' | 'drsa' | 'drdu' | '+ds' | '+ss' | 'drsn' | '+drsn' | '-blsn' | 'blsn' | '+blsn' | 'vcblsn' | 'vcfg' | 'bcfg' | 'prfg' | 'fg' | 'fzfg' | '-vctsdz' | '-dz' | '-dzbr' | 'vctsdz' | 'dz' | '+vctsdz' | '+dz' | '-fzdz' | '-fzdzsn' | 'fzdz' | '+fzdz' | 'fzdzsn' | '-dzra' | 'dzra' | '+dzra' | '-ra' | '-rabr' | 'ra' | 'rabr' | 'rafg' | 'vcra' | '+ra' | '-fzra' | '-fzrasn' | '-fzrabr' | '-fzrapl' | '-fzrasnpl' | 'tsfzrapl' | '-tsfzra' | 'fzra' | '+fzra' | 'fzrasn' | 'tsfzra' | '-dzsn' | '-rasn' | '-snra' | '-sndz' | 'rasn' | '+rasn' | 'snra' | 'dzsn' | 'sndz' | '+dzsn' | '+sndz' | '-sn' | '-snbr' | 'sn' | '+sn' | '-snsg' | 'sg' | '-sg' | 'ic' | '-fzdzpl' | '-fzdzplsn' | 'fzdzpl' | '-fzraplsn' | 'fzrapl' | '+fzrapl' | '-rapl' | '-rasnpl' | '-raplsn' | '+rapl' | 'rapl' | '-snpl' | 'snpl' | '-pl' | 'pl' | '-plsn' | '-plra' | 'plra' | '-pldz' | '+pl' | 'plsn' | 'plup' | '+plsn' | '-sh' | '-shra' | 'sh' | 'shra' | '+sh' | '+shra' | '-shrasn' | '-shsnra' | '+shrabr' | 'shrasn' | '+shrasn' | 'shsnra' | '+shsnra' | '-shsn' | 'shsn' | '+shsn' | '-gs' | '-shgs' | 'fzraplgs' | '-sngs' | 'gsplsn' | 'gspl' | 'plgssn' | 'gs' | 'shgs' | '+gs' | '+shgs' | '-gr' | '-shgr' | '-sngr' | 'gr' | 'shgr' | '+gr' | '+shgr' | '-tsrasn' | 'tsrasn' | '-tssnra' | 'tssnra' | '-vctsra' | '-tsra' | 'tsra' | '-tsdz' | 'vctsra' | 'tspl' | '-tssn' | '-tspl' | 'tssn' | '-vctssn' | 'vctssn' | 'tsplsn' | 'tssnpl' | '-tssnpl' | '-tsragr' | 'tsrags' | 'tsragr' | 'tsgs' | 'tsgr' | '+tsfzrapl' | '+vctsra' | '+tsra' | '+tsfzra' | '+tssn' | '+tspl' | '+tsplsn' | '+vctssn' | 'tssa' | 'tsds' | 'tsdu' | '+tsgs' | '+tsgr' | '+tsrags' | '+tsragr' | 'in' | '-up' | 'up' | '+up' | '-fzup' | 'fzup' | '+fzup');
+/** Configuration for symbols on station plots */
 interface SPSymbolConfig {
     type: 'symbol';
     /**
-     * The position on the station plot at which to place the number
+     * The position on the station plot at which to place the symbol
      */
     pos: SPPosition;
     /**
-     * The color to use to draw the number
+     * The color to use to draw the symbol
      * @default '#000000'
      */
     color?: string;
+    /**
+ * Whether to draw a halo (outline) around the string
+ * @default true;
+ */
+    halo?: boolean;
+    /**
+     * The color to use for the halo (outline)
+     * @default '#ffffff'
+     */
+    halo_color?: string;
 }
+/** Configuration for station plot sub-elements */
 type SPConfig = SPNumberConfig | SPStringConfig | SPBarbConfig | SPSymbolConfig;
 /**
  * Configuration for station data plots
@@ -98,6 +133,7 @@ type SPConfig = SPNumberConfig | SPStringConfig | SPBarbConfig | SPSymbolConfig;
  * }
  */
 type SPDataConfig<ObsFieldName extends string> = Record<ObsFieldName, SPConfig>;
+/** Options for {@link StationPlot} components */
 interface StationPlotOptions<ObsFieldName extends string> {
     config: SPDataConfig<ObsFieldName>;
     /**
@@ -120,15 +156,30 @@ interface StationPlotOptions<ObsFieldName extends string> {
      */
     font_url_template?: string;
 }
+/**
+ * Station model plots for observed data
+ * @example
+ * // Specify how to set up the station plot
+ * const station_plot_locs = {
+ *     tmpf: {type: 'number', pos: 'ul', color: '#cc0000', formatter: val => val === null ? '' : val.toFixed(0)},
+ *     dwpf: {type: 'number', pos: 'll', color: '#00aa00', formatter: val => val === null ? '' : val.toFixed(0)},
+ *     wind: {type: 'barb', pos: 'c'},
+ *     preswx: {type: 'symbol', pos: 'cl', color: '#ff00ff'},
+ *     skyc: {type: 'symbol', pos: 'c'},
+ * };
+ *
+ * // Create the station plot
+ * const station_plot = new StationPlot(obs_field, {config: station_plot_locs, thin_fac: 8, font_size: 14});
+ */
 declare class StationPlot<GridType extends Grid, MapType extends MapLikeType, ObsFieldName extends string> extends PlotComponent<MapType> {
     private field;
     readonly opts: Required<StationPlotOptions<ObsFieldName>>;
     private gl_elems;
     private text_components;
     /**
-     *
-     * @param field
-     * @param opts
+     * Create station plots
+     * @param field - A field containing the observed data
+     * @param opts  - Various options for the station plots
      */
     constructor(field: RawObsField<GridType, ObsFieldName>, opts: StationPlotOptions<ObsFieldName>);
     /**

package/lib/StationPlot.js

@@ -76,11 +76,26 @@ function positionToAlignmentAndOffset(pos, off_size) {
     }
     return { horizontal_align: ha, vertical_align: va, offset_x: xoff, offset_y: yoff };
 }
+/**
+ * Station model plots for observed data
+ * @example
+ * // Specify how to set up the station plot
+ * const station_plot_locs = {
+ *     tmpf: {type: 'number', pos: 'ul', color: '#cc0000', formatter: val => val === null ? '' : val.toFixed(0)},
+ *     dwpf: {type: 'number', pos: 'll', color: '#00aa00', formatter: val => val === null ? '' : val.toFixed(0)},
+ *     wind: {type: 'barb', pos: 'c'},
+ *     preswx: {type: 'symbol', pos: 'cl', color: '#ff00ff'},
+ *     skyc: {type: 'symbol', pos: 'c'},
+ * };
+ *
+ * // Create the station plot
+ * const station_plot = new StationPlot(obs_field, {config: station_plot_locs, thin_fac: 8, font_size: 14});
+ */
 class StationPlot extends PlotComponent {
     /**
-     *
-     * @param field
-     * @param opts
+     * Create station plots
+     * @param field - A field containing the observed data
+     * @param opts  - Various options for the station plots
      */
     constructor(field, opts) {
         super();
@@ -110,8 +125,9 @@ class StationPlot extends PlotComponent {
             const k = k_;
             if (config.type == 'number' || config.type == 'string') {
                 const pos = config.pos;
-                const color_opt = config.color;
-                const color = color_opt === undefined ? Color.fromHex('#000000') : Color.normalizeColor(color_opt);
+                const color = config.color === undefined ? Color.fromHex('#000000') : Color.normalizeColor(config.color);
+                const halo_color = config.halo_color === undefined ? Color.fromHex('#ffffff') : Color.normalizeColor(config.halo_color);
+                const halo = config.halo === undefined ? true : config.halo;
                 const coords = this.field.grid.getEarthCoords();
                 const zoom = this.field.grid.getMinVisibleZoom(this.opts.thin_fac);
                 let text_specs;
@@ -126,8 +142,8 @@ class StationPlot extends PlotComponent {
                 }
                 const tc_opts = {
                     ...positionToAlignmentAndOffset(pos),
-                    font_size: this.opts.font_size, halo: true,
-                    text_color: color, halo_color: Color.fromHex('#ffffff'),
+                    font_size: this.opts.font_size, halo: halo,
+                    text_color: color, halo_color: halo_color,
                 };
                 return await TextCollection.make(gl, text_specs, font_url, tc_opts);
             }
@@ -138,8 +154,9 @@ class StationPlot extends PlotComponent {
             }
             else if (config.type == 'symbol') {
                 const pos = config.pos;
-                const color_opt = config.color;
-                const color = color_opt === undefined ? Color.fromHex('#000000') : Color.normalizeColor(color_opt);
+                const color = config.color === undefined ? Color.fromHex('#000000') : Color.normalizeColor(config.color);
+                const halo_color = config.halo_color === undefined ? Color.fromHex('#ffffff') : Color.normalizeColor(config.halo_color);
+                const halo = config.halo === undefined ? true : config.halo;
                 const comp = this.field.getStrings(k);
                 const coords = this.field.grid.getEarthCoords();
                 const zoom = this.field.grid.getMinVisibleZoom(this.opts.thin_fac);
@@ -148,8 +165,8 @@ class StationPlot extends PlotComponent {
                     lat: coords.lats[i], lon: coords.lons[i], min_zoom: zoom[i] }));
                 const tc_opts = {
                     ...positionToAlignmentAndOffset(pos),
-                    font_size: this.opts.font_size, halo: true,
-                    text_color: color, halo_color: Color.fromHex('#ffffff'),
+                    font_size: this.opts.font_size, halo: halo,
+                    text_color: color, halo_color: halo_color,
                 };
                 if (tc_opts.offset_x !== undefined)
                     tc_opts.offset_x -= 3;

package/lib/TextCollection.js

@@ -154,6 +154,9 @@ function createAtlas(pbf_glyphs) {
 const FONT_ATLAS_CACHE = new Cache(async (urls) => {
     const promises = urls.map(async (url) => {
         const resp = await fetch(url);
+        if (resp.status != 200) {
+            throw `Error ${resp.status} retrieving font pbf from '${url}'`;
+        }
         const blob = await resp.blob();
         const data_buffer = await blob.arrayBuffer();
         // Parse the PBF and get the glyph data

package/lib/index.d.ts

@@ -6,7 +6,7 @@ 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 { WindProfile, StormRelativeWindProfile, GroundRelativeWindProfile, WebGLAnyRenderingContext, TypedArray, ContourData } from "./AutumnTypes";
 import { MapLikeType } from "./Map";
 import { ColorMap, ColorMapOptions } from './Colormap';
 import { Color } from "./Color";
@@ -15,6 +15,7 @@ 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';
+/** All built-in colormaps */
 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;
@@ -25,9 +26,14 @@ declare const colormaps: {
     pw_td2m: ColorMap;
     nws_storm_clear_refl: ColorMap;
 };
+/** Options for initializing the autumnplot-gl library */
+interface InitAutumnPlotOpts {
+    /** Base URL at which to find the WASM module (change with caution!) */
+    wasm_base_url?: string;
+}
 /**
  * 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, 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 };
+declare function initAutumnPlot(opts?: InitAutumnPlotOpts): void;
+export { PlotComponent, Barbs, BarbsOptions, Contour, ContourOptions, ContourLabels, ContourLabelOptions, ContourFill, Raster, ContourFillOptions, RasterOptions, Paintball, PaintballOptions, Hodographs, HodographOptions, WindProfile, StormRelativeWindProfile, GroundRelativeWindProfile, 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, InitAutumnPlotOpts, FieldContourOpts };

package/lib/index.js

@@ -12,6 +12,7 @@ import { makeColorBar, makePaintballKey } from "./ColorBar";
 import { RawScalarField, RawVectorField, RawProfileField, RawObsField } from "./RawField";
 import { Grid, StructuredGrid, PlateCarreeGrid, PlateCarreeRotatedGrid, LambertGrid, UnstructuredGrid } from './Grid';
 import { initMSModule } from './ContourCreator';
+/** All built-in colormaps */
 const colormaps = {
     bluered: bluered,
     redblue: redblue,
@@ -26,7 +27,8 @@ const colormaps = {
  * 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();
+function initAutumnPlot(opts) {
+    opts = opts === undefined ? {} : opts;
+    initMSModule({ document_script: opts.wasm_base_url });
 }
 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "autumnplot-gl",
-    "version": "4.0.0-beta",
+    "version": "4.0.0",
     "description": "",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -27,7 +27,7 @@
         "typedoc": "^0.25.13",
         "typedoc-plugin-markdown": "^4.0.2",
         "typescript": "^5.4.5",
-        "webpack": "^5.75.0",
+        "webpack": "5.100",
         "webpack-cli": "^5.0.1",
         "webpack-dev-server": "^4.11.1",
         "webpack-glsl-loader": "^1.0.1"

package/dist/110.autumnplot-gl.js

@@ -1,2 +0,0 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.apgl=t():e.apgl=t()}(this,(()=>(()=>{"use strict";function e(e,t,r){for(var n=1,o=r;e%o!=0||t%o!=0;)n+=1,o/=2;return n}const t=Symbol("Comlink.proxy"),r=Symbol("Comlink.endpoint"),n=Symbol("Comlink.releaseProxy"),o=Symbol("Comlink.thrown"),a=e=>"object"==typeof e&&null!==e||"function"==typeof e,s=new Map([["proxy",{canHandle:e=>a(e)&&e[t],serialize(e){const{port1:t,port2:r}=new MessageChannel;return i(e,t),[r,[r]]},deserialize:e=>(e.start(),u(e,[],undefined))}],["throw",{canHandle:e=>a(e)&&o in e,serialize({value:e}){let t;return t=e instanceof Error?{isError:!0,value:{message:e.message,name:e.name,stack:e.stack}}:{isError:!1,value:e},[t,[]]},deserialize(e){if(e.isError)throw Object.assign(new Error(e.value.message),e.value);throw e.value}}]]);function i(e,r=self){r.addEventListener("message",(function n(a){if(!a||!a.data)return;const{id:s,type:f,path:u}=Object.assign({path:[]},a.data),l=(a.data.argumentList||[]).map(h);let p;try{const r=u.slice(0,-1).reduce(((e,t)=>e[t]),e),n=u.reduce(((e,t)=>e[t]),e);switch(f){case"GET":p=n;break;case"SET":r[u.slice(-1)[0]]=h(a.data.value),p=!0;break;case"APPLY":p=n.apply(r,l);break;case"CONSTRUCT":p=function(e){return Object.assign(e,{[t]:!0})}(new n(...l));break;case"ENDPOINT":{const{port1:t,port2:r}=new MessageChannel;i(e,r),p=function(e,t){return v.set(e,t),e}(t,[t])}break;case"RELEASE":p=void 0;break;default:return}}catch(e){p={value:e,[o]:0}}Promise.resolve(p).catch((e=>({value:e,[o]:0}))).then((e=>{const[t,o]=d(e);r.postMessage(Object.assign(Object.assign({},t),{id:s}),o),"RELEASE"===f&&(r.removeEventListener("message",n),c(r))}))})),r.start&&r.start()}function c(e){(function(e){return"MessagePort"===e.constructor.name})(e)&&e.close()}function f(e){if(e)throw new Error("Proxy has been released and is not useable")}function u(e,t=[],o=function(){}){let a=!1;const s=new Proxy(o,{get(r,o){if(f(a),o===n)return()=>p(e,{type:"RELEASE",path:t.map((e=>e.toString()))}).then((()=>{c(e),a=!0}));if("then"===o){if(0===t.length)return{then:()=>s};const r=p(e,{type:"GET",path:t.map((e=>e.toString()))}).then(h);return r.then.bind(r)}return u(e,[...t,o])},set(r,n,o){f(a);const[s,i]=d(o);return p(e,{type:"SET",path:[...t,n].map((e=>e.toString())),value:s},i).then(h)},apply(n,o,s){f(a);const i=t[t.length-1];if(i===r)return p(e,{type:"ENDPOINT"}).then(h);if("bind"===i)return u(e,t.slice(0,-1));const[c,v]=l(s);return p(e,{type:"APPLY",path:t.map((e=>e.toString())),argumentList:c},v).then(h)},construct(r,n){f(a);const[o,s]=l(n);return p(e,{type:"CONSTRUCT",path:t.map((e=>e.toString())),argumentList:o},s).then(h)}});return s}function l(e){const t=e.map(d);return[t.map((e=>e[0])),(r=t.map((e=>e[1])),Array.prototype.concat.apply([],r))];var r}const v=new WeakMap;function d(e){for(const[t,r]of s)if(r.canHandle(e)){const[n,o]=r.serialize(e);return[{type:"HANDLER",name:t,value:n},o]}return[{type:"RAW",value:e},v.get(e)||[]]}function h(e){switch(e.type){case"HANDLER":return s.get(e.name).deserialize(e.value);case"RAW":return e.value}}function p(e,t,r){return new Promise((n=>{const o=new Array(4).fill(0).map((()=>Math.floor(Math.random()*Number.MAX_SAFE_INTEGER).toString(16))).join("-");e.addEventListener("message",(function t(r){r.data&&r.data.id&&r.data.id===o&&(e.removeEventListener("message",t),n(r.data))})),e.start&&e.start(),e.postMessage(Object.assign({id:o},t),r)}))}var m=function(){function e(e,t){if(isNaN(e)||isNaN(t))throw new Error("Invalid LngLat object: (".concat(e,", ").concat(t,")"));if(this.lng=+e,this.lat=+t,this.lat>90||this.lat<-90)throw new Error("Invalid LngLat latitude value: must be between -90 and 90")}return e.prototype.toMercatorCoord=function(){return{x:(n=this.lng,(180+n)/360),y:(e=this.lat,t=Math.sin(e*Math.PI/180),r=(180-90/Math.PI*Math.log((1+t)/(1-t)))/360,Math.min(2,Math.max(-2,r)))};var e,t,r,n},e.fromMercatorCoord=function(t,r){return new e(function(e){return 360*e-180}(t),function(e){return 180*Math.atan(Math.sinh((180-360*e)*Math.PI/180))/Math.PI}(r))},e}(),y=function(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,a=r.call(e),s=[];try{for(;(void 0===t||t-- >0)&&!(n=a.next()).done;)s.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=a.return)&&r.call(a)}finally{if(o)throw o.error}}return s};return i({makeBBElements:function(t,r,n,o,a,s){for(var i=Math.log2(a),c=Math.max(i+1-s,0),f=Math.pow(2,c),u=Math.floor((n-1)/f)+1,l=Math.floor((o-1)/f)+1,v=u*l*6*2,d=new Float32Array(u*l*6*3),h=new Float32Array(v),p=0,y=0,g=0;g<o;g++)for(var x=0;x<n;x++){var w=g*n+x,b=t[w],E=r[w],M=e(g,x,a);if(!(M>s)){for(var A=new m(E,b).toMercatorCoord(),S=0;S<6;S++){var L=Math.max(0,Math.min(S-1,3));d[p+3*S+0]=A.x,d[p+3*S+1]=A.y,d[p+3*S+2]=4*M+L,h[y+2*S+0]=x/(n-1),h[y+2*S+1]=g/(o-1)}p+=18,y+=12}}return{pts:d,tex_coords:h}},makeDomainVerticesAndTexCoords:function(e,t,r,n,o,a){for(var s=new Float32Array(4*(r-1)*(n+1)).fill(0),i=new Float32Array(4*(r-1)*(n+1)).fill(0),c=new Float32Array(2*(r-1)*(n+1)).fill(0),f=0,u=0,l=0;l<r-1;l++)for(var v=0;v<n;v++){var d=l+v*r,h=new m(t[d],e[d]).toMercatorCoord(),p=new m(t[d+1],e[d+1]).toMercatorCoord(),y=l/(r-1)*(1-2*o)+o,g=(l+1)/(r-1)*(1-2*o)+o,x=v/(n-1)*(1-2*a)+a;0==v&&(s[f]=h.x,s[f+1]=h.y,f+=2,i[u]=y,i[u+1]=x,u+=2),s[f]=h.x,s[f+1]=h.y,s[f+2]=p.x,s[f+3]=p.y,f+=4,i[u]=y,i[u+1]=x,i[u+2]=g,i[u+3]=x,u+=4,v==n-1&&(s[f]=p.x,s[f+1]=p.y,f+=2,i[u]=g,i[u+1]=x,u+=2)}var w=0;for(l=0;l<r-1;l++)for(v=0;v<n-1;v++){var b=0==v?2*(w+1):2*w,E=s[b],M=s[b+1],A=s[b+2],S=s[b+3],L=s[b+4],j=s[b+5],k=s[b+6],C=s[b+7],P=.5*Math.abs(E*(S-j)+A*(j-M)+L*(M-S)+k*(j-S)+L*(S-C)+A*(C-j));0==v&&(c[w]=P,w+=1),c[w]=P,c[w+1]=P,w+=2,v==n-2&&(c[w]=P,c[w+1]=P,c[w+2]=P,w+=3)}return{vertices:s,tex_coords:i,grid_cell_size:c}},makePolyLines:function(e){if(0==e.length)return{vertices:new Float32Array([]),extrusion:new Float32Array([])};var t=Object.fromEntries(Object.entries(e[0]).map((function(e){var t=y(e,2),r=t[0],n=t[1];return[r,"number"==typeof n||"number"==typeof n[0]?1:n[0].length]})));t.extrusion=2,t.vertices+=1;var r=4*e.map((function(e){return e.vertices.length})).reduce((function(e,t){return e+t}))-2*e.length,n=Object.fromEntries(Object.entries(t).map((function(e){var t=y(e,2),n=t[0],o=t[1];return[n,r*o]}))),o={vertices:new Float32Array(n.vertices),extrusion:new Float32Array(n.extrusion)};"offsets"in e[0]&&(o.offsets=new Float32Array(n.offsets)),"data"in e[0]&&(o.data=new Float32Array(n.data)),"zoom"in e[0]&&(o.zoom=new Float32Array(n.zoom));var a=Object.fromEntries(Object.keys(n).map((function(e){return[e,0]}))),s=function(e,t,r){var n=t[0]-e[0],o=t[1]-e[1],a=Math.hypot(n,o),s=-n/a;return[o/a,r?-s:s]};return e.forEach((function(e){var t,r,n,i,c=e.vertices.map((function(e){var t=(new(m.bind.apply(m,function(e,t,r){if(r||2===arguments.length)for(var n,o=0,a=t.length;o<a;o++)!n&&o in t||(n||(n=Array.prototype.slice.call(t,0,o)),n[o]=t[o]);return e.concat(n||Array.prototype.slice.call(t))}([void 0],y(e),!1)))).toMercatorCoord();return[t.x,t.y]})),f=void 0!==e.offsets,u=void 0!==e.offsets?e.offsets:c,l=c[0],v=(c[1],u[0]),d=u[1],h=1e-4,p=y(s(v,d,!f),2),g=p[0],x=p[1];o.vertices[a.vertices++]=l[0],o.vertices[a.vertices++]=l[1],o.vertices[a.vertices++]=h,o.extrusion[a.extrusion++]=g,o.extrusion[a.extrusion++]=x;for(var w=1;w<c.length;w++)l=c[w],r=c[w-1],v=u[w],n=u[w-1],g=(t=y(s(n,v,!f),2))[0],x=t[1],i=h,h+=Math.hypot(c[w-1][0]-c[w][0],c[w-1][1]-c[w][1]),o.vertices[a.vertices++]=r[0],o.vertices[a.vertices++]=r[1],o.vertices[a.vertices++]=-i,o.vertices[a.vertices++]=r[0],o.vertices[a.vertices++]=r[1],o.vertices[a.vertices++]=i,o.vertices[a.vertices++]=l[0],o.vertices[a.vertices++]=l[1],o.vertices[a.vertices++]=-h,o.vertices[a.vertices++]=l[0],o.vertices[a.vertices++]=l[1],o.vertices[a.vertices++]=h,o.extrusion[a.extrusion++]=g,o.extrusion[a.extrusion++]=x,o.extrusion[a.extrusion++]=-g,o.extrusion[a.extrusion++]=-x,o.extrusion[a.extrusion++]=g,o.extrusion[a.extrusion++]=x,o.extrusion[a.extrusion++]=-g,o.extrusion[a.extrusion++]=-x;if(o.vertices[a.vertices++]=l[0],o.vertices[a.vertices++]=l[1],o.vertices[a.vertices++]=h,o.extrusion[a.extrusion++]=-g,o.extrusion[a.extrusion++]=-x,void 0!==o.offsets&&void 0!==e.offsets){var b=e.offsets,E=void 0,M=b[0];for(o.offsets[a.offsets++]=M[0],o.offsets[a.offsets++]=M[1],w=1;w<b.length;w++)M=b[w],E=b[w-1],o.offsets[a.offsets++]=E[0],o.offsets[a.offsets++]=E[1],o.offsets[a.offsets++]=E[0],o.offsets[a.offsets++]=E[1],o.offsets[a.offsets++]=M[0],o.offsets[a.offsets++]=M[1],o.offsets[a.offsets++]=M[0],o.offsets[a.offsets++]=M[1];o.offsets[a.offsets++]=M[0],o.offsets[a.offsets++]=M[1]}if(void 0!==o.data&&void 0!==e.data){var A=e.data,S=void 0,L=A[0];for(o.data[a.data++]=L,w=1;w<A.length;w++)L=A[w],S=A[w-1],o.data[a.data++]=S,o.data[a.data++]=S,o.data[a.data++]=L,o.data[a.data++]=L;o.data[a.data++]=L}if(void 0!==o.zoom&&void 0!==e.zoom)for(w=0;w<4*c.length-2;w++)o.zoom[a.zoom++]=e.zoom})),o}}),{}})()));
-//# sourceMappingURL=110.autumnplot-gl.js.map