Reflect recent improvements

Author: anitagraser

2-analysis-examples/ever-given.ipynb

@@ -58,7 +58,6 @@
    "source": [
     "df = pd.read_csv('../data/boat-positions.csv')\n",
     "df['t'] = pd.to_datetime(df['ais_pos_timestamp'], format='%d/%m/%Y %H:%M')\n",
-    "df = df.set_index('t').tz_localize(None)\n",
     "df"
    ]
   },
@@ -88,7 +87,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "tc = mpd.TrajectoryCollection(gdf, 'ID')"
+    "tc = mpd.TrajectoryCollection(gdf, 'ID', t='t')"
    ]
   },
   {
@@ -98,7 +97,7 @@
    "outputs": [],
    "source": [
     "evergiven = tc.get_trajectory(EVERID)\n",
-    "evergiven.hvplot(line_width=7, frame_width=FSIZE, frame_height=FSIZE)"
+    "evergiven.hvplot(line_width=3, frame_width=FSIZE, frame_height=FSIZE)"
    ]
   },
   {
@@ -107,7 +106,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "stop_pts = mpd.TrajectoryStopDetector(tc).get_stop_points(min_duration=timedelta(hours=3), max_diameter=1000)"
+    "stop_detector = mpd.TrajectoryStopDetector(tc)\n",
+    "stop_pts = stop_detector.get_stop_points(min_duration=timedelta(hours=3), max_diameter=1000)\n",
+    "stop_pts"
    ]
   },
   {
@@ -116,10 +117,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "stop_pts['ID'] = stop_pts.index\n",
-    "stop_pts['ID'] = stop_pts['ID'].apply(lambda row: int(row.split('_')[0]))\n",
-    "stop_pts['duration_h'] = (stop_pts['end_time']-stop_pts['start_time']).dt.total_seconds() / 3600\n",
-    "stop_pts.style"
+    "stop_pts['duration_h'] = stop_pts['duration_s'] / 3600\n",
+    "stop_pts"
    ]
   },
   {
@@ -135,7 +134,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "stop_pts[stop_pts['ID']==EVERID]"
+    "stop_pts[stop_pts['traj_id']==EVERID]"
    ]
   },
   {
@@ -144,13 +143,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "plot = evergiven.hvplot(line_width=5, color='red', frame_width=FSIZE, frame_height=FSIZE, alpha=0.5).opts(active_tools=['pan','wheelzoom'])\n",
-    "plot = plot * stop_pts.hvplot(geo=True, hover_cols=['start_time'], size=20) \n",
-    "plot = plot * stop_pts[stop_pts['ID']==EVERID].hvplot(geo=True, hover_cols=['start_time'], size=dim('duration_h')/2, color='red', \n",
-    "                                                      title='Trajectory & stop location of Ever Given and stops of other vessels')\n",
-    "plot2 = pd.DataFrame(stop_pts).hvplot.scatter(title='Stop start & duration (in hours)', x='start_time', y='duration_h', frame_width=FSIZE, frame_height=FSIZE) \n",
-    "plot2 = plot2 * pd.DataFrame(stop_pts[stop_pts['ID']==EVERID]).hvplot.scatter(x='start_time', y='duration_h', color='red', size=200)\n",
-    "link_selections(plot + plot2)"
+    "map_plot = ( \n",
+    "    stop_pts.hvplot(geo=True, hover_cols=['start_time'], size=20, tiles='OSM') * \n",
+    "    evergiven.hvplot(line_width=5, color='red', frame_width=FSIZE, frame_height=FSIZE, alpha=0.5, tiles=None).opts(active_tools=['pan','wheelzoom']) *\n",
+    "    stop_pts[stop_pts['traj_id']==EVERID].hvplot(geo=True, hover_cols=['start_time'], size=dim('duration_h')/2, color='red', \n",
+    "        title='Trajectory & stop location of Ever Given and stops of other vessels')\n",
+    ")\n",
+    "scatter_plot = ( \n",
+    "    stop_pts.hvplot.scatter(title='Stop start & duration (in hours)', x='start_time', y='duration_h', frame_width=FSIZE, frame_height=FSIZE, alpha=0.7) * \n",
+    "    stop_pts[stop_pts['traj_id']==EVERID].hvplot.scatter(x='start_time', y='duration_h', color='red', size=200) \n",
+    ")\n",
+    "map_plot + scatter_plot"
    ]
   },
   {
@@ -166,7 +169,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "stop_pts[stop_pts.start_time > datetime(2021,3,23,5,47,0)]\\\n",
+    "stop_pts[stop_pts.start_time > datetime(2021,3,23,5,39,0)]\\\n",
     "    .sort_values('duration_s', ascending=False)\\\n",
     "    .head(12)\\\n",
     "    .style.background_gradient(cmap='Reds')"
@@ -196,7 +199,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.10"
+   "version": "3.10.12"
   },
   "vscode": {
    "interpreter": {