Merge pull request #4338 from hove-io/fix_traversal_time_parkmode

Fix traversal time parkmode

Author: azime

source/jormungandr/jormungandr/interfaces/v1/serializer/journey.py

@@ -367,7 +367,7 @@ def get_to(self, obj):
         if obj.HasField(str('type')):
             enum = obj.DESCRIPTOR.fields_by_name['type'].enum_type.values_by_number
             ret_value = enum[getattr(obj, 'type')].name
-            if ret_value == 'WAITING':
+            if ret_value == 'WAITING' or (ret_value == 'PARK' and 'section_bike_park' in obj.id):
                 return None
         return PlaceSerializer(obj.destination).data
 
@@ -377,7 +377,7 @@ def get__from(self, obj):
         if obj.HasField(str('type')):
             enum = obj.DESCRIPTOR.fields_by_name['type'].enum_type.values_by_number
             ret_value = enum[getattr(obj, 'type')].name
-            if ret_value == 'WAITING':
+            if ret_value == 'WAITING' or (ret_value == 'PARK' and 'section_bike_park' in obj.id):
                 return None
         return PlaceSerializer(obj.origin).data
 

source/jormungandr/jormungandr/scenarios/helper_classes/helper_utils.py

@@ -597,9 +597,13 @@ def _update_fallback_with_bike_mode(
                     [fallback_sections[-1].street_network.path_items[-1]]
                 )
                 fallback_sections[-1].street_network.path_items.pop()
-                target_section.duration += via_pt_access.access_point.traversal_time
-                target_section.length += via_pt_access.access_point.length
+                # update the duration and length of the sections
+                # the duration and length of the target section is the duration and length of the access point
+                # the duration and length of the fallback section is the duration and length of the street network minus the duration and length of the access point
+                target_section.duration = via_pt_access.access_point.traversal_time
+                target_section.length = via_pt_access.access_point.length
                 fallback_sections[-1].duration -= via_pt_access.access_point.traversal_time
+                fallback_sections[-1].length -= via_pt_access.access_point.length
             else:
                 fallback_sections[-1].vias.add().CopyFrom(via_pt_access.access_point)
 

source/jormungandr/tests/routing_tests_experimental.py

@@ -1706,3 +1706,62 @@ def test_bike_with_parking_penalty_multiple_first_section_mode_park_mode_park_an
 
             assert journey['sections'][0]['mode'] in ['bike', 'walking']
             assert journey['sections'][1]['type'] != 'park'
+
+    def test_bike_park_section_from_to_none(self):
+        query = (
+            sub_query
+            + "&datetime=20120614T075000"
+            + "&first_section_mode[]=bike"
+            + "&bike_speed=0.05"
+            + "&park_mode=on_street"
+            + "&_access_points=true"
+        )
+
+        response = self.query_region(query)
+        check_best(response)
+
+        journeys = get_not_null(response, 'journeys')
+        pt_journeys = [j for j in journeys if 'bike' in j['tags'] and 'non_pt_bike' not in j['tags']]
+        assert len(pt_journeys) > 0
+        print("Blablab", len(pt_journeys[0]["sections"]))
+        for journey in pt_journeys:
+            assert journey['sections'][1]['type'] == 'park'
+            assert 'from' not in journey['sections'][1]
+            assert 'to' not in journey['sections'][1]
+
+    def test_bike_traversal_time(self):
+        query = (
+            sub_query
+            + "&datetime=20120614T075000"
+            + "&first_section_mode[]=bike"
+            + "&bike_speed=0.05"
+            + "&debug=true"
+            + "&_access_points=true"
+        )
+
+        # We begin with a normal request to get the fallback duration without the park_mode
+        response = self.query_region(query)
+        check_best(response)
+        journeys = get_not_null(response, 'journeys')
+        pt_journeys = [j for j in journeys if 'bike' in j['tags'] and 'non_pt_bike' not in j['tags']]
+        assert len(pt_journeys) == 1
+
+        query = (
+            sub_query
+            + "&datetime=20120614T075000"
+            + "&first_section_mode[]=bike"
+            + "&bike_speed=0.05"
+            + "&park_mode=on_street"
+            + "&_access_points=true"
+        )
+
+        # With a request with the park_mode, we expect the same duration as the previous request if we add the first and the street network section following the park section
+        response_2 = self.query_region(query)
+        check_best(response_2)
+        journeys_2 = get_not_null(response_2, 'journeys')
+        pt_journeys_2 = [j for j in journeys_2 if 'bike' in j['tags'] and 'non_pt_bike' not in j['tags']]
+        assert len(pt_journeys_2) == 1
+        assert (
+            pt_journeys[0]["sections"][0]["duration"]
+            == pt_journeys_2[0]["sections"][0]["duration"] + pt_journeys_2[0]["sections"][2]["duration"]
+        )