Skip to content

Commit f4ea6bf

Browse files
committed
DBC22-6845: updated wildfire locations feed to use new api endpoint
1 parent 5ee20b5 commit f4ea6bf

18 files changed

Lines changed: 1079 additions & 444 deletions

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ DRIVEBC_WEATHER_AREAS_API_BASE_URL=<weather areas api base url>
7676
DRIVEBC_WEATHER_FORECAST_API_BASE_URL=<weather forecast api base url>
7777
DRIVEBC_COSTAL_FERRY_DATA_URL=<costal ferry data url>
7878
DRIVEBC_OPENMAPS_API_URL=<openmaps api url>
79+
DRIVEBC_WILDFIRE_API_URL=<wildfire api url>
7980
WEATHER_CLIENT_ID=<weather client id>
8081
WEATHER_CLIENT_SECRET=<weather client secret>
8182
DRIVEBC_DMS_API_BASE_URL=<dms api url>

src/backend/apps/feed/client.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
REGIONAL_WEATHER_AREAS,
2020
REST_STOP,
2121
WILDFIRE,
22+
WILDFIRE_AREAS,
2223
)
2324
from apps.feed.serializers import (
2425
CarsClosureSerializer,
@@ -32,6 +33,7 @@
3233
from apps.shared.serializers import DistrictAPISerializer
3334
from apps.weather.models import CurrentWeather
3435
from apps.webcam.models import CameraSource
36+
from apps.wildfire.enums import WILDFIRE_FETCH_STAGES
3537
from apps.wildfire.serializers import WildfireAreaSerializer, WildfirePointSerializer
3638
from django.conf import settings
3739
from django.contrib.gis.geos import Point
@@ -117,6 +119,9 @@ def __init__(self):
117119
"base_url": settings.DRIVEBC_OPENMAPS_API_URL,
118120
},
119121
WILDFIRE: {
122+
"base_url": settings.DRIVEBC_WILDFIRE_API_URL,
123+
},
124+
WILDFIRE_AREAS: {
120125
"base_url": settings.DRIVEBC_OPENMAPS_API_URL,
121126
},
122127
DMS: {
@@ -614,7 +619,7 @@ def get_district_list(self):
614619

615620
def get_wildfire_area_list(self):
616621
return self.get_list_feed(
617-
WILDFIRE,
622+
WILDFIRE_AREAS,
618623
'geo/ows',
619624
WildfireAreaSerializer,
620625
{
@@ -627,19 +632,12 @@ def get_wildfire_area_list(self):
627632
}
628633
)
629634

630-
def get_wildfire_location_list(self):
635+
def get_wildfire_list(self):
631636
return self.get_list_feed(
632637
WILDFIRE,
633-
'geo/ows',
638+
'',
634639
WildfirePointSerializer,
635-
{
636-
"service": "WFS",
637-
"version": "1.1.0",
638-
"request": "GetFeature",
639-
"typeName": "pub:WHSE_LAND_AND_NATURAL_RESOURCE.PROT_CURRENT_FIRE_PNTS_SP",
640-
"srsName": "EPSG:4326",
641-
"outputFormat": "json",
642-
}
640+
[("stageOfControlList", stage.name) for stage in WILDFIRE_FETCH_STAGES]
643641
)
644642

645643
def get_dms_list(self):

src/backend/apps/feed/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
REST_STOP = "rest_stop"
1212
DISTRICT_BOUNDARIES = "district_boundaries"
1313
WILDFIRE = "wildfire"
14+
WILDFIRE_AREAS = "wildfire_areas"
1415
DMS = "dms"
1516

1617
DIRECTIONS = {

0 commit comments

Comments
 (0)