Add conversions to GeoDataFrame, fixes movingpandas#114

Author: anitagraser

.gitignore

@@ -124,3 +124,4 @@ blogpost.md
 tutorials/Blogpost.ipynb
 
 .vscode/
+tutorials/temp.gpkg

movingpandas/tests/test_trajectory.py

@@ -5,7 +5,7 @@
 import warnings
 from pandas.util.testing import assert_frame_equal
 from geopandas import GeoDataFrame
-from shapely.geometry import Point
+from shapely.geometry import Point, LineString
 from datetime import datetime, timedelta
 from fiona.crs import from_epsg
 from movingpandas.trajectory import Trajectory, DIRECTION_COL_NAME, SPEED_COL_NAME, MissingCRSWarning
@@ -282,9 +282,9 @@ def test_support_for_subclasses_of_point(self):
 
     def test_support_for_other_geometry_column_names(self):
         df = pd.DataFrame([
-            {'xxx': TestPoint(0, 0), 't': datetime(2018, 1, 1, 12, 0, 0)},
-            {'xxx': TestPoint(6, 0), 't': datetime(2018, 1, 1, 12, 6, 0)},
-            {'xxx': TestPoint(6, 6), 't': datetime(2018, 1, 1, 12, 10, 0)}
+            {'xxx': Point(0, 0), 't': datetime(2018, 1, 1, 12, 0, 0)},
+            {'xxx': Point(6, 0), 't': datetime(2018, 1, 1, 12, 6, 0)},
+            {'xxx': Point(6, 6), 't': datetime(2018, 1, 1, 12, 10, 0)}
         ]).set_index('t')
         geo_df = GeoDataFrame(df, geometry='xxx', crs=CRS_METRIC)
         traj = Trajectory(geo_df, 1)
@@ -294,9 +294,9 @@ def test_support_for_other_geometry_column_names(self):
 
     def test_support_for_other_time_column_names(self):
         df = pd.DataFrame([
-            {'geometry': TestPoint(0, 0), 'xxx': datetime(2018, 1, 1, 12, 0, 0)},
-            {'geometry': TestPoint(6, 0), 'xxx': datetime(2018, 1, 1, 12, 6, 0)},
-            {'geometry': TestPoint(6, 6), 'xxx': datetime(2018, 1, 1, 12, 10, 0)}
+            {'geometry': Point(0, 0), 'xxx': datetime(2018, 1, 1, 12, 0, 0)},
+            {'geometry': Point(6, 0), 'xxx': datetime(2018, 1, 1, 12, 6, 0)},
+            {'geometry': Point(6, 6), 'xxx': datetime(2018, 1, 1, 12, 10, 0)}
         ]).set_index('xxx')
         geo_df = GeoDataFrame(df, crs=CRS_METRIC)
         traj = Trajectory(geo_df, 1)
@@ -308,6 +308,58 @@ def test_support_for_other_time_column_names(self):
         traj.to_linestring()
         traj.to_linestringm_wkt()
 
+    def test_to_point_gdf(self):
+        df = pd.DataFrame([
+            {'geometry': Point(0, 0), 't': datetime(2018, 1, 1, 12, 0, 0)},
+            {'geometry': Point(6, 0), 't': datetime(2018, 1, 1, 12, 6, 0)},
+            {'geometry': Point(6, 6), 't': datetime(2018, 1, 1, 12, 10, 0)}
+        ]).set_index('t')
+        geo_df = GeoDataFrame(df, crs=CRS_METRIC)
+        traj = Trajectory(geo_df, 1)
+        point_gdf = traj.to_point_gdf()
+        assert_frame_equal(point_gdf, geo_df)
+
+    def test_to_line_gdf(self):
+        df = pd.DataFrame([
+            {'geometry': Point(0, 0), 't': datetime(2018, 1, 1, 12, 0, 0)},
+            {'geometry': Point(6, 0), 't': datetime(2018, 1, 1, 12, 6, 0)},
+            {'geometry': Point(6, 6), 't': datetime(2018, 1, 1, 12, 10, 0)}
+        ]).set_index('t')
+        geo_df = GeoDataFrame(df, crs=CRS_METRIC)
+        traj = Trajectory(geo_df, 1)
+        line_gdf = traj.to_line_gdf()
+
+        df2 = pd.DataFrame([
+            {'t': datetime(2018, 1, 1, 12,  6, 0), 'prev_t': datetime(2018, 1, 1, 12, 0, 0), 'geometry': LineString([(0, 0), (6, 0)])},
+            {'t': datetime(2018, 1, 1, 12, 10, 0), 'prev_t': datetime(2018, 1, 1, 12, 6, 0), 'geometry': LineString([(6, 0), (6, 6)])}
+        ])
+        expected_line_gdf = GeoDataFrame(df2, crs=CRS_METRIC)
+
+        assert_frame_equal(line_gdf, expected_line_gdf)
+
+    def test_to_traj_gdf(self):
+        df = pd.DataFrame([
+            {'geometry': Point(0, 0), 't': datetime(1970, 1, 1, 0, 0, 0)},
+            {'geometry': Point(6, 0), 't': datetime(1970, 1, 1, 0, 6, 0)},
+            {'geometry': Point(6, 6), 't': datetime(1970, 1, 1, 0, 10, 0)}
+        ]).set_index('t')
+        geo_df = GeoDataFrame(df, crs=CRS_METRIC)
+        traj = Trajectory(geo_df, 1)
+        traj_gdf = traj.to_traj_gdf()
+
+        props = {'id': 1, 'start_t': datetime(1970, 1, 1, 0,  0, 0), 'end_t': datetime(1970, 1, 1, 0, 10, 0), 'geometry': LineString([(0, 0), (6, 0), (6, 6)])}
+        df2 = pd.DataFrame([props])
+        expected_line_gdf = GeoDataFrame(df2, crs=CRS_METRIC)
+
+        assert_frame_equal(traj_gdf, expected_line_gdf)
+
+        traj_gdf_wkt = traj.to_traj_gdf(wkt=True)
+        props['wkt'] = 'LINESTRING M (0.0 0.0 0.0, 6.0 0.0 360.0, 6.0 6.0 600.0)'
+        df2 = pd.DataFrame([props])
+        expected_line_gdf_wkt = GeoDataFrame(df2, crs=CRS_METRIC)
+
+        assert_frame_equal(traj_gdf_wkt, expected_line_gdf_wkt)
+
     """ 
     This test should work but fails in my PyCharm probably due to https://github.com/pyproj4/pyproj/issues/134
 

movingpandas/tests/test_trajectory_collection.py

@@ -2,14 +2,14 @@
 
 import pandas as pd
 import pytest
+from pandas.util.testing import assert_frame_equal
 from geopandas import GeoDataFrame
-from shapely.geometry import Point, Polygon
+from shapely.geometry import Point, Polygon, LineString
 from fiona.crs import from_epsg
 from datetime import datetime, timedelta
 from copy import copy
 from movingpandas.trajectory_collection import TrajectoryCollection
 
-
 CRS_METRIC = from_epsg(31256)
 CRS_LATLON = from_epsg(4326)
 
@@ -166,3 +166,37 @@ def filter_trajectory(trajectory):
         with pytest.raises(ValueError):
             for _ in collection:
                 pass
+
+    def test_to_point_gdf(self):
+        point_gdf = self.collection.to_point_gdf()
+        assert_frame_equal(point_gdf, self.geo_df)
+
+    def test_to_line_gdf(self):
+        temp_df = self.geo_df.drop(columns=['obj', 'val', 'val2'])
+        tc = TrajectoryCollection(temp_df, 'id')
+        line_gdf = tc.to_line_gdf()
+
+        df2 = pd.DataFrame([
+            {'id': 1, 't': datetime(2018, 1, 1, 12,  6, 0), 'prev_t': datetime(2018, 1, 1, 12, 0, 0), 'geometry': LineString([(0, 0), (6, 0)])},
+            {'id': 1, 't': datetime(2018, 1, 1, 14, 10, 0), 'prev_t': datetime(2018, 1, 1, 12, 6, 0), 'geometry': LineString([(6, 0), (6, 6)])},
+            {'id': 1, 't': datetime(2018, 1, 1, 14, 15, 0), 'prev_t': datetime(2018, 1, 1, 14, 10, 0), 'geometry': LineString([(6, 6), (9, 9)])},
+            {'id': 2, 't': datetime(2018, 1, 1, 12, 6, 0), 'prev_t': datetime(2018, 1, 1, 12, 0, 0), 'geometry': LineString([(10, 10), (16, 10)])},
+            {'id': 2, 't': datetime(2018, 1, 2, 13, 10, 0), 'prev_t': datetime(2018, 1, 1, 12, 6, 0), 'geometry': LineString([(16, 10), (16, 16)])},
+            {'id': 2, 't': datetime(2018, 1, 2, 13, 15, 0), 'prev_t': datetime(2018, 1, 2, 13, 10, 0), 'geometry': LineString([(16, 16), (190, 19)])}
+        ])
+        expected_line_gdf = GeoDataFrame(df2, crs=CRS_METRIC)
+
+        assert_frame_equal(line_gdf, expected_line_gdf)
+
+    def test_to_traj_gdf(self):
+        temp_df = self.geo_df.drop(columns=['obj', 'val', 'val2'])
+        tc = TrajectoryCollection(temp_df, 'id')
+        traj_gdf = tc.to_traj_gdf()
+
+        rows = [{'id': 1, 'start_t': datetime(2018, 1, 1, 12, 0, 0), 'end_t': datetime(2018, 1, 1, 14, 15, 0), 'geometry': LineString([(0, 0), (6, 0), (6, 6), (9, 9)])},
+                {'id': 2, 'start_t': datetime(2018, 1, 1, 12, 0, 0), 'end_t': datetime(2018, 1, 2, 13, 15, 0), 'geometry': LineString([(10, 10), (16, 10), (16, 16), (190, 19)])}]
+        df2 = pd.DataFrame(rows)
+        expected_line_gdf = GeoDataFrame(df2, crs=CRS_METRIC)
+
+        assert_frame_equal(traj_gdf, expected_line_gdf)
+

movingpandas/trajectory.py

@@ -7,6 +7,7 @@
 from shapely.affinity import translate
 from shapely.geometry import Point, LineString
 from datetime import datetime
+from pandas import DataFrame
 from geopandas import GeoDataFrame
 try:
     from pyproj import CRS
@@ -269,6 +270,50 @@ def to_linestringm_wkt(self):
         wkt = "LINESTRING M ({})".format(coords[:-2])
         return wkt
 
+    def to_point_gdf(self):
+        """
+        Return the trajectory's points as GeoDataFrame.
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        return self.df
+
+    def to_line_gdf(self):
+        """
+        Return the trajectory's line segments as GeoDataFrame.
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        line_gdf = self._to_line_df()
+        line_gdf.drop(columns=['geometry', 'prev_pt'], inplace=True)
+        line_gdf.reset_index(drop=True, inplace=True)
+        line_gdf.rename(columns={'line': 'geometry'}, inplace=True)
+        return line_gdf
+
+    def to_traj_gdf(self, wkt=False):
+        """
+        Return a GeoDataFrame with one row containing the trajectory as a single LineString
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        properties = {
+            'id': self.id,
+            'start_t': self.get_start_time(),
+            'end_t': self.get_end_time(),
+            'geometry': self.to_linestring()
+        }
+        if wkt:
+            properties['wkt'] = self.to_linestringm_wkt()
+        df = DataFrame([properties])
+        traj_gdf = GeoDataFrame(df, crs=self.crs)
+        return traj_gdf
+
     def get_start_location(self):
         """
         Return the trajectory's start location.

movingpandas/trajectory_collection.py

@@ -82,6 +82,43 @@ def copy(self):
         #       on __init__().
         return TrajectoryCollection(trajectories, min_length=self.min_length)
 
+    def to_point_gdf(self):
+        """
+        Return the trajectories' points as GeoDataFrame.
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        gdfs = [traj.df for traj in self.trajectories]
+        return pd.concat(gdfs)
+
+    def to_line_gdf(self):
+        """
+        Return the trajectories' line segments as GeoDataFrame.
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        gdfs = [traj.to_line_gdf() for traj in self.trajectories]
+        gdf = pd.concat(gdfs)
+        gdf.reset_index(drop=True, inplace=True)
+        return gdf
+
+    def to_traj_gdf(self, wkt=False):
+        """
+        Return a GeoDataFrame with one row per Trajectory within the TrajectoryCollection
+
+        Returns
+        -------
+        GeoDataFrame
+        """
+        gdfs = [traj.to_traj_gdf(wkt) for traj in self.trajectories]
+        gdf = pd.concat(gdfs)
+        gdf.reset_index(drop=True, inplace=True)
+        return gdf
+
     def _df_to_trajectories(self, df, traj_id_col, obj_id_col):
         trajectories = []
         for traj_id, values in df.groupby([traj_id_col]):