Merge pull request #3913 from hove-io/fix_cycle_lane_length_2

[Jormun] expose cycle lane length in street information and fix cycle lane length

Author: Patrick Qian

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

@@ -219,6 +219,7 @@ def get_via_uri(self, obj):
 class StreetInformationSerializer(PbNestedSerializer):
     geojson_offset = jsonschema.MethodField(schema_type=int, display_none=False)
     cycle_path_type = jsonschema.MethodField(schema_type=str, display_none=False)
+    length = jsonschema.MethodField(schema_type=float, display_none=False)
 
     def get_cycle_path_type(self, obj):
         if obj.HasField(str('cycle_path_type')):
@@ -232,6 +233,12 @@ def get_geojson_offset(self, obj):
         else:
             return None
 
+    def get_length(self, obj):
+        if obj.HasField(str('length')):
+            return float("{:.2f}".format(obj.length))
+        else:
+            return None
+
 
 class ElevationSerializer(PbNestedSerializer):
     distance_from_start = RoundedField(display_none=True)

source/jormungandr/jormungandr/street_network/asgard.py

@@ -255,15 +255,19 @@ def _is_cycle_lane(path):
 
             return False
 
-        # We have one journey and several sections in direct path
-        for section in response.journeys[0].sections:
-            # do not add cycle_lane_length for bss_rent/bss_return & walking sections
-            if section.type == response_pb2.STREET_NETWORK and section.street_network.mode == response_pb2.Bike:
-                cycle_lane_length = sum(
-                    (s.length for s in section.street_network.street_information if _is_cycle_lane(s))
-                )
-                # Since path.length are doubles and we want an int32 in the proto
-                section.cycle_lane_length = int(cycle_lane_length)
+        # We have multiple journeys and multiple sections in direct path
+        for journey in response.journeys:
+            for section in journey.sections:
+                # do not add cycle_lane_length for bss_rent/bss_return & walking sections
+                if (
+                    section.type == response_pb2.STREET_NETWORK
+                    and section.street_network.mode == response_pb2.Bike
+                ):
+                    cycle_lane_length = sum(
+                        (s.length for s in section.street_network.street_information if _is_cycle_lane(s))
+                    )
+                    # Since path.length are doubles and we want an int32 in the proto
+                    section.cycle_lane_length = int(cycle_lane_length)
 
         return response