@aguacerowx/javascript-sdk 0.0.16 → 0.0.18

package/dist/AguaceroCore.js

@@ -81,10 +81,13 @@ class AguaceroCore extends _events.EventEmitter {
     this.playbackSpeed = options.playbackSpeed || 500;
     this.customColormaps = options.customColormaps || {};
     const userLayerOptions = options.layerOptions || {};
+    // EDIT: Determine initial mode from options
+    const initialMode = userLayerOptions.mode || 'model';
     const initialVariable = userLayerOptions.variable || null;
     this.state = {
       model: userLayerOptions.model || 'gfs',
-      isMRMS: false,
+      // EDIT: Set isMRMS based on the initial mode
+      isMRMS: initialMode === 'mrms',
       mrmsTimestamp: null,
       variable: initialVariable,
       date: null,
@@ -116,11 +119,16 @@ class AguaceroCore extends _events.EventEmitter {
       const timestamps = this.mrmsStatus[this.state.variable] || [];
       availableTimestamps = [...timestamps].reverse();
     }
+    let availableHours = this.state.isMRMS ? [] : ((_this$modelStatus = this.modelStatus) === null || _this$modelStatus === void 0 || (_this$modelStatus = _this$modelStatus[this.state.model]) === null || _this$modelStatus === void 0 || (_this$modelStatus = _this$modelStatus[this.state.date]) === null || _this$modelStatus === void 0 ? void 0 : _this$modelStatus[this.state.run]) || [];
+    if (!this.state.isMRMS && this.state.variable === 'ptypeRefl' && this.state.model === 'hrrr' && availableHours.length > 0) {
+      availableHours = availableHours.filter(hour => hour !== 0);
+    }
     const eventPayload = {
       ...this.state,
       availableModels: this.modelStatus ? Object.keys(this.modelStatus).sort() : [],
-      availableRuns: ((_this$modelStatus = this.modelStatus) === null || _this$modelStatus === void 0 ? void 0 : _this$modelStatus[this.state.model]) || {},
-      availableHours: this.state.isMRMS ? [] : ((_this$modelStatus2 = this.modelStatus) === null || _this$modelStatus2 === void 0 || (_this$modelStatus2 = _this$modelStatus2[this.state.model]) === null || _this$modelStatus2 === void 0 || (_this$modelStatus2 = _this$modelStatus2[this.state.date]) === null || _this$modelStatus2 === void 0 ? void 0 : _this$modelStatus2[this.state.run]) || [],
+      availableRuns: ((_this$modelStatus2 = this.modelStatus) === null || _this$modelStatus2 === void 0 ? void 0 : _this$modelStatus2[this.state.model]) || {},
+      availableHours: availableHours,
+      // <-- Changed from inline calculation
       availableVariables: this.getAvailableVariables(this.state.isMRMS ? 'mrms' : this.state.model),
       // We need to confirm this line is working as expected.
       availableMRMSVariables: this.getAvailableVariables('mrms'),
@@ -134,17 +142,42 @@ class AguaceroCore extends _events.EventEmitter {
   async initialize(options = {}) {
     await this.fetchModelStatus(true);
     await this.fetchMRMSStatus(true);
-    const latestRun = findLatestModelRun(this.modelStatus, this.state.model);
-    let initialState = this.state;
-    if (latestRun && !this.state.isMRMS) {
-      initialState = {
-        ...this.state,
-        ...latestRun,
-        forecastHour: 0
-      };
-      const availableVariables = this.getAvailableVariables(initialState.model);
-      if (availableVariables && availableVariables.length > 0) {
-        initialState.variable = availableVariables[0];
+    let initialState = {
+      ...this.state
+    };
+
+    // ADD: Logic to handle an initial MRMS state
+    if (initialState.isMRMS) {
+      const variable = initialState.variable;
+      if (variable && this.mrmsStatus && this.mrmsStatus[variable]) {
+        const sortedTimestamps = [...(this.mrmsStatus[variable] || [])].sort((a, b) => b - a);
+        initialState.mrmsTimestamp = sortedTimestamps.length > 0 ? sortedTimestamps[0] : null;
+      } else {
+        // Fallback if the provided variable is not valid
+        console.warn(`Initial MRMS variable '${variable}' not found. Using default.`);
+        const availableMRMSVars = this.getAvailableVariables('mrms');
+        if (availableMRMSVars.length > 0) {
+          const firstVar = availableMRMSVars[0];
+          initialState.variable = firstVar;
+          const sortedTimestamps = [...(this.mrmsStatus[firstVar] || [])].sort((a, b) => b - a);
+          initialState.mrmsTimestamp = sortedTimestamps.length > 0 ? sortedTimestamps[0] : null;
+        }
+      }
+    } else {
+      // EDIT: This is the existing logic, now in an else block
+      const latestRun = findLatestModelRun(this.modelStatus, initialState.model);
+      if (latestRun) {
+        initialState = {
+          ...initialState,
+          ...latestRun,
+          forecastHour: 0
+        };
+        if (!initialState.variable) {
+          const availableVariables = this.getAvailableVariables(initialState.model);
+          if (availableVariables && availableVariables.length > 0) {
+            initialState.variable = availableVariables[0];
+          }
+        }
       }
     }
     await this.setState(initialState);
@@ -264,20 +297,45 @@ class AguaceroCore extends _events.EventEmitter {
     });
   }
   async setVariable(variable) {
+    // --- NEW CODE: Handle switching TO ptypeRefl on HRRR ---
+    if (variable === 'ptypeRefl' && this.state.model === 'hrrr' && this.state.forecastHour === 0) {
+      var _this$modelStatus4;
+      const availableHours = ((_this$modelStatus4 = this.modelStatus) === null || _this$modelStatus4 === void 0 || (_this$modelStatus4 = _this$modelStatus4[this.state.model]) === null || _this$modelStatus4 === void 0 || (_this$modelStatus4 = _this$modelStatus4[this.state.date]) === null || _this$modelStatus4 === void 0 ? void 0 : _this$modelStatus4[this.state.run]) || [];
+      const firstValidHour = availableHours.find(hour => hour !== 0) || 0;
+      await this.setState({
+        variable,
+        forecastHour: firstValidHour
+      });
+      return;
+    }
+    // --- END NEW CODE ---
+
     await this.setState({
       variable
     });
   }
   async setModel(modelName) {
-    var _this$modelStatus4;
-    if (modelName === this.state.model || !((_this$modelStatus4 = this.modelStatus) !== null && _this$modelStatus4 !== void 0 && _this$modelStatus4[modelName])) return;
+    var _this$modelStatus5;
+    if (modelName === this.state.model || !((_this$modelStatus5 = this.modelStatus) !== null && _this$modelStatus5 !== void 0 && _this$modelStatus5[modelName])) return;
     const latestRun = findLatestModelRun(this.modelStatus, modelName);
     if (latestRun) {
+      // --- NEW CODE: Determine initial forecast hour ---
+      let initialHour = 0;
+
+      // If switching to HRRR with ptypeRefl, start at hour 1 instead of 0
+      if (modelName === 'hrrr' && this.state.variable === 'ptypeRefl') {
+        var _this$modelStatus6;
+        const availableHours = ((_this$modelStatus6 = this.modelStatus) === null || _this$modelStatus6 === void 0 || (_this$modelStatus6 = _this$modelStatus6[modelName]) === null || _this$modelStatus6 === void 0 || (_this$modelStatus6 = _this$modelStatus6[latestRun.date]) === null || _this$modelStatus6 === void 0 ? void 0 : _this$modelStatus6[latestRun.run]) || [];
+        // Find the first valid hour (should be 1)
+        initialHour = availableHours.find(hour => hour !== 0) || 0;
+      }
+      // --- END NEW CODE ---
+
       await this.setState({
         model: modelName,
         date: latestRun.date,
         run: latestRun.run,
-        forecastHour: 0
+        forecastHour: initialHour // <-- Changed from hardcoded 0
       });
     }
   }
@@ -350,13 +408,26 @@ class AguaceroCore extends _events.EventEmitter {
         console.error(`Could not find a valid run for model: ${model}`);
         return;
       }
+
+      // --- NEW CODE: Determine initial forecast hour for switchMode ---
+      let initialHour = forecastHour !== undefined ? forecastHour : 0;
+
+      // If switching to HRRR with ptypeRefl and hour is 0, use hour 1
+      if (model === 'hrrr' && variable === 'ptypeRefl' && initialHour === 0) {
+        var _this$modelStatus7;
+        const availableHours = ((_this$modelStatus7 = this.modelStatus) === null || _this$modelStatus7 === void 0 || (_this$modelStatus7 = _this$modelStatus7[model]) === null || _this$modelStatus7 === void 0 || (_this$modelStatus7 = _this$modelStatus7[latestRun.date]) === null || _this$modelStatus7 === void 0 ? void 0 : _this$modelStatus7[latestRun.run]) || [];
+        initialHour = availableHours.find(hour => hour !== 0) || 0;
+      }
+      // --- END NEW CODE ---
+
       targetState = {
         isMRMS: false,
         model: model,
         variable: variable,
         date: latestRun.date,
         run: latestRun.run,
-        forecastHour: forecastHour !== undefined ? forecastHour : 0,
+        forecastHour: initialHour,
+        // <-- Changed
         mrmsTimestamp: null
       };
     } else {
@@ -580,31 +651,6 @@ class AguaceroCore extends _events.EventEmitter {
       const displayUnit = this._getTargetUnit(dataNativeUnit, units);
       const conversionFunc = (0, _unitConversions.getUnitConversionFunction)(dataNativeUnit, displayUnit);
       let displayValue = conversionFunc ? conversionFunc(nativeValue) : nativeValue;
-
-      // --- START: ADDED CODE ---
-
-      // Create a variable to hold the precipitation type, if any.
-      let precipType = null;
-
-      // Check if the current variable is one of the special ptype variables.
-      if (variable === 'ptypeRefl' || variable === 'ptypeRate') {
-        const value = nativeValue; // Use the raw, unconverted value for ptype logic
-
-        if (value >= 100 && value < 200) {
-          displayValue -= 100;
-          precipType = 'Snow';
-        } else if (value >= 200 && value < 300) {
-          displayValue -= 200;
-          precipType = 'Frzg Rain'; // Abbreviated for tooltips
-        } else if (value >= 300 && value < 400) {
-          displayValue -= 300;
-          precipType = 'Ice Pellets';
-        } else {
-          precipType = 'Rain';
-        }
-      }
-
-      // Return the final payload, now including the precipType.
       return {
         lngLat: {
           lng,
@@ -615,8 +661,7 @@ class AguaceroCore extends _events.EventEmitter {
           name: this.getVariableDisplayName(variable)
         },
         value: displayValue,
-        unit: displayUnit,
-        precipType: precipType // NEW: Add this to the return object
+        unit: displayUnit
       };
     } catch (error) {
       return null;