fix: to_id and_from_id not working correctly

Author: merydian

ORStools/common/directions_core.py

@@ -81,6 +81,7 @@ def get_fields(
     to_name: str = "TO_ID",
     line: bool = False,
     extra_info: list = [],
+    two_layers: bool = False,
 ) -> QgsFields:
     """
     Builds output fields for directions response layer.
@@ -114,6 +115,8 @@ def get_fields(
         fields.append(QgsField(from_name, from_type))
     if not line:
         fields.append(QgsField(to_name, to_type))
+    if two_layers:
+        fields.append(QgsField(from_name, from_type))
     for info in extra_info:
         field_type = QVariant.Int
         if info in ["waytype", "surface", "waycategory", "roadaccessrestrictions", "steepness"]:
@@ -260,15 +263,16 @@ def build_default_parameters(
     return params
 
 
-def get_extra_info_features_directions(response: dict, extra_info_order: list[str]):
+def get_extra_info_features_directions(
+    response: dict, extra_info_order: list[str], to_from_values: list
+):
     extra_info_order = [
         key if key != "waytype" else "waytypes" for key in extra_info_order
     ]  # inconsistency in API
     response_mini = response["features"][0]
     coordinates = response_mini["geometry"]["coordinates"]
     feats = list()
     extra_info = response_mini["properties"]["extras"]
-    logger.log(str(extra_info))
     extras_list = {i: [] for i in extra_info_order}
     for key in extra_info_order:
         try:
@@ -290,7 +294,7 @@ def get_extra_info_features_directions(response: dict, extra_info_order: list[st
             extra = extras_list[j]
             attr = extra[i]
             attrs.append(attr)
-        feat.setAttributes(attrs)
+        feat.setAttributes([to_from_values[0], to_from_values[1]] + attrs)
         feats.append(feat)
 
     return feats

ORStools/proc/directions_points_layers_proc.py

@@ -212,7 +212,9 @@ def sort_end(f):
             field_types.update({"from_type": source_field.type()})
         if destination_field:
             field_types.update({"to_type": destination_field.type()})
-        sink_fields = directions_core.get_fields(**field_types, extra_info=extra_info)
+        sink_fields = directions_core.get_fields(
+            **field_types, extra_info=extra_info, two_layers=True
+        )
 
         (sink, dest_id) = self.parameterAsSink(
             parameters,
@@ -244,7 +246,9 @@ def sort_end(f):
                 continue
 
             if extra_info:
-                feats = directions_core.get_extra_info_features_directions(response, extra_info)
+                feats = directions_core.get_extra_info_features_directions(
+                    response, extra_info, values
+                )
                 for feat in feats:
                     sink.addFeature(feat)
             else: