feat: add support for csv_column

GIScience · May 3, 2024 · aa52090 · aa52090
1 parent f616734
commit aa52090
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/ORStools/proc/directions_lines_proc.py b/ORStools/proc/directions_lines_proc.py
@@ -36,6 +36,7 @@
     QgsProcessingParameterEnum,
     QgsPointXY,
     QgsProcessingParameterNumber,
+    QgsProcessingParameterString,
 )
 
 from ORStools.common import directions_core, PROFILES, PREFERENCES, OPTIMIZATION_MODES, EXTRA_INFOS
@@ -59,6 +60,7 @@ def __init__(self):
         self.IN_MODE = "INPUT_MODE"
         self.EXTRA_INFO = "EXTRA_INFO"
         self.CSV_FACTOR = "CSV_FACTOR"
+        self.CSV_COLUMN = "CSV_COLUMN"
         self.PARAMETERS = [
             QgsProcessingParameterFeatureSource(
                 name=self.IN_LINES,
@@ -98,6 +100,13 @@ def __init__(self):
                 type=QgsProcessingParameterNumber.Double,
                 minValue=0,
                 maxValue=1,
+                defaultValue=None,
+                optional=True,
+            ),
+            QgsProcessingParameterString(
+                self.CSV_COLUMN,
+                self.tr("Csv Column"),
+                optional=True,
             ),
         ]
 

diff --git a/ORStools/proc/directions_points_layer_proc.py b/ORStools/proc/directions_points_layer_proc.py
@@ -36,6 +36,7 @@
     QgsProcessingParameterEnum,
     QgsPointXY,
     QgsProcessingParameterNumber,
+    QgsProcessingParameterString,
 )
 
 from ORStools.common import directions_core, PROFILES, PREFERENCES, OPTIMIZATION_MODES, EXTRA_INFOS
@@ -60,6 +61,7 @@ def __init__(self):
         self.IN_SORTBY = "INPUT_SORTBY"
         self.EXTRA_INFO = "EXTRA_INFO"
         self.CSV_FACTOR = "CSV_FACTOR"
+        self.CSV_COLUMN = "CSV_COLUMN"
         self.PARAMETERS = [
             QgsProcessingParameterFeatureSource(
                 name=self.IN_POINTS,
@@ -106,6 +108,13 @@ def __init__(self):
                 type=QgsProcessingParameterNumber.Double,
                 minValue=0,
                 maxValue=1,
+                defaultValue=None,
+                optional=True,
+            ),
+            QgsProcessingParameterString(
+                self.CSV_COLUMN,
+                self.tr("Csv Column"),
+                optional=True,
             ),
         ]
 
@@ -120,9 +129,13 @@ def processAlgorithm(self, parameters, context, feedback):
 
         options = self.parseOptions(parameters, context)
 
+        csv_column = self.parameterAsString(parameters, self.CSV_COLUMN, context)
+
         csv_factor = self.parameterAsDouble(parameters, self.CSV_FACTOR, context)
         if csv_factor > 0:
-            options["profile_params"] = {"weightings": {"csv_factor": csv_factor}}
+            options["profile_params"] = {
+                "weightings": {"csv_factor": round(csv_factor, 2), "csv_column": csv_column}
+            }
 
         extra_info = self.parameterAsEnums(parameters, self.EXTRA_INFO, context)
         extra_info = [EXTRA_INFOS[i] for i in extra_info]

diff --git a/ORStools/proc/directions_points_layers_proc.py b/ORStools/proc/directions_points_layers_proc.py
@@ -35,6 +35,7 @@
     QgsProcessingParameterFeatureSource,
     QgsProcessingParameterEnum,
     QgsProcessingParameterNumber,
+    QgsProcessingParameterString,
 )
 
 from ORStools.common import directions_core, PROFILES, PREFERENCES, EXTRA_INFOS
@@ -59,6 +60,7 @@ def __init__(self):
         self.IN_MODE = "INPUT_MODE"
         self.EXTRA_INFO = "EXTRA_INFO"
         self.CSV_FACTOR = "CSV_FACTOR"
+        self.CSV_COLUMN = "CSV_COLUMN"
         self.PARAMETERS = [
             QgsProcessingParameterFeatureSource(
                 name=self.IN_START,
@@ -123,6 +125,13 @@ def __init__(self):
                 type=QgsProcessingParameterNumber.Double,
                 minValue=0,
                 maxValue=1,
+                defaultValue=None,
+                optional=True,
+            ),
+            QgsProcessingParameterString(
+                self.CSV_COLUMN,
+                self.tr("Csv Column"),
+                optional=True,
             ),
         ]