Merge pull request #213 from RENCI/issue212

#212 updated logic to work as requested

src/components/control-panel/control-panel.js

@@ -239,8 +239,11 @@ export const ControlPanel = () => {
 
   // switch on/off the hurricane track layer, if it exists
   const toggleHurricaneLayer = () => {
-    const layerID = obs_layer.id.substr(0, obs_layer.id.lastIndexOf("-")) + '-hurr';
-    toggleHurricaneLayerVisibility(layerID);
+    // if there is a hurricane layer
+    if (hurrLayers) {
+      // toggle the view of it
+      toggleHurricaneLayerVisibility(hurrLayers[0].id);
+    }
   };
 
   const changeSynopticCycle = (direction) => {

src/components/map/storm-layers.js

@@ -40,6 +40,17 @@ export const StormLayers = () => {
     }
   };
 
+  // set visibily to false for all hurricane layers
+  const setHurricaneLayersVisiblityOff = () => {
+    const allHurrLayers = hurrLayers.map((x) => x);
+    if (allHurrLayers && allHurrLayers.length > 0) {
+      allHurrLayers.forEach(layer => {
+        layer.state = { visible: false, opacity: 1, };
+      });
+      setHurricaneTrackLayers([...allHurrLayers]);
+    }
+  };
+
 
   useEffect(() => {
 
@@ -95,6 +106,11 @@ export const StormLayers = () => {
           setHurricaneTrackLayers([...trackLayer, ...currentLayers]);
         }
       }
+      else {
+        // this is not a hurricane layer - turn off all hurricane layers, if any
+        setHurricaneLayersVisiblityOff();
+      }
+      // remove any hurricane layers that do not have an assocatiated model run
       removeAnyOrphanHurricaneLayers();
     }
 

src/components/trays/layers/list.js

@@ -172,11 +172,14 @@ const newLayerDefaultState = (layer, group) => {
  */
 export const LayersList = () => {
     // get a handle to the layer state
-    const { removeObservations, defaultModelLayers, setDefaultModelLayers } = useLayers();
+    const { removeObservations, defaultModelLayers, setDefaultModelLayers, hurricaneTrackLayers, setHurricaneTrackLayers } = useLayers();
 
     // get the default layers
     const layers = [...defaultModelLayers];
 
+    // get hurricane layers
+    const hurrLayers = [...hurricaneTrackLayers];
+
     // get the unique groups in the selected model runs
     const groupList = getGroupList(layers);
 
@@ -245,6 +248,15 @@ export const LayersList = () => {
             layer.state = newLayerDefaultState(layer, newLayerList[0].group);
         });
 
+        // turn on/off any hurricane layers
+        if (hurrLayers) {
+            newLayerList[0].properties.met_class === "tropical" ?
+                    hurrLayers[0].state.visible = true
+                    :
+                    hurrLayers[0].state.visible = false;
+            setHurricaneTrackLayers([...hurrLayers]);
+        }
+
         // update the layer list in state
         setDefaultModelLayers(newLayerList);
     };