zone -> shape

bcgov · Nov 1, 2023 · 85d6cd9 · 85d6cd9
1 parent a27664a
commit 85d6cd9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/web/src/features/fba/components/ZoneSummaryPanel.tsx b/web/src/features/fba/components/ZoneSummaryPanel.tsx
@@ -32,7 +32,7 @@ interface Props {
   selectedFireZone: FireShape | undefined
   fuelTypeInfo: Record<number, FireZoneThresholdFuelTypeArea[]>
   hfiElevationInfo: ElevationInfoByThreshold[]
-  fireZoneAreas: FireShapeArea[]
+  fireShapeAreas: FireShapeArea[]
   showSummaryPanel: boolean
   setShowSummaryPanel: React.Dispatch<React.SetStateAction<boolean>>
 }
@@ -63,7 +63,7 @@ const ZoneSummaryPanel = React.forwardRef((props: Props, ref: React.ForwardedRef
           </Grid>
           <Grid item>
             <CombustibleAreaViz
-              fireZoneAreas={props.fireZoneAreas.filter(
+              fireZoneAreas={props.fireShapeAreas.filter(
                 area => area.fire_shape_id == props.selectedFireZone?.fire_shape_id
               )}
             />

diff --git a/web/src/features/fba/components/map/FBAMap.tsx b/web/src/features/fba/components/map/FBAMap.tsx
@@ -304,7 +304,7 @@ const FBAMap = (props: FBAMapProps) => {
           <Box sx={{ position: 'absolute', zIndex: '1', bottom: '0.5rem' }}>
             <Legend
               onToggleLayer={handleToggleLayer}
-              showZoneStatus={showShapeStatus}
+              showShapeStatus={showShapeStatus}
               setShowShapeStatus={setShowShapeStatus}
               showHFI={showHFI}
               setShowHFI={setShowHFI}

diff --git a/web/src/features/fba/components/map/Legend.tsx b/web/src/features/fba/components/map/Legend.tsx
@@ -75,13 +75,13 @@ const LegendItem: React.FC<LegendItemProps> = ({ label, checked, onChange, subIt
 
 interface LegendProps {
   onToggleLayer: (layerName: string, isVisible: boolean) => void
-  showZoneStatus: boolean
+  showShapeStatus: boolean
   setShowShapeStatus: React.Dispatch<React.SetStateAction<boolean>>
   showHFI: boolean
   setShowHFI: React.Dispatch<React.SetStateAction<boolean>>
 }
 
-const Legend = ({ onToggleLayer, showZoneStatus, setShowShapeStatus, showHFI, setShowHFI }: LegendProps) => {
+const Legend = ({ onToggleLayer, showShapeStatus, setShowShapeStatus, showHFI, setShowHFI }: LegendProps) => {
   const handleLayerChange = (
     layerName: string,
     isVisible: boolean,
@@ -106,9 +106,9 @@ const Legend = ({ onToggleLayer, showZoneStatus, setShowShapeStatus, showHFI, se
         BC Fire Advisories
       </LegendTitle>
       <LegendItem
-        label="Zone Status"
-        checked={showZoneStatus}
-        onChange={() => handleLayerChange('fireShapeVector', showZoneStatus, setShowShapeStatus)}
+        label="Zone Unit Status"
+        checked={showShapeStatus}
+        onChange={() => handleLayerChange('fireShapeVector', showShapeStatus, setShowShapeStatus)}
         subItems={zoneStatusSubItems}
       />
       <LegendItem

diff --git a/web/src/features/fba/components/map/legend.test.tsx b/web/src/features/fba/components/map/legend.test.tsx
@@ -14,7 +14,7 @@ describe('Legend', () => {
         setShowShapeStatus={setShowZoneStatus}
         setShowHFI={setShowHFI}
         showHFI={false}
-        showZoneStatus={true}
+        showShapeStatus={true}
       />
     )
     const legendComponent = getByTestId('asa-map-legend')
@@ -41,7 +41,7 @@ describe('Legend', () => {
         setShowShapeStatus={setShowZoneStatus}
         setShowHFI={setShowHFI}
         showHFI={false}
-        showZoneStatus={true}
+        showShapeStatus={true}
       />
     )
 

diff --git a/web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx b/web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx
@@ -225,7 +225,7 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
               selectedFireZone={selectedFireZone}
               fuelTypeInfo={hfiThresholdsFuelTypes}
               hfiElevationInfo={fireZoneElevationInfo}
-              fireZoneAreas={fireShapeAreas}
+              fireShapeAreas={fireShapeAreas}
               showSummaryPanel={showSummaryPanel}
               setShowSummaryPanel={setShowSummaryPanel}
             />