@aguacerowx/mapsgl 0.0.48 → 0.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aguacerowx/mapsgl",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
     "esbuild": "^0.21.5"
   },
   "dependencies": {
-    "@aguacerowx/javascript-sdk": "^0.0.20",
+    "@aguacerowx/javascript-sdk": "^0.0.21",
     "buffer": "^6.0.3",
     "fzstd": "^0.1.1",
     "mapbox-gl": "^3.4.0",

package/src/WeatherLayerManager.js

@@ -177,6 +177,7 @@ export class WeatherLayerManager extends EventEmitter {
                     variable: this.core.state?.variable,
                     mrmsDurationValue: this.core.state?.mrmsDurationValue,
                     mrmsTimestamp: this.core.state?.mrmsTimestamp,
+                    nexradDurationValue: this.core.state?.nexradDurationValue,
                     satelliteDurationValue: this.core.state?.satelliteDurationValue,
                 },
             });
@@ -570,13 +571,13 @@ export class WeatherLayerManager extends EventEmitter {
             this.currentLoadedTimeKey = null;
         }
 
-        if (!state.satelliteKey || state.satelliteTimestamp == null) {
+        if (!state.satelliteInstrumentId || state.satelliteTimestamp == null) {
             this._tearDownSatellite();
             this.map.triggerRepaint();
             return;
         }
 
-        const satRunKey = `${state.satelliteKey}|${state.variable || ''}`;
+        const satRunKey = `${state.satelliteInstrumentId}|${state.satelliteSectorLabel}|${state.satelliteChannel}|${state.variable || ''}`;
         if (!this.satelliteLayer || this._satelliteRunKey !== satRunKey) {
             this._rebuildSatelliteLayer(state, satRunKey);
         }
@@ -668,20 +669,19 @@ export class WeatherLayerManager extends EventEmitter {
 
     _satelliteTimelineId(state) {
         const keys = Object.keys(state.satelliteTimeToFileMap || {}).sort((a, b) => Number(a) - Number(b));
-        return `${state.satelliteKey}|${state.variable || ''}|${keys.join(',')}`;
+        return `${state.satelliteInstrumentId}|${state.satelliteSectorLabel}|${state.satelliteChannel}|${state.variable || ''}|${keys.join(',')}`;
     }
 
     _getSatelliteFetchParts(state, satelliteTimestamp) {
         const fileName = resolveSatelliteS3FileName(
-            state.satelliteKey,
+            state.satelliteChannel,
             state.satelliteTimeToFileMap,
             satelliteTimestamp
         );
         if (!fileName) {
             return null;
         }
-        const parts = state.satelliteKey.split('.');
-        const channelName = parts[2] || state.variable;
+        const channelName = state.satelliteChannel || state.variable;
         const channelNameUpper = String(channelName).toUpperCase();
         let s3FileName = fileName.replace('MULTI', channelNameUpper);
         if (!s3FileName.endsWith('.ktx2')) {
@@ -871,9 +871,15 @@ export class WeatherLayerManager extends EventEmitter {
     async setSatelliteDurationValue(value) {
         return this.core.setSatelliteDurationValue(value);
     }
+    async setSatelliteSelection(opts) {
+        return this.core.setSatelliteSelection(opts);
+    }
     async setMRMSDurationValue(value) {
         return this.core.setMRMSDurationValue(value);
     }
+    async setNexradDurationValue(value) {
+        return this.core.setNexradDurationValue(value);
+    }
 
     /** Refreshes NEXRAD object-key listings for the current site / product / tilt (NEXRAD mode only). */
     async refreshNexradTimes() {
@@ -1389,7 +1395,7 @@ export class WeatherLayerManager extends EventEmitter {
         const s = this.core.state;
         const { isMRMS, isSatellite, isNexrad, model: currentModel, variable: currentVariable, date, run } = s;
 
-        if (isSatellite && s.satelliteKey) {
+        if (isSatellite && s.satelliteInstrumentId) {
             const prevTimeline = this.core._computeSatelliteTimeline();
             const prevTimes = [...(prevTimeline.unixTimes || [])]
                 .map((t) => Number(t))
@@ -1413,7 +1419,12 @@ export class WeatherLayerManager extends EventEmitter {
             } else if (curSat != null && newMax != null && nextTimes.length && !nextTimes.includes(curSat)) {
                 await this.core.setSatelliteTimestamp(newMax);
             }
-            this.emit('data:updated', { type: 'satellite', satelliteKey: s.satelliteKey });
+            this.emit('data:updated', {
+                type: 'satellite',
+                satelliteInstrumentId: s.satelliteInstrumentId,
+                satelliteSectorLabel: s.satelliteSectorLabel,
+                satelliteChannel: s.satelliteChannel,
+            });
             return;
         }
 

package/src/defaultBasisBaseUrl.js

@@ -1,40 +1,11 @@
-import pkg from '../package.json' with { type: 'json' };
-
 /**
  * jsDelivr serves the `basis/` folder from the published npm package (no `public/basis/` copy).
  * Use when you consume `@aguacerowx/mapsgl` from the registry and do not host transcoder assets yourself.
  */
-export const JSDELIVR_BASIS_BASE_URL = `https://cdn.jsdelivr.net/npm/@aguacerowx/mapsgl@${pkg.version}/basis/`;
+export const JSDELIVR_BASIS_BASE_URL = `https://cdn.jsdelivr.net/npm/@aguacerowx/mapsgl/basis/`;
 
 /**
- * Default: resolve `mapsgl/basis/` inside this package.
- *
- * We cannot use `new URL('..', new URL('.', import.meta.url))`: Vite aliases `@aguacerowx/mapsgl` to
- * `mapsgl/index.js`, so the "directory" of this module is often `.../mapsgl/` and `..` becomes the
- * monorepo `packages/` folder — wrong (`packages/basis/` instead of `packages/mapsgl/basis/`).
- * Webpack also rejects `new URL('../basis/', import.meta.url)` as an unresolved module, so we locate
- * the `mapsgl` path segment and append `basis/`.
- *
- * In Vite production builds the folder URL becomes your app origin `/basis/`, so place copies under
- * `public/basis/` (or sync from `node_modules/@aguacerowx/mapsgl/basis`).
- * For CDN-only, pass {@link JSDELIVR_BASIS_BASE_URL} as `WeatherLayerManager({ basisBaseUrl: ... })`.
+ * Default to the jsDelivr CDN so users don't have to host the files themselves.
+ * You can override this by passing `basisBaseUrl` to `WeatherLayerManager`.
  */
-const _mapsglRootHref = (() => {
-    const u = import.meta.url;
-    const slashIdx = u.indexOf('/mapsgl/');
-    if (slashIdx >= 0) {
-        return u.slice(0, slashIdx + '/mapsgl/'.length);
-    }
-    // e.g. cdn.jsdelivr.net/.../mapsgl@0.0.47/dist/... (no `/mapsgl/` substring)
-    const atMatch = u.match(/\/mapsgl@[^/]+\//);
-    if (atMatch && atMatch.index !== undefined) {
-        return u.slice(0, atMatch.index + atMatch[0].length);
-    }
-    const srcMarker = '/src/';
-    const j = u.lastIndexOf(srcMarker);
-    if (j >= 0) {
-        return `${u.slice(0, j)}/`;
-    }
-    return new URL('../', new URL('.', u)).href;
-})();
-export const DEFAULT_BASIS_BASE_URL = new URL('basis/', _mapsglRootHref).href;
+export const DEFAULT_BASIS_BASE_URL = JSDELIVR_BASIS_BASE_URL;