diff --git a/web/package.json b/web/package.json
index a8ea626c9..ae9c1af5a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -52,7 +52,7 @@
"match-sorter": "^6.3.1",
"nyc": "^17.0.0",
"ol": "10.0.0",
- "ol-pmtiles": "^0.5.0",
+ "ol-pmtiles": "^1.0.1",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
@@ -111,4 +111,4 @@
]
},
"packageManager": "yarn@4.3.1"
-}
\ No newline at end of file
+}
diff --git a/web/src/api/fbaAPI.ts b/web/src/api/fbaAPI.ts
index 174db6dd3..191714980 100644
--- a/web/src/api/fbaAPI.ts
+++ b/web/src/api/fbaAPI.ts
@@ -1,7 +1,11 @@
import axios, { raster } from 'api/axios'
-import { RunType } from 'features/fba/pages/FireBehaviourAdvisoryPage'
import { DateTime } from 'luxon'
+export enum RunType {
+ FORECAST = 'FORECAST',
+ ACTUAL = 'ACTUAL'
+}
+
export interface FireCenterStation {
code: number
name: string
@@ -30,7 +34,6 @@ export interface AdvisoryCriticalHours {
end_time?: number
}
-
export interface FireZoneFuelStats {
fuel_type: FuelType
threshold: HfiThreshold
@@ -149,7 +152,6 @@ export async function getAllRunDates(run_type: RunType, for_date: string): Promi
return data
}
-
export async function getFireCentreHFIStats(
run_type: RunType,
for_date: string,
diff --git a/web/src/features/fba/components/ActualForecastControl.tsx b/web/src/features/fba/components/ActualForecastControl.tsx
index 0f039dc17..66a6c7319 100644
--- a/web/src/features/fba/components/ActualForecastControl.tsx
+++ b/web/src/features/fba/components/ActualForecastControl.tsx
@@ -1,8 +1,8 @@
import { FormControl, FormControlLabel, FormLabel, Radio, RadioGroup } from '@mui/material'
import React from 'react'
-import { RunType } from 'features/fba/pages/FireBehaviourAdvisoryPage'
import { isNull } from 'lodash'
import { theme } from 'app/theme'
+import { RunType } from '@/api/fbaAPI'
export interface ActualForecastControlProps {
runType: RunType
diff --git a/web/src/features/fba/components/actualForecastControl.test.tsx b/web/src/features/fba/components/actualForecastControl.test.tsx
index 2b48e5b4b..b853cb1ce 100644
--- a/web/src/features/fba/components/actualForecastControl.test.tsx
+++ b/web/src/features/fba/components/actualForecastControl.test.tsx
@@ -1,8 +1,8 @@
import React from 'react'
import { render, fireEvent } from '@testing-library/react'
import ActualForecastControl from './ActualForecastControl'
-import { RunType } from 'features/fba/pages/FireBehaviourAdvisoryPage'
import { vi } from 'vitest'
+import { RunType } from '@/api/fbaAPI'
describe('ActualForecastControl', () => {
const mockSetRunType = vi.fn()
diff --git a/web/src/features/fba/components/map/FBAMap.tsx b/web/src/features/fba/components/map/FBAMap.tsx
index 1685238f7..15991a362 100644
--- a/web/src/features/fba/components/map/FBAMap.tsx
+++ b/web/src/features/fba/components/map/FBAMap.tsx
@@ -1,13 +1,11 @@
-import * as ol from 'ol'
+import { PMTilesVectorSource } from 'ol-pmtiles'
+import { Map, View } from 'ol'
import 'ol/ol.css'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import * as olpmtiles from 'ol-pmtiles'
import { defaults as defaultControls, FullScreen } from 'ol/control'
import { fromLonLat } from 'ol/proj'
import { boundingExtent } from 'ol/extent'
import ScaleLine from 'ol/control/ScaleLine'
-import OLVectorLayer from 'ol/layer/Vector'
+import VectorLayer from 'ol/layer/Vector'
import VectorTileLayer from 'ol/layer/VectorTile'
import VectorSource from 'ol/source/Vector'
import GeoJSON from 'ol/format/GeoJSON'
@@ -16,8 +14,8 @@ import React, { useEffect, useRef, useState } from 'react'
import { ErrorBoundary } from 'components'
import { selectFireWeatherStations, selectRunDates } from 'app/rootReducer'
import { source as baseMapSource } from 'features/fireWeather/components/maps/constants'
-import Tile from 'ol/layer/Tile'
-import { FireCenter, FireShape, FireShapeArea } from 'api/fbaAPI'
+import TileLayer from 'ol/layer/Tile'
+import { FireCenter, FireShape, FireShapeArea, RunType } from 'api/fbaAPI'
import { extentsMap } from 'features/fba/fireCentreExtents'
import {
fireCentreStyler,
@@ -32,14 +30,13 @@ import {
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 } from 'features/fba/pmtilesBuilder'
import { isUndefined, cloneDeep, isNull } from 'lodash'
import { Box } from '@mui/material'
import Legend from 'features/fba/components/map/Legend'
import ScalebarContainer from 'features/fba/components/map/ScaleBarContainer'
import { fireZoneExtentsMap } from 'features/fba/fireZoneUnitExtents'
-export const MapContext = React.createContext
(null)
+export const MapContext = React.createContext