Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify involve_yishuv_name to accident_yishuv_name in widgets filters #2667

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Modify involve_yishuv_name to accident_yishuv_name in widgets filters #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions anyway/widgets/all_locations_widgets/killed_and_injured_count_per_age_group_widget_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ def filter_and_group_injured_count_per_age_group(
cache_key = None # prevent pylint warning

if request_params.resolution == BE_CONST.ResolutionCategories.STREET:
involve_yishuv_name = request_params.location_info["yishuv_name"]
accident_yishuv_name = request_params.location_info["yishuv_name"]
street1_hebrew = request_params.location_info["street1_hebrew"]
cache_key = (involve_yishuv_name, street1_hebrew, start_time, end_time)
cache_key = (accident_yishuv_name, street1_hebrew, start_time, end_time)

elif request_params.resolution == BE_CONST.ResolutionCategories.SUBURBAN_ROAD:
road_number = request_params.location_info["road1"]
Expand Down
6 changes: 3 additions & 3 deletions anyway/widgets/urban_widgets/severe_fatal_count_by_vehicle_by_year_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def separate_data(yishuv, start_time, end_time, resolution) -> Dict[str, Any]:
InjurySeverity.SEVERE_INJURED.value,
],
"involve_vehicle_type": VehicleType.ELECTRIC_BIKE.value,
"involve_yishuv_name": yishuv,
"accident_yishuv_name": yishuv,
},
group_by="accident_year",
count="accident_year",
Expand All @@ -55,7 +55,7 @@ def separate_data(yishuv, start_time, end_time, resolution) -> Dict[str, Any]:
InjurySeverity.SEVERE_INJURED.value,
],
"involve_vehicle_type": VehicleType.BIKE.value,
"involve_yishuv_name": yishuv,
"accident_yishuv_name": yishuv,
},
group_by="accident_year",
count="accident_year",
Expand All @@ -71,7 +71,7 @@ def separate_data(yishuv, start_time, end_time, resolution) -> Dict[str, Any]:
InjurySeverity.SEVERE_INJURED.value,
],
"involve_vehicle_type": VehicleType.ELECTRIC_SCOOTER.value,
"involve_yishuv_name": yishuv,
"accident_yishuv_name": yishuv,
},
group_by="accident_year",
count="accident_year",
Expand Down
2 changes: 1 addition & 1 deletion anyway/widgets/urban_widgets/small_motor_severe_fatal_count_by_year_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_motor_stats(location_info, start_time, end_time, resolution):
InjurySeverity.SEVERE_INJURED.value,
],
"involve_vehicle_type": VehicleCategory.BICYCLE_AND_SMALL_MOTOR.get_codes(),
"involve_yishuv_name": location_info,
"accident_yishuv_name": location_info,
},
group_by="accident_year",
count="accident_year",
Expand Down
4 changes: 2 additions & 2 deletions anyway/widgets/urban_widgets/urban_crosswalk_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_crosswalk(yishuv, street, start_time, end_time, resolution) -> Dict[str,
InjurySeverity.SEVERE_INJURED.value,
],
"cross_location": CrossCategory.CROSSWALK.get_codes(),
"involve_yishuv_name": yishuv,
"accident_yishuv_name": yishuv,
"street1_hebrew": street,
},
group_by="street1_hebrew",
Expand All @@ -56,7 +56,7 @@ def get_crosswalk(yishuv, street, start_time, end_time, resolution) -> Dict[str,
InjurySeverity.SEVERE_INJURED.value,
],
"cross_location": CrossCategory.NONE.get_codes(),
"involve_yishuv_name": yishuv,
"accident_yishuv_name": yishuv,
"street1_hebrew": street,
},
group_by="street1_hebrew",
Expand Down
2 changes: 1 addition & 1 deletion anyway/widgets/widget_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def get_involved_marker_view_location_filters(
):
filters = {}
if resolution == BE_CONST.ResolutionCategories.STREET:
filters["involve_yishuv_name"] = location_info.get("yishuv_name")
filters["accident_yishuv_name"] = location_info.get("yishuv_name")
filters["street1_hebrew"] = location_info.get("street1_hebrew")
elif resolution == BE_CONST.ResolutionCategories.SUBURBAN_ROAD:
filters["road1"] = location_info.get("road1")
Expand Down
Loading