Add ExtractODPtsAlgorithm

anitagraser · anitagraser · commit 10da09cab87e · 2024-01-25T21:37:09.000+01:00
diff --git a/qgis_processing/createTrajectoriesAlgorithm.py b/qgis_processing/createTrajectoriesAlgorithm.py
@@ -4,19 +4,16 @@
 
 sys.path.append("..")
 
-from .trajectoriesAlgorithm import TrajectoriesAlgorithm
+from .trajectoriesAlgorithm import TrajectoryManipulationAlgorithm
 
 
-class CreateTrajectoriesAlgorithm(TrajectoriesAlgorithm):
+class CreateTrajectoriesAlgorithm(TrajectoryManipulationAlgorithm):
     def __init__(self):
         super().__init__()
 
     def name(self):
         return "create_trajectory"
 
-    def tr(self, text):
-        return QCoreApplication.translate("create_trajectory", text)
-
     def displayName(self):
         return self.tr("Create trajectories")
 
diff --git a/qgis_processing/extractPtsAlgorithm.py b/qgis_processing/extractPtsAlgorithm.py
@@ -0,0 +1,116 @@
+import sys
+
+import shapely.wkt
+from shapely.geometry import Polygon
+
+from qgis.PyQt.QtCore import QCoreApplication, QVariant
+from qgis.core import (
+    QgsProcessingParameterExtent,
+    QgsProcessingParameterVectorLayer,
+    QgsProcessingParameterFeatureSink,
+    QgsProcessing,
+    QgsWkbTypes,
+    QgsField,
+    QgsFeatureSink,
+)
+from qgis.core import QgsMessageLog, Qgis
+
+sys.path.append("..")
+
+from .trajectoriesAlgorithm import TrajectoriesAlgorithm
+from .qgisUtils import feature_from_gdf_row
+
+
+class ExtractODPtsAlgorithm(TrajectoriesAlgorithm):
+    ORIGIN_PTS = "ORIGIN_PTS"
+    DESTINATIONS_PTS = "DESTINATIONS_PTS"
+
+    def __init__(self):
+        super().__init__()
+
+    def initAlgorithm(self, config=None):
+        super().initAlgorithm(config)
+        self.addParameter(
+            QgsProcessingParameterFeatureSink(
+                name=self.ORIGIN_PTS,
+                description=self.tr("Origin points"),
+                type=QgsProcessing.TypeVectorPoint,
+            )
+        )
+        self.addParameter(
+            QgsProcessingParameterFeatureSink(
+                name=self.DESTINATIONS_PTS,
+                description=self.tr("Destination points"),
+                type=QgsProcessing.TypeVectorPoint,
+            )
+        )
+
+    def group(self):
+        return self.tr("Basic")
+
+    def groupId(self):
+        return "TrajectoryBasic"
+
+    def name(self):
+        return "extract_od_pts"
+
+    def displayName(self):
+        return self.tr("Extract OD points")
+
+    def shortHelpString(self):
+        return self.tr("<p>Extracts start and/or end points of trajectories.</p>")
+
+    def processAlgorithm(self, parameters, context, feedback):
+        tc, crs = self.create_tc(parameters, context)
+
+        self.fields_pts = self.get_pt_fields(
+            [
+                QgsField(tc.get_speed_col(), QVariant.Double),
+                QgsField(tc.get_direction_col(), QVariant.Double),
+            ],
+        )
+        (self.sink_orig, self.orig_pts) = self.parameterAsSink(
+            parameters,
+            self.ORIGIN_PTS,
+            context,
+            self.fields_pts,
+            QgsWkbTypes.Point,
+            crs,
+        )
+        (self.sink_dest, self.dest_pts) = self.parameterAsSink(
+            parameters,
+            self.DESTINATIONS_PTS,
+            context,
+            self.fields_pts,
+            QgsWkbTypes.Point,
+            crs,
+        )
+
+        self.processTc(tc, parameters, context)
+
+        return {self.ORIGIN_PTS: self.orig_pts, self.DESTINATIONS_PTS: self.dest_pts}
+
+    def processTc(self, tc, parameters, context):
+        try:
+            gdf = tc.get_start_locations()
+        except ValueError:  # when the tc is empty
+            return
+        gdf = gdf.convert_dtypes()
+        gdf[self.timestamp_field] = gdf["t"].astype(str)
+        names = [field.name() for field in self.fields_pts]
+        names.append("geometry")
+        gdf = gdf[names]
+        # QgsMessageLog.logMessage(str(gdf), "Trajectools", level=Qgis.Info )
+
+        for _, row in gdf.iterrows():
+            f = feature_from_gdf_row(row)
+            self.sink_orig.addFeature(f, QgsFeatureSink.FastInsert)
+
+        gdf = tc.get_end_locations()
+        gdf = gdf.convert_dtypes()
+        gdf[self.timestamp_field] = gdf["t"].astype(str)
+        gdf = gdf[names]
+
+        for _, row in gdf.iterrows():
+            f = feature_from_gdf_row(row)
+            self.sink_dest.addFeature(f, QgsFeatureSink.FastInsert)
diff --git a/qgis_processing/overlayAlgorithm.py b/qgis_processing/overlayAlgorithm.py
@@ -11,10 +11,10 @@
 
 sys.path.append("..")
 
-from .trajectoriesAlgorithm import TrajectoriesAlgorithm
+from .trajectoriesAlgorithm import TrajectoryManipulationAlgorithm
 
 
-class OverlayTrajectoriesAlgorithm(TrajectoriesAlgorithm):
+class OverlayTrajectoriesAlgorithm(TrajectoryManipulationAlgorithm):
     def __init__(self):
         super().__init__()
 
@@ -42,9 +42,6 @@ def initAlgorithm(self, config=None):
     def name(self):
         return "clip_traj_extent"
 
-    def tr(self, text):
-        return QCoreApplication.translate("clip_traj_extent", text)
-
     def displayName(self):
         return self.tr("Clip trajectories by extent")
 
@@ -90,9 +87,6 @@ def initAlgorithm(self, config=None):
     def name(self):
         return "clip_traj_vector"
 
-    def tr(self, text):
-        return QCoreApplication.translate("clip_traj_vector", text)
-
     def displayName(self):
         return self.tr("Clip trajectories by polygon layer")
 
diff --git a/qgis_processing/splitTrajectoriesAlgorithm.py b/qgis_processing/splitTrajectoriesAlgorithm.py
@@ -11,10 +11,10 @@
 
 sys.path.append("..")
 
-from .trajectoriesAlgorithm import TrajectoriesAlgorithm
+from .trajectoriesAlgorithm import TrajectoryManipulationAlgorithm
 
 
-class SplitTrajectoriesAlgorithm(TrajectoriesAlgorithm):
+class SplitTrajectoriesAlgorithm(TrajectoryManipulationAlgorithm):
     def __init__(self):
         super().__init__()
 
diff --git a/qgis_processing/trajectoolsProvider.py b/qgis_processing/trajectoolsProvider.py
@@ -18,6 +18,7 @@
     ClipTrajectoriesByExtentAlgorithm,
     ClipTrajectoriesByPolygonLayer,
 )
+from .extractPtsAlgorithm import ExtractODPtsAlgorithm
 
 pluginPath = os.path.dirname(__file__)
 
@@ -57,6 +58,7 @@ def getAlgs(self):
             StopSplitterAlgorithm(),
             ClipTrajectoriesByExtentAlgorithm(),
             ClipTrajectoriesByPolygonLayer(),
+            ExtractODPtsAlgorithm(),
         ]
         return algs
 
diff --git a/qgis_processing/trajectoriesAlgorithm.py b/qgis_processing/trajectoriesAlgorithm.py
@@ -35,13 +35,9 @@
 
 
 class TrajectoriesAlgorithm(QgsProcessingAlgorithm):
-    # script parameters
     INPUT = "INPUT"
     TRAJ_ID_FIELD = "TRAJ_ID_FIELD"
     TIMESTAMP_FIELD = "TIME_FIELD"
-    OUTPUT_PTS = "OUTPUT_PTS"
-    OUTPUT_SEGS = "OUTPUT_SEGS"
-    OUTPUT_TRAJS = "OUTPUT_TRAJS"
     SPEED_UNIT = "SPEED_UNIT"
 
     def __init__(self):
@@ -51,7 +47,7 @@ def icon(self):
         return QIcon(os.path.join(pluginPath, "icons", "icon.png"))
 
     def tr(self, text):
-        return QCoreApplication.translate("split_traj", text)
+        return QCoreApplication.translate("trajectools", text)
 
     def helpUrl(self):
         return "https://github.com/movingpandas/processing-trajectory"
@@ -60,15 +56,13 @@ def createInstance(self):
         return type(self)()
 
     def initAlgorithm(self, config=None):
-        # input layer
         self.addParameter(
             QgsProcessingParameterFeatureSource(
                 name=self.INPUT,
                 description=self.tr("Input point layer"),
                 types=[QgsProcessing.TypeVectorPoint],
             )
         )
-        # fields
         self.addParameter(
             QgsProcessingParameterField(
                 name=self.TRAJ_ID_FIELD,
@@ -99,23 +93,8 @@ def initAlgorithm(self, config=None):
                 optional=False,
             )
         )
-        # output layer
-        self.addParameter(
-            QgsProcessingParameterFeatureSink(
-                name=self.OUTPUT_PTS,
-                description=self.tr("Trajectory points"),
-                type=QgsProcessing.TypeVectorPoint,
-            )
-        )
-        self.addParameter(
-            QgsProcessingParameterFeatureSink(
-                name=self.OUTPUT_TRAJS,
-                description=self.tr("Trajectories"),
-                type=QgsProcessing.TypeVectorLine,
-            )
-        )
 
-    def processAlgorithm(self, parameters, context, feedback):
+    def create_tc(self, parameters, context):
         self.input_layer = self.parameterAsSource(parameters, self.INPUT, context)
         self.traj_id_field = self.parameterAsFields(
             parameters, self.TRAJ_ID_FIELD, context
@@ -133,6 +112,49 @@ def processAlgorithm(self, parameters, context, feedback):
         )
         tc.add_speed(units=tuple(self.speed_units), overwrite=True)
         tc.add_direction(overwrite=True)
+        return tc, crs
+
+    def get_pt_fields(self, fields_to_add=[]):
+        fields = QgsFields()
+        for field in self.input_layer.fields():
+            if field.name() == "fid":
+                continue
+            elif field.name() == self.traj_id_field:
+                # we need to make sure the ID field is String
+                fields.append(QgsField(self.traj_id_field, QVariant.String))
+            else:
+                fields.append(field)
+        for field in fields_to_add:
+            i = fields.indexFromName(field.name())
+            if i < 0:
+                fields.append(field)
+        return fields
+
+
+class TrajectoryManipulationAlgorithm(TrajectoriesAlgorithm):
+    OUTPUT_PTS = "OUTPUT_PTS"
+    OUTPUT_SEGS = "OUTPUT_SEGS"
+    OUTPUT_TRAJS = "OUTPUT_TRAJS"
+
+    def initAlgorithm(self, config=None):
+        super().initAlgorithm(config)
+        self.addParameter(
+            QgsProcessingParameterFeatureSink(
+                name=self.OUTPUT_PTS,
+                description=self.tr("Trajectory points"),
+                type=QgsProcessing.TypeVectorPoint,
+            )
+        )
+        self.addParameter(
+            QgsProcessingParameterFeatureSink(
+                name=self.OUTPUT_TRAJS,
+                description=self.tr("Trajectories"),
+                type=QgsProcessing.TypeVectorLine,
+            )
+        )
+
+    def processAlgorithm(self, parameters, context, feedback):
+        tc, crs = self.create_tc(parameters, context)
 
         self.fields_pts = self.get_pt_fields(
             [
@@ -173,22 +195,6 @@ def postProcessAlgorithm(self, context, feedback):
         traj_layer.loadNamedStyle(os.path.join(pluginPath, "styles", "traj.qml"))
         return {self.OUTPUT_PTS: self.dest_pts, self.OUTPUT_TRAJS: self.dest_trajs}
 
-    def get_pt_fields(self, fields_to_add=[]):
-        fields = QgsFields()
-        for field in self.input_layer.fields():
-            if field.name() == "fid":
-                continue
-            elif field.name() == self.traj_id_field:
-                # we need to make sure the ID field is String
-                fields.append(QgsField(self.traj_id_field, QVariant.String))
-            else:
-                fields.append(field)
-        for field in fields_to_add:
-            i = fields.indexFromName(field.name())
-            if i < 0:
-                fields.append(field)
-        return fields
-
     def get_traj_fields(self):
         length_units = f"{self.speed_units[0]}"
         speed_units = f"{self.speed_units[0]}{self.speed_units[1]}"

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`ClipTrajectoriesByExtentAlgorithm,`
`19`	`19`	`ClipTrajectoriesByPolygonLayer,`
`20`	`20`	`)`
	`21`	`+from .extractPtsAlgorithm import ExtractODPtsAlgorithm`
`21`	`22`
`22`	`23`	`pluginPath = os.path.dirname(__file__)`
`23`	`24`
`@@ -57,6 +58,7 @@ def getAlgs(self):`
`57`	`58`	`StopSplitterAlgorithm(),`
`58`	`59`	`ClipTrajectoriesByExtentAlgorithm(),`
`59`	`60`	`ClipTrajectoriesByPolygonLayer(),`
	`61`	`+ ExtractODPtsAlgorithm(),`
`60`	`62`	`]`
`61`	`63`	`return algs`
`62`	`64`