Misc updates

anitagraser · anitagraser · commit ea673c376018 · 2023-06-11T10:47:12.000Z
diff --git a/1-tutorials/1-getting-started.ipynb b/1-tutorials/1-getting-started.ipynb
@@ -274,8 +274,8 @@
     "    }\n",
     ")\n",
     "gdf = gpd.GeoDataFrame(df, crs=4326)\n",
-    "trajs = mpd.TrajectoryCollection(gdf, traj_id_col='trajectory_id', t='t')\n",
-    "trajs"
+    "tc = mpd.TrajectoryCollection(gdf, traj_id_col='trajectory_id', t='t')\n",
+    "tc"
    ]
   },
   {
@@ -284,7 +284,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.hvplot()"
+    "tc.hvplot()"
    ]
   },
   {
@@ -294,8 +294,8 @@
    "outputs": [],
    "source": [
     "min_duration = timedelta(minutes=1)\n",
-    "trajs.trajectories = [traj for traj in trajs if traj.get_duration() > min_duration]\n",
-    "trajs"
+    "tc.trajectories = [traj for traj in tc if traj.get_duration() > min_duration]\n",
+    "tc"
    ]
   },
   {
diff --git a/1-tutorials/2-computing-speed.ipynb b/1-tutorials/2-computing-speed.ipynb
@@ -152,7 +152,7 @@
    "outputs": [],
    "source": [
     "gdf = read_file('../data/geolife_small.gpkg')\n",
-    "trajs = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
+    "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
    ]
   },
   {
@@ -161,7 +161,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my_traj = trajs.trajectories[1]"
+    "my_traj = tc.trajectories[1]"
    ]
   },
   {
@@ -205,7 +205,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20)"
+    "tc.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20)"
    ]
   },
   {
diff --git a/1-tutorials/4-exporting-trajectories.ipynb b/1-tutorials/4-exporting-trajectories.ipynb
@@ -48,8 +48,8 @@
    "outputs": [],
    "source": [
     "gdf = read_file('../data/geolife_small.gpkg')\n",
-    "trajs = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",
-    "trajs"
+    "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",
+    "tc"
    ]
   },
   {
@@ -68,7 +68,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.to_point_gdf()"
+    "tc.to_point_gdf()"
    ]
   },
   {
@@ -85,7 +85,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.to_line_gdf()"
+    "tc.to_line_gdf()"
    ]
   },
   {
@@ -102,7 +102,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.to_traj_gdf(wkt=True)"
+    "tc.to_traj_gdf(wkt=True)"
    ]
   },
   {
@@ -111,7 +111,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "trajs.to_traj_gdf(agg={'tracker':'mode', 'sequence':['min', 'max']})"
+    "tc.to_traj_gdf(agg={'tracker':'mode', 'sequence':['min', 'max']})"
    ]
   },
   {
@@ -136,7 +136,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "export_gdf = trajs.to_traj_gdf(agg={'sequence':['min', 'max']})\n",
+    "export_gdf = tc.to_traj_gdf(agg={'sequence':['min', 'max']})\n",
     "export_gdf.to_file(\"temp.gpkg\", layer='trajectories', driver=\"GPKG\")"
    ]
   },
diff --git a/1-tutorials/5-intersecting-with-polygons.ipynb b/1-tutorials/5-intersecting-with-polygons.ipynb
@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -47,10 +48,11 @@
    "outputs": [],
    "source": [
     "gdf = read_file('../data/geolife_small.gpkg')\n",
-    "traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
+    "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -65,9 +67,8 @@
    "source": [
     "xmin, xmax, ymin, ymax = 116.365035,116.3702945,39.904675,39.907728\n",
     "polygon = Polygon([(xmin,ymin), (xmin,ymax), (xmax,ymax), (xmax,ymin), (xmin,ymin)])\n",
-    "polygon_gdf = GeoDataFrame(pd.DataFrame([{'geometry':polygon, 'id':1}]), crs=31256)\n",
     "\n",
-    "my_traj = traj_collection.trajectories[2]\n",
+    "my_traj = tc.trajectories[2]\n",
     "intersections = my_traj.clip(polygon)\n",
     "    \n",
     "print(\"Found {} intersections\".format(len(intersections)))"
@@ -80,18 +81,20 @@
    "outputs": [],
    "source": [
     "ax = my_traj.plot()\n",
-    "polygon_gdf.plot(ax=ax, color='lightgray')\n",
+    "gpd.GeoSeries(polygon).plot(ax=ax, color='lightgray')\n",
     "intersections.plot(ax=ax, color='red', linewidth=5)"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "## Clipping a TrajectoryCollection"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -104,7 +107,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "clipped = traj_collection.clip(polygon)\n",
+    "clipped = tc.clip(polygon)\n",
     "clipped"
    ]
   },
@@ -118,6 +121,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -142,7 +146,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my_traj = traj_collection.trajectories[2]\n",
+    "my_traj = tc.trajectories[2]\n",
     "intersections = my_traj.intersection(polygon_feature)\n",
     "intersections"
    ]
@@ -180,7 +184,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.10.10"
   }
  },
  "nbformat": 4,
diff --git a/1-tutorials/6-splitting-trajectories.ipynb b/1-tutorials/6-splitting-trajectories.ipynb
@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -51,7 +52,7 @@
    "outputs": [],
    "source": [
     "gdf = read_file('../data/geolife_small.gpkg')\n",
-    "traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
+    "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
    ]
   },
   {
@@ -60,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my_traj = traj_collection.trajectories[1]\n",
+    "my_traj = tc.trajectories[1]\n",
     "print(my_traj)"
    ]
   },
@@ -74,13 +75,15 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "## ObservationGapSplitter"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -118,13 +121,15 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "## StopSplitter"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -162,13 +167,15 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "## SpeedSplitter"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -229,7 +236,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.10.10"
   }
  },
  "nbformat": 4,
diff --git a/1-tutorials/7-generalizing-trajectories.ipynb b/1-tutorials/7-generalizing-trajectories.ipynb
@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -57,7 +58,7 @@
    "outputs": [],
    "source": [
     "gdf = read_file('../data/geolife_small.gpkg')\n",
-    "traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
+    "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
    ]
   },
   {
@@ -66,7 +67,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "original_traj = traj_collection.trajectories[1]\n",
+    "original_traj = tc.trajectories[1]\n",
     "print(original_traj)"
    ]
   },
@@ -80,13 +81,15 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "## Spatial generalization (DouglasPeuckerGeneralizer)"
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -123,6 +126,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -160,6 +164,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -176,6 +181,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -217,7 +223,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.8"
+   "version": "3.10.10"
   }
  },
  "nbformat": 4,
diff --git a/1-tutorials/8-detecting-stops.ipynb b/1-tutorials/8-detecting-stops.ipynb
diff --git a/1-tutorials/9-aggregating-trajectories.ipynb b/1-tutorials/9-aggregating-trajectories.ipynb

Original file line number	Diff line number	Diff line change
`@@ -274,8 +274,8 @@`
`274`	`274`	`" }\n",`
`275`	`275`	`")\n",`
`276`	`276`	`"gdf = gpd.GeoDataFrame(df, crs=4326)\n",`
`277`		`- "trajs = mpd.TrajectoryCollection(gdf, traj_id_col='trajectory_id', t='t')\n",`
`278`		`- "trajs"`
	`277`	`+ "tc = mpd.TrajectoryCollection(gdf, traj_id_col='trajectory_id', t='t')\n",`
	`278`	`+ "tc"`
`279`	`279`	`]`
`280`	`280`	`},`
`281`	`281`	`{`
`@@ -284,7 +284,7 @@`
`284`	`284`	`"metadata": {},`
`285`	`285`	`"outputs": [],`
`286`	`286`	`"source": [`
`287`		`- "trajs.hvplot()"`
	`287`	`+ "tc.hvplot()"`
`288`	`288`	`]`
`289`	`289`	`},`
`290`	`290`	`{`
`@@ -294,8 +294,8 @@`
`294`	`294`	`"outputs": [],`
`295`	`295`	`"source": [`
`296`	`296`	`"min_duration = timedelta(minutes=1)\n",`
`297`		`- "trajs.trajectories = [traj for traj in trajs if traj.get_duration() > min_duration]\n",`
`298`		`- "trajs"`
	`297`	`+ "tc.trajectories = [traj for traj in tc if traj.get_duration() > min_duration]\n",`
	`298`	`+ "tc"`
`299`	`299`	`]`
`300`	`300`	`},`
`301`	`301`	`{`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@`
`152`	`152`	`"outputs": [],`
`153`	`153`	`"source": [`
`154`	`154`	`"gdf = read_file('../data/geolife_small.gpkg')\n",`
`155`		`- "trajs = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"`
	`155`	`+ "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"`
`156`	`156`	`]`
`157`	`157`	`},`
`158`	`158`	`{`
`@@ -161,7 +161,7 @@`
`161`	`161`	`"metadata": {},`
`162`	`162`	`"outputs": [],`
`163`	`163`	`"source": [`
`164`		`- "my_traj = trajs.trajectories[1]"`
	`164`	`+ "my_traj = tc.trajectories[1]"`
`165`	`165`	`]`
`166`	`166`	`},`
`167`	`167`	`{`
`@@ -205,7 +205,7 @@`
`205`	`205`	`"metadata": {},`
`206`	`206`	`"outputs": [],`
`207`	`207`	`"source": [`
`208`		`- "trajs.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20)"`
	`208`	`+ "tc.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20)"`
`209`	`209`	`]`
`210`	`210`	`},`
`211`	`211`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@`
`48`	`48`	`"outputs": [],`
`49`	`49`	`"source": [`
`50`	`50`	`"gdf = read_file('../data/geolife_small.gpkg')\n",`
`51`		`- "trajs = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",`
`52`		`- "trajs"`
	`51`	`+ "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",`
	`52`	`+ "tc"`
`53`	`53`	`]`
`54`	`54`	`},`
`55`	`55`	`{`
`@@ -68,7 +68,7 @@`
`68`	`68`	`"metadata": {},`
`69`	`69`	`"outputs": [],`
`70`	`70`	`"source": [`
`71`		`- "trajs.to_point_gdf()"`
	`71`	`+ "tc.to_point_gdf()"`
`72`	`72`	`]`
`73`	`73`	`},`
`74`	`74`	`{`
`@@ -85,7 +85,7 @@`
`85`	`85`	`"metadata": {},`
`86`	`86`	`"outputs": [],`
`87`	`87`	`"source": [`
`88`		`- "trajs.to_line_gdf()"`
	`88`	`+ "tc.to_line_gdf()"`
`89`	`89`	`]`
`90`	`90`	`},`
`91`	`91`	`{`
`@@ -102,7 +102,7 @@`
`102`	`102`	`"metadata": {},`
`103`	`103`	`"outputs": [],`
`104`	`104`	`"source": [`
`105`		`- "trajs.to_traj_gdf(wkt=True)"`
	`105`	`+ "tc.to_traj_gdf(wkt=True)"`
`106`	`106`	`]`
`107`	`107`	`},`
`108`	`108`	`{`
`@@ -111,7 +111,7 @@`
`111`	`111`	`"metadata": {},`
`112`	`112`	`"outputs": [],`
`113`	`113`	`"source": [`
`114`		`- "trajs.to_traj_gdf(agg={'tracker':'mode', 'sequence':['min', 'max']})"`
	`114`	`+ "tc.to_traj_gdf(agg={'tracker':'mode', 'sequence':['min', 'max']})"`
`115`	`115`	`]`
`116`	`116`	`},`
`117`	`117`	`{`
`@@ -136,7 +136,7 @@`
`136`	`136`	`"metadata": {},`
`137`	`137`	`"outputs": [],`
`138`	`138`	`"source": [`
`139`		`- "export_gdf = trajs.to_traj_gdf(agg={'sequence':['min', 'max']})\n",`
	`139`	`+ "export_gdf = tc.to_traj_gdf(agg={'sequence':['min', 'max']})\n",`
`140`	`140`	`"export_gdf.to_file(\"temp.gpkg\", layer='trajectories', driver=\"GPKG\")"`
`141`	`141`	`]`
`142`	`142`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"cells": [`
`3`	`3`	`{`
	`4`	`+ "attachments": {},`
`4`	`5`	`"cell_type": "markdown",`
`5`	`6`	`"metadata": {},`
`6`	`7`	`"source": [`
`@@ -51,7 +52,7 @@`
`51`	`52`	`"outputs": [],`
`52`	`53`	`"source": [`
`53`	`54`	`"gdf = read_file('../data/geolife_small.gpkg')\n",`
`54`		`- "traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"`
	`55`	`+ "tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"`
`55`	`56`	`]`
`56`	`57`	`},`
`57`	`58`	`{`
`@@ -60,7 +61,7 @@`
`60`	`61`	`"metadata": {},`
`61`	`62`	`"outputs": [],`
`62`	`63`	`"source": [`
`63`		`- "my_traj = traj_collection.trajectories[1]\n",`
	`64`	`+ "my_traj = tc.trajectories[1]\n",`
`64`	`65`	`"print(my_traj)"`
`65`	`66`	`]`
`66`	`67`	`},`
`@@ -74,13 +75,15 @@`
`74`	`75`	`]`
`75`	`76`	`},`
`76`	`77`	`{`
	`78`	`+ "attachments": {},`
`77`	`79`	`"cell_type": "markdown",`
`78`	`80`	`"metadata": {},`
`79`	`81`	`"source": [`
`80`	`82`	`"## ObservationGapSplitter"`
`81`	`83`	`]`
`82`	`84`	`},`
`83`	`85`	`{`
	`86`	`+ "attachments": {},`
`84`	`87`	`"cell_type": "markdown",`
`85`	`88`	`"metadata": {},`
`86`	`89`	`"source": [`
`@@ -118,13 +121,15 @@`
`118`	`121`	`]`
`119`	`122`	`},`
`120`	`123`	`{`
	`124`	`+ "attachments": {},`
`121`	`125`	`"cell_type": "markdown",`
`122`	`126`	`"metadata": {},`
`123`	`127`	`"source": [`
`124`	`128`	`"## StopSplitter"`
`125`	`129`	`]`
`126`	`130`	`},`
`127`	`131`	`{`
	`132`	`+ "attachments": {},`
`128`	`133`	`"cell_type": "markdown",`
`129`	`134`	`"metadata": {},`
`130`	`135`	`"source": [`
`@@ -162,13 +167,15 @@`
`162`	`167`	`]`
`163`	`168`	`},`
`164`	`169`	`{`
	`170`	`+ "attachments": {},`
`165`	`171`	`"cell_type": "markdown",`
`166`	`172`	`"metadata": {},`
`167`	`173`	`"source": [`
`168`	`174`	`"## SpeedSplitter"`
`169`	`175`	`]`
`170`	`176`	`},`
`171`	`177`	`{`
	`178`	`+ "attachments": {},`
`172`	`179`	`"cell_type": "markdown",`
`173`	`180`	`"metadata": {},`
`174`	`181`	`"source": [`
`@@ -229,7 +236,7 @@`
`229`	`236`	`"name": "python",`
`230`	`237`	`"nbconvert_exporter": "python",`
`231`	`238`	`"pygments_lexer": "ipython3",`
`232`		`- "version": "3.10.8"`
	`239`	`+ "version": "3.10.10"`
`233`	`240`	`}`
`234`	`241`	`},`
`235`	`242`	`"nbformat": 4,`