Merge pull request #2641 from ziv17/2604-location-accuracy

2604 location accuracy
data-for-change · May 7, 2024 · e4beaa2 · e4beaa2
2 parents aeebaeb + b26f4b2
commit e4beaa2
Show file tree

Hide file tree

Showing 32 changed files with 333 additions and 113 deletions.
diff --git a/anyway/backend_constants.py b/anyway/backend_constants.py
@@ -81,6 +81,13 @@ class ResolutionCategories(Enum):
         ResolutionCategories.SUBURBAN_JUNCTION
     ]
 
+    RESOLUTION_ACCURACY_VALUES: dict = {
+        ResolutionCategories.SUBURBAN_JUNCTION: [1, 4],
+        ResolutionCategories.SUBURBAN_ROAD: [1, 4],
+        ResolutionCategories.URBAN_JUNCTION: [1, 3],
+        ResolutionCategories.STREET: [1, 3],
+    }
+
     class Source(Enum):
         @classmethod
         def _missing_(cls, value):

diff --git a/anyway/widgets/all_locations_widgets/accident_count_by_accident_type_widget.py b/anyway/widgets/all_locations_widgets/accident_count_by_accident_type_widget.py
@@ -25,21 +25,23 @@ def __init__(self, request_params: RequestParams):
 
     def generate_items(self) -> None:
         # noinspection PyUnresolvedReferences
-        self.items = AccidentCountByAccidentTypeWidget.get_accident_count_by_accident_type(
+        self.items = self.get_accident_count_by_accident_type(
             location_info=self.request_params.location_info,
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution
         )
 
     @staticmethod
-    def get_accident_count_by_accident_type(location_info, start_time, end_time):
+    def get_accident_count_by_accident_type(location_info, start_time, end_time, resolution):
         all_accident_type_count = get_accidents_stats(
             table_obj=AccidentMarkerView,
             filters=location_info,
             group_by="accident_type",
             count="accident_type",
             start_time=start_time,
             end_time=end_time,
+            resolution=resolution
         )
         merged_accident_type_count = [{"accident_type": "Collision", "count": 0}]
         for item in all_accident_type_count:

diff --git a/anyway/widgets/all_locations_widgets/accident_count_by_accident_year_widget.py b/anyway/widgets/all_locations_widgets/accident_count_by_accident_year_widget.py
@@ -37,6 +37,7 @@ def generate_items(self) -> None:
             count="accident_severity",
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
         res2 = sort_and_fill_gaps_for_stacked_bar(
             res1,

diff --git a/anyway/widgets/all_locations_widgets/accident_count_by_day_night_widget.py b/anyway/widgets/all_locations_widgets/accident_count_by_day_night_widget.py
@@ -28,6 +28,7 @@ def generate_items(self) -> None:
             count="day_night_hebrew",
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
 
     @staticmethod

diff --git a/anyway/widgets/all_locations_widgets/accident_count_by_severity_widget.py b/anyway/widgets/all_locations_widgets/accident_count_by_severity_widget.py
@@ -19,21 +19,23 @@ def __init__(self, request_params: RequestParams):
         self.rank = 1
 
     def generate_items(self) -> None:
-        self.items = AccidentCountBySeverityWidget.get_accident_count_by_severity(
-            self.request_params.location_info,
-            self.request_params.start_time,
-            self.request_params.end_time,
+        self.items = self.get_accident_count_by_severity(
+            location_info=self.request_params.location_info,
+            start_time=self.request_params.start_time,
+            end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
 
     @staticmethod
-    def get_accident_count_by_severity(location_info, start_time, end_time):
+    def get_accident_count_by_severity(location_info, start_time, end_time, resolution):
         count_by_severity = get_accidents_stats(
             table_obj=AccidentMarkerView,
             filters=location_info,
             group_by="accident_severity",
             count="accident_severity",
             start_time=start_time,
             end_time=end_time,
+            resolution=resolution
         )
         found_severities = [d["accident_severity"] for d in count_by_severity]
         items = {}

diff --git a/anyway/widgets/all_locations_widgets/accidents_heat_map_widget.py b/anyway/widgets/all_locations_widgets/accidents_heat_map_widget.py
@@ -5,7 +5,9 @@
 
 from anyway.request_params import RequestParams
 from anyway.backend_constants import AccidentSeverity, BE_CONST
-from anyway.widgets.widget_utils import get_query, get_location_text
+from anyway.widgets.widget_utils import (
+    get_query, get_location_text, add_resolution_location_accuracy_filter
+)
 from anyway.models import AccidentMarkerView
 from anyway.widgets.widget import register
 from anyway.widgets.all_locations_widgets.all_locations_widget import AllLocationsWidget
@@ -21,14 +23,17 @@ def __init__(self, request_params: RequestParams):
         self.rank = 7
 
     def generate_items(self) -> None:
-        accidents_heat_map_filters = self.request_params.location_info.copy()
+        accidents_heat_map_filters = add_resolution_location_accuracy_filter(
+            self.request_params.location_info.copy(),
+            self.request_params.resolution
+        )
         accidents_heat_map_filters["accident_severity"] = [
             # pylint: disable=no-member
             AccidentSeverity.FATAL.value,
             # pylint: disable=no-member
             AccidentSeverity.SEVERE.value,
         ]
-        self.items = AccidentsHeatMapWidget.get_accidents_heat_map(
+        self.items = self.get_accidents_heat_map(
             filters=accidents_heat_map_filters,
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,

diff --git a/anyway/widgets/all_locations_widgets/injured_count_by_accident_year_widget.py b/anyway/widgets/all_locations_widgets/injured_count_by_accident_year_widget.py
@@ -37,6 +37,7 @@ def generate_items(self) -> None:
             count="injury_severity",
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
         res2 = sort_and_fill_gaps_for_stacked_bar(
             res1,

diff --git a/anyway/widgets/all_locations_widgets/injured_count_by_severity_widget.py b/anyway/widgets/all_locations_widgets/injured_count_by_severity_widget.py
@@ -46,14 +46,14 @@ def get_injured_count_by_severity(
             InjurySeverity.SEVERE_INJURED.value,
             InjurySeverity.LIGHT_INJURED.value,
         ]
-
         count_by_severity = get_accidents_stats(
             table_obj=InvolvedMarkerView,
             filters=filters,
             group_by="injury_severity",
             count="injury_severity",
             start_time=start_time,
             end_time=end_time,
+            resolution=resolution,
         )
         found_severities = [d["injury_severity"] for d in count_by_severity]
         items = {}

diff --git a/...ay/widgets/all_locations_widgets/killed_and_injured_count_per_age_group_stacked_widget.py b/...ay/widgets/all_locations_widgets/killed_and_injured_count_per_age_group_stacked_widget.py
@@ -1,15 +1,13 @@
 from typing import Dict, List
-
+# noinspection PyProtectedMember
 from flask_babel import _
-
 from anyway.backend_constants import InjurySeverity, BE_CONST as BE
 from anyway.request_params import RequestParams
 from anyway.widgets.all_locations_widgets.killed_and_injured_count_per_age_group_widget_utils import (
     KilledAndInjuredCountPerAgeGroupWidgetUtils,
     AGE_RANGE_DICT,
 )
 from anyway.widgets.all_locations_widgets import killed_and_injured_count_per_age_group_widget_utils
-
 from anyway.widgets.all_locations_widgets.all_locations_widget import AllLocationsWidget
 from anyway.widgets.widget import register
 from anyway.widgets.widget_utils import (

diff --git a/anyway/widgets/all_locations_widgets/killed_and_injured_count_per_age_group_widget_utils.py b/anyway/widgets/all_locations_widgets/killed_and_injured_count_per_age_group_widget_utils.py
@@ -1,3 +1,4 @@
+import copy
 from collections import defaultdict, OrderedDict
 from typing import Dict, Tuple, Callable
 
@@ -10,7 +11,10 @@
 from anyway.models import InvolvedMarkerView
 from anyway.request_params import RequestParams
 from anyway.utilities import parse_age_from_range
-from anyway.widgets.widget_utils import get_expression_for_road_segment_location_fields
+from anyway.widgets.widget_utils import (
+    get_expression_for_fields,
+    add_resolution_location_accuracy_filter,
+)
 
 # RequestParams is not hashable, so we can't use functools.lru_cache
 cache_dict = OrderedDict()
@@ -105,20 +109,10 @@ def defaultdict_int_factory() -> Callable:
     def create_query_for_killed_and_injured_count_per_age_group(
         end_time, start_time, location_info, resolution
     ) -> BaseQuery:
-        if resolution == BE_CONST.ResolutionCategories.SUBURBAN_ROAD:
-            location_filter = get_expression_for_road_segment_location_fields(
-                {"road_segment_id": location_info["road_segment_id"]}, InvolvedMarkerView
-            )
-            # (InvolvedMarkerView.road1 == location_info["road1"])
-            # | (InvolvedMarkerView.road2 == location_info["road1"])
-            # ) & (InvolvedMarkerView.road_segment_name == location_info["road_segment_name"])
-        elif resolution == BE_CONST.ResolutionCategories.STREET:
-            location_filter = (
-                InvolvedMarkerView.involve_yishuv_name == location_info["yishuv_name"]
-            ) & (
-                (InvolvedMarkerView.street1_hebrew == location_info["street1_hebrew"])
-                | (InvolvedMarkerView.street2_hebrew == location_info["street1_hebrew"])
-            )
+        loc_filter = adapt_location_fields_to_involve_table(location_info)
+        loc_filter = add_resolution_location_accuracy_filter(loc_filter,
+                                                             resolution)
+        loc_ex = get_expression_for_fields(loc_filter, InvolvedMarkerView)
 
         query = (
             db.session.query(InvolvedMarkerView)
@@ -138,7 +132,7 @@ def create_query_for_killed_and_injured_count_per_age_group(
                     ]
                 )
             )
-            .filter(location_filter)
+            .filter(loc_ex)
             .group_by(InvolvedMarkerView.age_group, InvolvedMarkerView.injury_severity)
             .with_entities(
                 InvolvedMarkerView.age_group,
@@ -148,3 +142,11 @@ def create_query_for_killed_and_injured_count_per_age_group(
             .order_by(asc(InvolvedMarkerView.age_group))
         )
         return query
+
+
+def adapt_location_fields_to_involve_table(filter: dict) -> dict:
+    res = copy.copy(filter)
+    for field in ["yishuv_name", "yishuv_symbol"]:
+        if field in res:
+            res[f"accident_{field}"] = res.pop(field)
+    return res
diff --git a/anyway/widgets/all_locations_widgets/most_severe_accidents_table_widget.py b/anyway/widgets/all_locations_widgets/most_severe_accidents_table_widget.py
@@ -6,7 +6,9 @@
 from anyway.request_params import RequestParams
 from anyway.backend_constants import BE_CONST, AccidentSeverity, AccidentType, InjurySeverity
 from anyway.infographics_dictionaries import segment_dictionary
-from anyway.widgets.widget_utils import get_query, get_accidents_stats
+from anyway.widgets.widget_utils import (
+    get_query, get_accidents_stats, add_resolution_location_accuracy_filter,
+)
 from anyway.models import AccidentMarkerView, InvolvedMarkerView
 from anyway.widgets.all_locations_widgets.all_locations_widget import AllLocationsWidget
 from anyway.widgets.widget import register
@@ -28,6 +30,7 @@ def get_most_severe_accidents_with_entities(
     ]
     # pylint: disable=no-member
     filters["accident_severity"] = [AccidentSeverity.FATAL.value, AccidentSeverity.SEVERE.value]
+    filters = add_resolution_location_accuracy_filter(filters, resolution)
     query = get_query(table_obj, filters, start_time, end_time)
     query = query.with_entities(*entities)
     query = query.order_by(

diff --git a/anyway/widgets/no_location_widgets/vision_zero_bike_widget.py b/anyway/widgets/no_location_widgets/vision_zero_bike_widget.py
@@ -1,8 +1,8 @@
-from typing import Dict
 from anyway.widgets.widget import Widget
 from anyway.widgets.widget import register
 from anyway.request_params import RequestParams
 from typing import Dict, Optional
+# noinspection PyProtectedMember
 from flask_babel import _
 import logging
 

diff --git a/anyway/widgets/road_segment_widgets/accident_count_by_car_type_widget.py b/anyway/widgets/road_segment_widgets/accident_count_by_car_type_widget.py
@@ -8,6 +8,7 @@
 
 import anyway.widgets.widget_utils as widget_utils
 from anyway.backend_constants import BE_CONST
+RC = BE_CONST.ResolutionCategories
 from anyway.infographics_dictionaries import segment_dictionary
 from anyway.models import VehicleMarkerView
 from anyway.request_params import RequestParams
@@ -44,6 +45,7 @@ def get_stats_accidents_by_car_type_with_national_data(
                 count="provider_and_id",
                 start_time=request_params.start_time,
                 end_time=request_params.end_time,
+                resolution=request_params.resolution,
             )
 
         start_time = request_params.start_time
@@ -127,6 +129,7 @@ def percentage_accidents_by_car_type_national_data_cache(
             count="provider_and_id",
             start_time=start_time,
             end_time=end_time,
+            resolution=RC.SUBURBAN_ROAD,
         )
         return AccidentCountByCarTypeWidget.percentage_accidents_by_car_type(
             vehicle_grouped_by_type_count_unique

diff --git a/anyway/widgets/road_segment_widgets/accident_count_by_driver_type_widget.py b/anyway/widgets/road_segment_widgets/accident_count_by_driver_type_widget.py
@@ -28,7 +28,7 @@ def generate_items(self) -> None:
         )
 
     @staticmethod
-    def count_accidents_by_driver_type(request_params):
+    def count_accidents_by_driver_type(request_params: RequestParams):
         filters = get_injured_filters(request_params)
         filters["involved_type"] = [
             consts.InvolvedType.DRIVER.value,
@@ -42,6 +42,7 @@ def count_accidents_by_driver_type(request_params):
             cnt_distinct=True,
             start_time=request_params.start_time,
             end_time=request_params.end_time,
+            resolution=request_params.resolution,
         )
         driver_types = defaultdict(int)
         for item in involved_by_vehicle_type_data:

diff --git a/anyway/widgets/road_segment_widgets/accident_count_by_hour_widget.py b/anyway/widgets/road_segment_widgets/accident_count_by_hour_widget.py
@@ -22,6 +22,7 @@ def generate_items(self) -> None:
             count="accident_hour",
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
 
     @staticmethod

diff --git a/anyway/widgets/road_segment_widgets/accident_count_by_road_light_widget.py b/anyway/widgets/road_segment_widgets/accident_count_by_road_light_widget.py
@@ -24,6 +24,7 @@ def generate_items(self) -> None:
             count="road_light_hebrew",
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         )
 
     @staticmethod

diff --git a/anyway/widgets/road_segment_widgets/accident_type_vehicle_type_road_comparison_widget.py b/anyway/widgets/road_segment_widgets/accident_type_vehicle_type_road_comparison_widget.py
@@ -4,10 +4,16 @@
 
 from flask_babel import _
 from sqlalchemy import func, distinct, desc
-
+from anyway.backend_constants import BE_CONST
+RC = BE_CONST.ResolutionCategories
 from anyway.request_params import RequestParams
 from anyway.app_and_db import db
-from anyway.widgets.widget_utils import get_query, run_query
+from anyway.widgets.widget_utils import (
+    get_query,
+    run_query,
+    add_resolution_location_accuracy_filter,
+    get_expression_for_fields,
+)
 from anyway.models import VehicleMarkerView, AccidentType
 from anyway.vehicle_type import VehicleCategory
 from anyway.widgets.road_segment_widgets.road_segment_widget import RoadSegmentWidget
@@ -55,6 +61,9 @@ def accident_type_road_vs_all_count(
         road_query = all_roads_query.filter(
             (VehicleMarkerView.road1 == road_number) | (VehicleMarkerView.road2 == road_number)
         )
+        loc_filter = add_resolution_location_accuracy_filter(None, RC.SUBURBAN_ROAD)
+        loc_ex = get_expression_for_fields(loc_filter, VehicleMarkerView)
+        road_query = road_query.filter(loc_ex)
         road_query_result = run_query(road_query)
         road_sum_accidents = 0
         types_to_report = []
@@ -84,12 +93,16 @@ def get_accident_count_by_vehicle_type_query(
         num_accidents_label: str,
         vehicle_types: List[int],
     ) -> db.session.query:
+        filters = add_resolution_location_accuracy_filter(
+            {VehicleMarkerView.vehicle_type.name: vehicle_types},
+            RC.SUBURBAN_ROAD
+        )
         return (
             get_query(
                 table_obj=VehicleMarkerView,
                 start_time=start_time,
                 end_time=end_time,
-                filters={VehicleMarkerView.vehicle_type.name: vehicle_types},
+                filters=filters,
             )
             .with_entities(
                 VehicleMarkerView.accident_type,

diff --git a/anyway/widgets/road_segment_widgets/fatal_accident_yoy_same_month.py b/anyway/widgets/road_segment_widgets/fatal_accident_yoy_same_month.py
@@ -32,6 +32,7 @@ def generate_items(self) -> None:
             count=InvolvedMarkerView.injury_severity.name,
             start_time=self.request_params.start_time,
             end_time=self.request_params.end_time,
+            resolution=self.request_params.resolution,
         ):
             structured_data_list.append(
                 {

diff --git a/anyway/widgets/road_segment_widgets/front_to_side_accidents_by_severity.py b/anyway/widgets/road_segment_widgets/front_to_side_accidents_by_severity.py
@@ -5,12 +5,13 @@
 from flask_babel import _
 from sqlalchemy import case, func, distinct
 
-from anyway.backend_constants import AccidentType, AccidentSeverity
+from anyway.backend_constants import AccidentType, AccidentSeverity, BE_CONST
+RC = BE_CONST.ResolutionCategories
 from anyway.models import AccidentMarkerView
 from anyway.request_params import RequestParams
 from anyway.widgets.road_segment_widgets.road_segment_widget import RoadSegmentWidget
 from anyway.widgets.widget import register
-from anyway.widgets.widget_utils import get_query
+from anyway.widgets.widget_utils import get_query, add_resolution_location_accuracy_filter
 
 ROAD_SEGMENT_ACCIDENTS = "specific_road_segment_accidents"
 
@@ -100,9 +101,13 @@ def _get_raw_front_to_side_accidents(
                 )
             ]
         )
+        filters = add_resolution_location_accuracy_filter(
+            {"road_segment_id": road_segment_id},
+            RC.SUBURBAN_ROAD,
+        )
         query = get_query(
             table_obj=AccidentMarkerView,
-            filters={"road_segment_id": road_segment_id},
+            filters=filters,
             start_time=start_date,
             end_time=end_date,
         )