Merge pull request #2916 from ziv17/new-cbs-format

Add street1 and street2 to involved query result.

Author: ziv17

anyway/views/safety_data/involved_query.py

@@ -81,7 +81,7 @@ class InvolvedQuery:
     vehicle_type_to_str[35] = VehicleTypeHebrew("קלנועית", "קלנועית")
     vehicle_type_to_str[36] = VehicleTypeHebrew("אופניים חשמליים", "אופניים חשמליים")
     vehicle_type_to_str[37] = VehicleTypeHebrew("משאית", "משא 10.0 עד 12.0 טון")
-    
+
     vehicle_types_for_bit_map = [
         index
         for index, vehicle_type in enumerate(vehicle_type_to_str)
@@ -130,6 +130,8 @@ def get_base_query(self):
                 OneLane.one_lane_hebrew,
                 SDAccident.road1.label("road1"),
                 SDAccident.road2.label("road2"),
+                SDAccident.street1.label("street1"),
+                SDAccident.street2.label("street2"),
                 (RoadSegments.from_name + " - " + RoadSegments.to_name).label("road_segment_name"),
                 RoadType.road_type_hebrew,
                 RoadWidth.road_width_hebrew,
@@ -313,7 +315,7 @@ def nan_to_none(v):
         for k in ["latitude", "longitude"]:
             v = d[k]
             d[k] = f"{v:.13f}" if not math.isnan(v) else ""
-        for k in ["TEST-vehicle_type", "road1", "road2"]:
+        for k in ["TEST-vehicle_type", "road1", "road2", "street1", "street2"]:
             d[k] = nan_to_none(d[k])
 
     def get_injured_type_enriched_hebrew(

docs/safety_data/safety_data_api.yaml

@@ -392,6 +392,14 @@ components:
         road2:
           type: integer
           example: 2
+        street1:
+          type: integer
+          nullable: true
+          example: 2551
+        street2:
+          type: integer
+          nullable: true
+          example: 2552
         road_segment_name:
           type: string
           example: מחלף דרוריום - צמת קדימה

tests/test_involved_query.py

@@ -57,7 +57,11 @@ def test_e2e(self):
         self.assertEqual("200 OK", actual.status, "3")
         self.maxDiff = None
         res = actual.json["data"][0]
+        self.assertEqual(2551, res["street1"])
+        self.assertIsNone(res["street2"])
         res.pop("street1_hebrew")
+        res.pop("street1")
+        res.pop("street2")
         self.assertEqual(self.involved_result, res, "4")
 
         actual = test_client.get("/involved/groupby?sy=2014&ey=2014&gb=year&gb2=lca&city=5000,1&sort=d")