Merge pull request #19 from anitagraser/mpd

Refactoring for MovingPandas

Author: anitagraser

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

README.md

@@ -7,5 +7,15 @@ The Trajectools plugin adds trajectory tools to the QGIS Processing toolbox.
 ![Trajectools screenshot](https://raw.githubusercontent.com/anitagraser/qgis-processing-trajectory/master/screenshots/trajectools.PNG)
 
 
-**Note: This plugin depends on GeoPandas!** GeoPandas is now included in OSGeo4W. Use **Advanced install** and search for GeoPandas in the **Select Packages** dialog. 
+**Note: This plugin depends on MovingPandas!** You will need to install MovingPandas in your QGIS Python environment. I recommend installing both QGIS and MovingPandas from conda-forge:
+
+```
+conda create -n qgis python=3.9
+(base) PS C:\Users\anita> conda activate qgis
+(qgis) PS C:\Users\anita> mamba install -c conda-forge qgis=3.28.2
+(qgis) PS C:\Users\anita> mamba install -c conda-forge movingpandas
+```
+
+More details: https://anitagraser.com/2023/01/21/pyqgis-jupyter-notebooks-on-windows-using-conda/
+
 

__init__.py

@@ -4,8 +4,8 @@
 ***************************************************************************
     trajectoryProviderPlugin.py
     ---------------------
-    Date                 : December 2018
-    Copyright            : (C) 2018 by Anita Graser
+    Date                 : December 2023
+    Copyright            : (C) 2023 by Anita Graser
     Email                : anitagraser@gmx.at
 ***************************************************************************
 *                                                                         *
@@ -18,8 +18,8 @@
 """
 
 __author__ = 'Anita Graser'
-__date__ = 'Dec 2018'
-__copyright__ = '(C) 2018, Anita Graser'
+__date__ = 'Dec 2023'
+__copyright__ = '(C) 2023, Anita Graser'
 
 # This will get replaced with a git SHA1 when you do a git archive
 

geometry_utils.py

@@ -3,7 +3,7 @@ name=Trajectools
 description=Processing tools for handling trajectory data 
 about=Trajectools provides a collection of tools for handling trajectory data. This plugin depends on GeoPandas! Sample data for testing the functionality is provided with the plugin download. 
 category=Plugins
-version=1.0.3
+version=2.0
 qgisMinimumVersion=3.0
 qgisMaximumVersion=4.0
 
@@ -20,7 +20,9 @@ repository=https://github.com/anitagraser/qgis-processing-trajectory
 experimental=True
 deprecated=False
 
-changelog=1.0.3
+changelog=2.0
+    - Switch to MovingPandas backend
+    1.0.3
     - Fix #10 New GeoPandas CRS handling
     1.0.2
     - Fix #8 Trajectories from point layer: not ordered by time