Create proper datetime fields

Author: anitagraser

metadata.txt

@@ -3,7 +3,7 @@ name=Trajectools
 description=Processing tools for handling trajectory data 
 about=Trajectools adds trajectory analysis algorithms to the QGIS Processing toolbox. Trajectools requires MovingPandas >= 0.22.3 and optionally integrates scikit-mobility (for privacy tests), stonesoup (for smoothing), and gtfs_functions (for GTFS data support). See the plugin homepage for installation recommendations. Sample data for testing the functionality is provided with the plugin download. 
 category=Plugins
-version=2.6.1
+version=2.6.2
 qgisMinimumVersion=3.0
 qgisMaximumVersion=4.0
 
@@ -20,7 +20,9 @@ repository=https://codeberg.org/movingpandas/trajectools
 experimental=False
 deprecated=False
 
-changelog=2.6.1
+changelog=2.6.2
+    - Create proper datetime fields
+    2.6.1
     - Added minimum MovingPandas version warning
     2.6
     - Set minimum MovingPandas version to 0.22.3

qgis_processing/extractPtsAlgorithm.py

@@ -1,8 +1,8 @@
 import os
 import sys
 
-import shapely.wkt
-from shapely.geometry import Polygon
+import pandas as pd
+from movingpandas import TrajectoryStopDetector
 
 from qgis.PyQt.QtCore import QCoreApplication, QVariant
 from qgis.core import (
@@ -19,14 +19,10 @@
 )
 from qgis.core import QgsMessageLog, Qgis
 
-import pandas as pd
-from geopandas import GeoDataFrame
-from movingpandas import TrajectoryStopDetector
-
 sys.path.append("..")
 
 from .trajectoriesAlgorithm import TrajectoriesAlgorithm
-from .qgisUtils import feature_from_gdf_row, feature_from_df_row
+from .qgisUtils import feature_from_gdf_row
 
 
 CPU_COUNT = os.cpu_count()
@@ -186,8 +182,8 @@ def processAlgorithm(self, parameters, context, feedback):
 
         self.fields_pts = QgsFields()
         self.fields_pts.append(QgsField("stop_id", QVariant.String))
-        self.fields_pts.append(QgsField("start_time", QVariant.String))  # .DateTime))
-        self.fields_pts.append(QgsField("end_time", QVariant.String))  # .DateTime))
+        self.fields_pts.append(QgsField("start_time", QVariant.DateTime))
+        self.fields_pts.append(QgsField("end_time", QVariant.DateTime))
         self.fields_pts.append(QgsField("traj_id", QVariant.String))
         self.fields_pts.append(QgsField("duration_s", QVariant.Double))
 
@@ -214,8 +210,6 @@ def processTc(self, tc, parameters, context):
         )
         gdf = gdf.convert_dtypes()
         gdf["stop_id"] = gdf.index.astype(str)
-        gdf["start_time"] = gdf["start_time"].astype(str)
-        gdf["end_time"] = gdf["end_time"].astype(str)
 
         names = [field.name() for field in self.fields_pts]
         names.append("geometry")

qgis_processing/qgisUtils.py

@@ -4,6 +4,8 @@
 import pandas as pd
 from os import path
 from pyproj import CRS
+from datetime import datetime
+
 from qgis.core import (
     QgsFeature,
     QgsGeometry,
@@ -134,6 +136,9 @@ def feature_from_gdf_row(row):
     f = QgsFeature()
     f.setGeometry(QgsGeometry.fromPointXY(QgsPointXY(row.geometry.x, row.geometry.y)))
     values = row.values.tolist()[:-1]
+    for i, value in enumerate(values):
+        if isinstance(value, datetime):
+            values[i] = QDateTime.fromSecsSinceEpoch(int(value.timestamp()))
     # for v in values:
     #    QgsMessageLog.logMessage(str(type(v)), "Trajectools", level=Qgis.Info )
     f.setAttributes(values)

qgis_processing/trajectoriesAlgorithm.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-from qgis.PyQt.QtCore import QCoreApplication, QVariant
+from qgis.PyQt.QtCore import QCoreApplication, QVariant, QDateTime, Qt
 from qgis.PyQt.QtGui import QIcon
 from qgis.core import (
     QgsProcessing,
@@ -27,7 +27,6 @@
     set_multiprocess_path,
     tc_from_pt_layer, 
     feature_from_gdf_row, 
-    feature_from_df_row, 
     df_from_pt_layer, 
 )
 
@@ -153,6 +152,8 @@ def get_pt_fields(self, fields_to_add=[]):
             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))
+            elif field.name() == self.timestamp_field:
+                fields.append(QgsField(self.timestamp_field, QVariant.DateTime))
             else:
                 fields.append(field)
         for field in fields_to_add:
@@ -274,8 +275,8 @@ def get_traj_fields(self, fields_to_add=[]):
         speed_units = f"{self.speed_units[0]}{self.speed_units[1]}"
         fields = QgsFields()
         fields.append(QgsField(self.traj_id_field, QVariant.String))
-        fields.append(QgsField("start_time", QVariant.String))
-        fields.append(QgsField("end_time", QVariant.String))
+        fields.append(QgsField("start_time", QVariant.DateTime))
+        fields.append(QgsField("end_time", QVariant.DateTime))
         fields.append(QgsField("duration_seconds", QVariant.Double))
         fields.append(QgsField(f"length_{length_units}", QVariant.Double))
         fields.append(QgsField(f"speed_{speed_units}", QVariant.Double))
@@ -293,7 +294,9 @@ def traj_to_sink(self, traj, attr_mean_to_add=[], attr_first_to_add=[]):
         f = QgsFeature()
         f.setGeometry(line)
         start_time = traj.get_start_time().isoformat()
+        start_time = QDateTime.fromString(start_time, Qt.ISODate)
         end_time = traj.get_end_time().isoformat()
+        end_time = QDateTime.fromString(end_time, Qt.ISODate)
         duration = float(traj.get_duration().total_seconds())
         length = traj.get_length(units=self.speed_units[0])
         speed = length / (duration / TIME_FACTOR[self.speed_units[1]])
@@ -321,7 +324,8 @@ def tc_to_sink(self, tc, field_names_to_add=[]):
             dfs = tc.to_point_gdf()
         except ValueError:  # when the tc is empty
             return
-        dfs[self.timestamp_field] = dfs.index.astype(str)
+        dfs[self.timestamp_field] = dfs.index
+
         names = [field.name() for field in self.fields_pts]
         for field_name in field_names_to_add:
             names.append(field_name)