Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 918b3b5

Browse files
Simpler plot examples, renamed tc in all tutorials
1 parent ea673c3 commit 918b3b5

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

‎1-tutorials/10-smoothing-trajectories.ipynb‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -54,7 +55,7 @@
5455
"outputs": [],
5556
"source": [
5657
"gdf = read_file('../data/geolife_small.gpkg')\n",
57-
"traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
58+
"tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')"
5859
]
5960
},
6061
{
@@ -63,7 +64,7 @@
6364
"metadata": {},
6465
"outputs": [],
6566
"source": [
66-
"split = mpd.ObservationGapSplitter(traj_collection).split(gap=timedelta(minutes=15))"
67+
"split = mpd.ObservationGapSplitter(tc).split(gap=timedelta(minutes=15))"
6768
]
6869
},
6970
{
@@ -76,13 +77,15 @@
7677
]
7778
},
7879
{
80+
"attachments": {},
7981
"cell_type": "markdown",
8082
"metadata": {},
8183
"source": [
8284
"## KalmanSmootherCV"
8385
]
8486
},
8587
{
88+
"attachments": {},
8689
"cell_type": "markdown",
8790
"metadata": {},
8891
"source": [
@@ -128,6 +131,7 @@
128131
]
129132
},
130133
{
134+
"attachments": {},
131135
"cell_type": "markdown",
132136
"metadata": {},
133137
"source": [
@@ -178,7 +182,7 @@
178182
"name": "python",
179183
"nbconvert_exporter": "python",
180184
"pygments_lexer": "ipython3",
181-
"version": "3.10.8"
185+
"version": "3.10.10"
182186
}
183187
},
184188
"nbformat": 4,

‎1-tutorials/11-measuring-distances.ipynb‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -48,6 +49,7 @@
4849
]
4950
},
5051
{
52+
"attachments": {},
5153
"cell_type": "markdown",
5254
"metadata": {},
5355
"source": [
@@ -114,6 +116,7 @@
114116
]
115117
},
116118
{
119+
"attachments": {},
117120
"cell_type": "markdown",
118121
"metadata": {},
119122
"source": [
@@ -128,12 +131,10 @@
128131
"source": [
129132
"pt = Point(1, 5)\n",
130133
"line = LineString([(3,3), (3,9)])\n",
131-
"pt_gdf = GeoDataFrame(pd.DataFrame([{'geometry':pt, 'id':1}]))\n",
132-
"line_gdf = GeoDataFrame(pd.DataFrame([{'geometry':line, 'id':1}]))\n",
133134
"\n",
134135
"ax = toy_traj.plot()\n",
135-
"pt_gdf.plot(ax=ax, color='red')\n",
136-
"line_gdf.plot(ax=ax, color='red')"
136+
"gpd.GeoSeries(pt).plot(ax=ax, color='red')\n",
137+
"gpd.GeoSeries(line).plot(ax=ax, color='red')"
137138
]
138139
},
139140
{
@@ -190,7 +191,7 @@
190191
"name": "python",
191192
"nbconvert_exporter": "python",
192193
"pygments_lexer": "ipython3",
193-
"version": "3.10.8"
194+
"version": "3.10.10"
194195
}
195196
},
196197
"nbformat": 4,

‎1-tutorials/99-mini-example.ipynb‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -40,6 +41,7 @@
4041
]
4142
},
4243
{
44+
"attachments": {},
4345
"cell_type": "markdown",
4446
"metadata": {},
4547
"source": [
@@ -68,13 +70,15 @@
6870
]
6971
},
7072
{
73+
"attachments": {},
7174
"cell_type": "markdown",
7275
"metadata": {},
7376
"source": [
7477
"After reading the trajectory point data from file, we want to construct the trajectories."
7578
]
7679
},
7780
{
81+
"attachments": {},
7882
"cell_type": "markdown",
7983
"metadata": {},
8084
"source": [
@@ -87,8 +91,8 @@
8791
"metadata": {},
8892
"outputs": [],
8993
"source": [
90-
"traj_collection = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",
91-
"traj_collection"
94+
"tc = mpd.TrajectoryCollection(gdf, 'trajectory_id', t='t')\n",
95+
"tc"
9296
]
9397
},
9498
{
@@ -97,10 +101,11 @@
97101
"metadata": {},
98102
"outputs": [],
99103
"source": [
100-
"traj_collection.plot(column='trajectory_id', legend=True, figsize=(9,5))"
104+
"tc.plot(column='trajectory_id', legend=True, figsize=(9,5))"
101105
]
102106
},
103107
{
108+
"attachments": {},
104109
"cell_type": "markdown",
105110
"metadata": {},
106111
"source": [
@@ -113,10 +118,11 @@
113118
"metadata": {},
114119
"outputs": [],
115120
"source": [
116-
"traj_collection.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20, figsize=(9,5))"
121+
"tc.plot(column='speed', linewidth=5, capstyle='round', legend=True, vmax=20, figsize=(9,5))"
117122
]
118123
},
119124
{
125+
"attachments": {},
120126
"cell_type": "markdown",
121127
"metadata": {},
122128
"source": [
@@ -129,7 +135,7 @@
129135
"metadata": {},
130136
"outputs": [],
131137
"source": [
132-
"detector = mpd.TrajectoryStopDetector(traj_collection)\n",
138+
"detector = mpd.TrajectoryStopDetector(tc)\n",
133139
"stop_points = detector.get_stop_points(min_duration=timedelta(seconds=120), max_diameter=100)"
134140
]
135141
},
@@ -139,7 +145,7 @@
139145
"metadata": {},
140146
"outputs": [],
141147
"source": [
142-
"ax = traj_collection.plot(figsize=(9,5))\n",
148+
"ax = tc.plot(figsize=(9,5))\n",
143149
"stop_points.plot(ax=ax, color='red', markersize=100)"
144150
]
145151
},
@@ -149,7 +155,7 @@
149155
"metadata": {},
150156
"outputs": [],
151157
"source": [
152-
"( traj_collection.hvplot(line_width=7, tiles=None, frame_width=400, frame_height=400) * \n",
158+
"( tc.hvplot(line_width=7, tiles=None, frame_width=400, frame_height=400) * \n",
153159
" stop_points.hvplot(geo=True, color='black', size=100) )"
154160
]
155161
},

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /