nih

akrosinc · Oct 17, 2023 · 38e087b · 38e087b
1 parent 237e131
commit 38e087b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/features/planSimulation/components/Simulation.tsx b/src/features/planSimulation/components/Simulation.tsx
@@ -908,6 +908,7 @@ const Simulation = () => {
 
   const clearHandler = () => {
     setSelectedEntityConditionList([]);
+    setAnalysisLayerDetails([]);
     setShowResult(false);
     setMapData(undefined);
     setToLocation(undefined);
@@ -916,6 +917,14 @@ const Simulation = () => {
     setParentsLoadingState('notstarted');
     setResultsLoadingState('notstarted');
     setSelectedFilterGeographicLevelList([]);
+    setSelectedHierarchy(undefined);
+    setSelectedLocation(undefined);
+    setLocationList([]);
+    setHighestLocations(undefined);
+    setInactiveGeoFilterList([]);
+    setSelectedFilterInactiveGeographicLevelList(undefined);
+    setStatsLayerMetadata({});
+    setAnalysisResultEntityTags(undefined);
     levelsLoaded.current = [];
     setGeoFilterList([]);
     reset();

diff --git a/src/features/planSimulation/components/SimulationMapView/SimulationMapView.tsx b/src/features/planSimulation/components/SimulationMapView/SimulationMapView.tsx
@@ -1580,7 +1580,7 @@ const SimulationMapView = ({
               </Draggable>
             )}
 
-            {showUserDefinedSettingsPanel && selectedUserDefinedLayer && (
+            {showUserDefinedSettingsPanel && analysisLayerDetails.length > 0 && selectedUserDefinedLayer && (
               <div style={{ float: 'left' }} className="sidebar-adjust-list text-dark bg-light p-2 rounded">
                 <p className="lead mb-1">Settings - {selectedUserDefinedLayer.key}</p>
 
@@ -1795,7 +1795,7 @@ const SimulationMapView = ({
             }}
             className="mb-2 float-end"
           >
-            Full Screen
+            {fullScreen ? 'Show Controls' : 'Full Screen'}
           </Button>
         </div>
       </div>

diff --git a/src/features/planSimulation/components/modals/SimulationAnalysisPanelContent.tsx b/src/features/planSimulation/components/modals/SimulationAnalysisPanelContent.tsx
@@ -34,13 +34,17 @@ const SimulationAnalysisPanelContent = ({ formControls }: Props<any>) => {
     let stacks = [];
     for (let i = 0; i < 6; i++) {
       let colors = [];
+      let skipFirst = false;
       for (let j = i * 60; j <= i * 60 + 60; j = j + 6) {
-        let hexValue = hsl.hex([j, 100, 50]);
+        if (skipFirst) {
+          let hexValue = hsl.hex([j, 100, 50]);
 
-        let rgbArr = hex.rgb(hexValue);
-        let hsvArr = hex.hsv(hexValue);
+          let rgbArr = hex.rgb(hexValue);
+          let hsvArr = hex.hsv(hexValue);
 
-        colors.push({ colr: j, hex: hexValue, rgb: rgbArr, hsv: hsvArr });
+          colors.push({ colr: j, hex: hexValue, rgb: rgbArr, hsv: hsvArr });
+        }
+        skipFirst = true;
       }
       stacks.push({ stack: i, col: colors });
     }