DBC22-1815: road conditions are no longer mapped by subtype

src/backend/apps/event/enums.py

@@ -27,13 +27,12 @@ class EVENT_SUB_TYPE:
     PARTLY_SNOW_PACKED = "PARTLY_SNOW_PACKED"
     MUD = "MUD"
     PLANNED_EVENT = "PLANNED_EVENT"
-    POOR_VISIBILITY = "POOR_VISIBILITY"    
+    POOR_VISIBILITY = "POOR_VISIBILITY"
     PARTLY_SNOW_COVERED = "PARTLY_SNOW_COVERED"
     DRIFTING_SNOW = "DRIFTING_SNOW"
     PASSABLE_WITH_CARE = "PASSABLE_WITH_CARE"
 
 
-
 EVENT_SUB_TYPE_CHOICES = (
     (EVENT_SUB_TYPE.ALMOST_IMPASSABLE, "Almost Impassable"),
     (EVENT_SUB_TYPE.FIRE, "Fire"),
@@ -127,17 +126,3 @@ class EVENT_DISPLAY_CATEGORY:
     FUTURE_DELAYS = 'futureEvents'
     ROAD_CONDITION = 'roadConditions'
     HIGHWAY_CAMERAS = 'highwayCams'
-
-
-EVENT_DISPLAY_CATEGORY_MAP = {
-    # Only road conditions are directly mapped currently
-    EVENT_SUB_TYPE.POOR_VISIBILITY: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.PARTLY_ICY: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.ICE_COVERED: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.SNOW_PACKED: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.PARTLY_SNOW_PACKED: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.PARTLY_SNOW_COVERED: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.DRIFTING_SNOW: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.ALMOST_IMPASSABLE: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-    EVENT_SUB_TYPE.PASSABLE_WITH_CARE: EVENT_DISPLAY_CATEGORY.ROAD_CONDITION,
-}

src/backend/apps/event/serializers.py

@@ -4,7 +4,6 @@
 from apps.event.enums import (
     EVENT_DIRECTION_DISPLAY,
     EVENT_DISPLAY_CATEGORY,
-    EVENT_DISPLAY_CATEGORY_MAP,
     EVENT_SEVERITY,
 )
 from apps.event.models import Event
@@ -55,8 +54,8 @@ def get_display_category(self, obj):
         if obj.closed:
             return EVENT_DISPLAY_CATEGORY.CLOSURE
 
-        if obj.event_sub_type in EVENT_DISPLAY_CATEGORY_MAP:
-            return EVENT_DISPLAY_CATEGORY_MAP[obj.event_sub_type]
+        if obj.id.startswith('drivebc.ca/DBCRCON'):
+            return EVENT_DISPLAY_CATEGORY.ROAD_CONDITION
 
         if obj.start and datetime.datetime.now(pytz.utc) < obj.start:
             return EVENT_DISPLAY_CATEGORY.FUTURE_DELAYS

src/backend/apps/feed/serializers.py

@@ -8,15 +8,15 @@
     EventRoadsField,
     FerryGeographyField,
     FerryPropertiesField,
+    RegionalWeatherPropertiesField,
     WebcamHighwayField,
     WebcamImageStatsField,
     WebcamLocationField,
     WebcamRegionField,
     WebcamRegionGroupField,
-    RegionalWeatherPropertiesField,
 )
-from rest_framework import serializers
 from apps.weather.models import RegionalWeather
+from rest_framework import serializers
 
 
 # Webcam
@@ -161,12 +161,16 @@ class FerryFeedSerializer(serializers.Serializer):
 class FerryAPISerializer(serializers.Serializer):
     features = FerryFeedSerializer(many=True)
 
+
 # Regional Weather
 class RegionalWeatherFeedSerializer(serializers.Serializer):
     properties = RegionalWeatherPropertiesField(source="*")
+
+
 class RegionalWeatherAPISerializer(serializers.Serializer):
     features = RegionalWeatherFeedSerializer(many=True)
 
+
 class RegionalWeatherSerializer(serializers.Serializer):
     class Meta:
         model = RegionalWeather
@@ -184,4 +188,4 @@ class Meta:
             'conditions',
             'forecast_group',
             'hourly_forecast_group',
-        )
+        )