Merge branch 'main' into task/critical-hours/3746

api/app/main.py

@@ -16,8 +16,7 @@
 from app import health
 from app import hourlies
 from app.rocketchat_notifications import send_rocketchat_notification
-from app.routers import (fba, forecasts, weather_models, c_haines, stations, hfi_calc,
-                         fba_calc, sfms, morecast_v2, snow)
+from app.routers import fba, forecasts, weather_models, c_haines, stations, hfi_calc, fba_calc, sfms, morecast_v2
 from app.fire_behaviour.cffdrs import CFFDRS
 
 
@@ -123,7 +122,6 @@ async def catch_exception_middleware(request: Request, call_next):
 api.include_router(fba.router, tags=["Auto Spatial Advisory"])
 api.include_router(sfms.router, tags=["SFMS", "Auto Spatial Advisory"])
 api.include_router(morecast_v2.router, tags=["Morecast v2"])
-api.include_router(snow.router, tags=['Snow'])
 
 
 @api.get('/ready')

web/cypress/e2e/fba-map-page.cy.ts

@@ -11,7 +11,6 @@ describe('Fire Behaviour Advisory Page', () => {
       },
       { fixture: 'fba/vectors.json' }
     ).as('getVectors')
-    cy.intercept('GET', 'api/snow/most-recent-by-date/*', { fixture: 'fba/processedSnow.json' }).as('processedSnow')
 
     cy.visit(FIRE_BEHAVIOUR_ADVISORY_ROUTE)
   })

web/src/features/fba/components/map/FBAMap.tsx

@@ -27,14 +27,13 @@ import {
   fireShapeLabelStyler,
   stationStyler,
   hfiStyler,
-  snowStyler,
   fireCentreLineStyler
 } from 'features/fba/components/map/featureStylers'
 import { BC_EXTENT, CENTER_OF_BC } from 'utils/constants'
 import { DateTime } from 'luxon'
 import { PMTILES_BUCKET } from 'utils/env'
 import { RunType } from 'features/fba/pages/FireBehaviourAdvisoryPage'
-import { buildPMTilesURL, buildSnowPMTilesURL } from 'features/fba/pmtilesBuilder'
+import { buildPMTilesURL } from 'features/fba/pmtilesBuilder'
 import { isUndefined, cloneDeep, isNull } from 'lodash'
 import { Box } from '@mui/material'
 import Legend from 'features/fba/components/map/Legend'
@@ -53,7 +52,6 @@ export interface FBAMapProps {
   fireShapeAreas: FireShapeArea[]
   runType: RunType
   advisoryThreshold: number
-  snowDate: DateTime | null
   zoomSource?: 'fireCenter' | 'fireShape'
   setZoomSource: React.Dispatch<React.SetStateAction<'fireCenter' | 'fireShape' | undefined>>
 }
@@ -72,7 +70,6 @@ const FBAMap = (props: FBAMapProps) => {
   const { stations } = useSelector(selectFireWeatherStations)
   const [showShapeStatus, setShowShapeStatus] = useState(true)
   const [showHFI, setShowHFI] = useState(false)
-  const [showSnow, setShowSnow] = useState<boolean>(false)
   const [map, setMap] = useState<ol.Map | null>(null)
   const mapRef = useRef<HTMLDivElement | null>(null) as React.MutableRefObject<HTMLElement>
   const scaleRef = useRef<HTMLDivElement | null>(null) as React.MutableRefObject<HTMLElement>
@@ -244,27 +241,6 @@ const FBAMap = (props: FBAMapProps) => {
     }
   }, [showHFI, mostRecentRunDate]) // eslint-disable-line react-hooks/exhaustive-deps
 
-  useEffect(() => {
-    if (!map) return
-    const layerName = 'snowVector'
-    removeLayerByName(map, layerName)
-    if (!isNull(props.snowDate)) {
-      const snowPMTilesSource = new olpmtiles.PMTilesVectorSource({
-        url: buildSnowPMTilesURL(props.snowDate)
-      })
-
-      const latestSnowPMTilesLayer = new VectorTileLayer({
-        source: snowPMTilesSource,
-        style: snowStyler,
-        zIndex: 40,
-        minZoom: 4,
-        properties: { name: layerName },
-        visible: showSnow
-      })
-      map.addLayer(latestSnowPMTilesLayer)
-    }
-  }, [props.snowDate]) // eslint-disable-line react-hooks/exhaustive-deps
-
   useEffect(() => {
     // The React ref is used to attach to the div rendered in our
     // return statement of which this map's target is set to.
@@ -331,17 +307,6 @@ const FBAMap = (props: FBAMapProps) => {
     map?.addLayer(stationsLayer)
   }, [stations]) // eslint-disable-line react-hooks/exhaustive-deps
 
-  // Generate a message to display about the snow layer in the legend.
-  const getSnowDateMessage = () => {
-    if (!showSnow) {
-      return null
-    }
-    if (isNull(props.snowDate)) {
-      return 'No data available'
-    }
-    return `as of ${props.snowDate?.toISODate()}`
-  }
-
   return (
     <ErrorBoundary>
       <MapContext.Provider value={map}>
@@ -361,9 +326,6 @@ const FBAMap = (props: FBAMapProps) => {
               setShowShapeStatus={setShowShapeStatus}
               showHFI={showHFI}
               setShowHFI={setShowHFI}
-              showSnow={showSnow}
-              setShowSnow={setShowSnow}
-              snowDescription={getSnowDateMessage()}
             />
           </Box>
           <ScalebarContainer ref={scaleRef} />

web/src/features/fba/components/map/Legend.tsx

@@ -98,20 +98,14 @@ interface LegendProps {
   setShowShapeStatus: React.Dispatch<React.SetStateAction<boolean>>
   showHFI: boolean
   setShowHFI: React.Dispatch<React.SetStateAction<boolean>>
-  showSnow: boolean
-  setShowSnow: React.Dispatch<React.SetStateAction<boolean>>
-  snowDescription: string | null
 }
 
 const Legend = ({
   onToggleLayer,
   showShapeStatus,
   setShowShapeStatus,
   showHFI,
-  setShowHFI,
-  showSnow,
-  setShowSnow,
-  snowDescription
+  setShowHFI
 }: LegendProps) => {
   const handleLayerChange = (
     layerName: string,
@@ -148,13 +142,6 @@ const Legend = ({
         onChange={() => handleLayerChange('hfiVector', showHFI, setShowHFI)}
         subItems={hfiSubItems}
       />
-      <LegendItem
-        label="Snow Coverage"
-        checked={showSnow}
-        onChange={() => handleLayerChange('snowVector', showSnow, setShowSnow)}
-        description={snowDescription}
-        renderEmptyDescription={true}
-      ></LegendItem>
     </LegendGrid>
   )
 }

web/src/features/fba/components/map/fbaMap.test.tsx

@@ -36,7 +36,6 @@ describe('FBAMap', () => {
           setZoomSource={function (): void {
             throw new Error('Function not implemented.')
           }}
-          snowDate={DateTime.now()}
         />
       </Provider>
     )

web/src/features/fba/components/map/featureStylers.ts

@@ -9,7 +9,6 @@ import { FireCenter, FireShape, FireShapeArea } from 'api/fbaAPI'
 
 const GREY_FILL = 'rgba(128, 128, 128, 0.8)'
 const EMPTY_FILL = 'rgba(0, 0, 0, 0.0)'
-const SNOW_FILL = 'rgba(255, 255, 255, 0.75)'
 export const ADVISORY_ORANGE_FILL = 'rgba(255, 147, 38, 0.4)'
 export const ADVISORY_RED_FILL = 'rgba(128, 0, 0, 0.4)'
 
@@ -151,9 +150,29 @@ export const getAdvisoryFillColor = (fireShapeStatus: FireShapeStatus) => {
   }
 }
 
+/**
+ * Given an OpenLayers feature from the fire zone unit label layer, return a label to display on the map.
+ * @param feature The feature of interest from the fire zone unit layer.
+ * @returns A string to be used as a label on the map.
+ */
+const getFireZoneUnitLabel = (feature: RenderFeature | ol.Feature<Geometry>) => {
+  const fireZoneId = feature.getProperties().FIRE_ZONE_
+  let fireZoneUnit = feature.getProperties().FIRE_ZON_1
+  // Fire zone unit labels sometimes include a geographic place name as a reference. eg. Skeena Zone (Kalum).
+  // If present, we want to display the geographic location on the second line of the label.
+  if (fireZoneUnit && fireZoneUnit.indexOf('(') > 0) {
+    const index = fireZoneUnit.indexOf('(')
+    const prefix = fireZoneUnit.substring(0, index).trim()
+    const suffix = fireZoneUnit.substring(index)
+    fireZoneUnit = `${prefix}\n${suffix}` 
+  }
+
+  return `${fireZoneId}-${fireZoneUnit}`
+}
+
 export const fireShapeLabelStyler = (selectedFireShape: FireShape | undefined) => {
   const a = (feature: RenderFeature | ol.Feature<Geometry>): Style => {
-    const text = feature.getProperties().FIRE_ZONE.replace(' Fire Zone', '\nFire Zone')
+    const text = getFireZoneUnitLabel(feature)
     const feature_fire_shape_id = feature.getProperties().OBJECTID
     const selected =
       !isUndefined(selectedFireShape) && feature_fire_shape_id === selectedFireShape.fire_shape_id ? true : false
@@ -230,15 +249,3 @@ export const hfiStyler = (feature: RenderFeature | ol.Feature<Geometry>): Style
   }
   return hfiStyle
 }
-
-// A styling function for the snow coverage pmtiles layer.
-export const snowStyler = (feature: RenderFeature | ol.Feature<Geometry>): Style => {
-  const snow = feature.get('snow')
-  const snowStyle = new Style({})
-  if (snow === 1) {
-    snowStyle.setFill(new Fill({ color: SNOW_FILL }))
-  } else {
-    snowStyle.setFill(new Fill({ color: EMPTY_FILL }))
-  }
-  return snowStyle
-}

web/src/features/fba/components/map/legend.test.tsx

@@ -8,17 +8,13 @@ describe('Legend', () => {
     const onToggleLayer = jest.fn()
     const setShowZoneStatus = jest.fn()
     const setShowHFI = jest.fn()
-    const setShowSnow = jest.fn()
     const { getByTestId } = render(
       <Legend
         onToggleLayer={onToggleLayer}
         setShowShapeStatus={setShowZoneStatus}
         setShowHFI={setShowHFI}
         showHFI={false}
         showShapeStatus={true}
-        showSnow={false}
-        setShowSnow={setShowSnow}
-        snowDescription="foo"
       />
     )
     const legendComponent = getByTestId('asa-map-legend')
@@ -39,17 +35,13 @@ describe('Legend', () => {
     const onToggleLayer = jest.fn()
     const setShowZoneStatus = jest.fn()
     const setShowHFI = jest.fn()
-    const setShowSnow = jest.fn()
     const { getByTestId } = render(
       <Legend
         onToggleLayer={onToggleLayer}
         setShowShapeStatus={setShowZoneStatus}
         setShowHFI={setShowHFI}
         showHFI={false}
         showShapeStatus={true}
-        showSnow={false}
-        setShowSnow={setShowSnow}
-        snowDescription="foo"
       />
     )
 

web/src/features/fba/pages/FireBehaviourAdvisoryPage.tsx

@@ -28,7 +28,6 @@ import { fetchFireShapeAreas } from 'features/fba/slices/fireZoneAreasSlice'
 import { fetchfireZoneElevationInfo } from 'features/fba/slices/fireZoneElevationInfoSlice'
 import { fetchfireZoneTPIStats } from 'features/fba/slices/fireZoneTPIStatsSlice'
 import { StyledFormControl } from 'components/StyledFormControl'
-import { getMostRecentProcessedSnowByDate } from 'api/snow'
 import InfoPanel from 'features/fba/components/infoPanel/InfoPanel'
 import FireZoneUnitSummary from 'features/fba/components/infoPanel/FireZoneUnitSummary'
 import { fetchProvincialSummary } from 'features/fba/slices/provincialSummarySlice'
@@ -63,22 +62,10 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
       : DateTime.now().setZone(`UTC${PST_UTC_OFFSET}`).plus({ days: 1 })
   )
   const [runType, setRunType] = useState(RunType.FORECAST)
-  const [snowDate, setSnowDate] = useState<DateTime | null>(null)
   const { mostRecentRunDate } = useSelector(selectRunDates)
   const { fireShapeAreas } = useSelector(selectFireShapeAreas)
   const [selectedFireZoneTPIStats, setSelectedFireZoneTPIStats] = useState<FireZoneTPIStats | null>(null)
 
-  // Query our API for the most recently processed snow coverage date <= the currently selected date.
-  const fetchLastProcessedSnow = async (selectedDate: DateTime) => {
-    const data = await getMostRecentProcessedSnowByDate(selectedDate)
-    if (isNull(data)) {
-      setSnowDate(null)
-    } else {
-      const newSnowDate = data.forDate
-      setSnowDate(newSnowDate)
-    }
-  }
-
   useEffect(() => {
     const findCenter = (id: string | null): FireCenter | undefined => {
       return fireCenters.find(center => center.id.toString() == id)
@@ -119,7 +106,6 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
     if (!isNull(doiISODate)) {
       dispatch(fetchSFMSRunDates(runType, doiISODate))
     }
-    fetchLastProcessedSnow(dateOfInterest)
   }, [dateOfInterest]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
@@ -241,7 +227,6 @@ const FireBehaviourAdvisoryPage: React.FunctionComponent = () => {
             advisoryThreshold={ADVISORY_THRESHOLD}
             setSelectedFireShape={setSelectedFireShape}
             fireShapeAreas={fireShapeAreas}
-            snowDate={snowDate}
             zoomSource={zoomSource}
             setZoomSource={setZoomSource}
           />

web/src/features/fba/pmtilesBuilder.ts

@@ -16,15 +16,3 @@ export const buildPMTilesURL = (for_date: DateTime, run_type: RunType, run_date:
 
   return PMTilesURL
 }
-
-/**
- * Builds the URL for snow coverage pmtiles layers.
- * @param snowDate The target date for snow coverage.
- * @returns A URL to the snow coverage PMTiles stored in S3
- */
-export const buildSnowPMTilesURL = (snowDate: DateTime) => {
-  const snowPMTilesUrl = `${PMTILES_BUCKET}snow/${snowDate.toISODate()}/snowCoverage${snowDate.toISODate({
-    format: 'basic'
-  })}.pmtiles`
-  return snowPMTilesUrl
-}