feat: order extra_info according to fields order

GIScience · May 15, 2024 · 58b2848 · 58b2848
1 parent 15b4d0c
commit 58b2848
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ORStools/common/directions_core.py b/ORStools/common/directions_core.py
@@ -250,14 +250,15 @@ def build_default_parameters(
     return params
 
 
-def get_extra_info_features_directions(response: dict):
+def get_extra_info_features_directions(response: dict, extra_info_order: list[str]):
+    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}
-    for key in extra_info:
+    extras_list = {i: [] for i in extra_info_order}
+    for key in extra_info_order:
         values = extra_info[key]["values"]
         for val in values:
             for i in range(val[0], val[1]):

diff --git a/ORStools/proc/directions_points_layer_proc.py b/ORStools/proc/directions_points_layer_proc.py
@@ -155,6 +155,7 @@ def processAlgorithm(self, parameters, context, feedback):
             **get_fields_options, line=True, extra_info=extra_info
         )
 
+
         (sink, dest_id) = self.parameterAsSink(
             parameters,
             self.OUT,
@@ -219,7 +220,7 @@ def sort(f):
                     )
 
                     if extra_info:
-                        feats = directions_core.get_extra_info_features_directions(response)
+                        feats = directions_core.get_extra_info_features_directions(response, extra_info)
                         for feat in feats:
                             sink.addFeature(feat)
                     else: