geo-activity-playground 1.8.3__py3-none-any.whl → 1.9.0__py3-none-any.whl

geo_activity_playground/core/enrichment.py

@@ -183,14 +183,18 @@ def enrichment_distance(
     if "speed" not in time_series.columns:
         time_series["speed"] = (
             time_series["distance_km"].diff()
-            / (time_series["time"].diff().dt.total_seconds() + 1e-3)
+            / time_series["time"].diff().dt.total_seconds()
             * 3600
         )
+        # Division by zero causes infinity. We replace these with NaN and interpolate the values instead.
+        time_series["speed"] = time_series["speed"].replace([np.inf, -np.inf], np.nan)
+        time_series.interpolate(inplace=True)
+
         changed = True
 
     potential_jumps = (time_series["speed"] > 40) & (time_series["speed"].diff() > 10)
     if np.any(potential_jumps):
-        time_series.replace(time_series.loc[~potential_jumps])
+        time_series.replace(time_series.loc[~potential_jumps], inplace=True)
         changed = True
 
     if "segment_id" not in time_series.columns:

geo_activity_playground/explorer/tile_visits.py

@@ -240,6 +240,8 @@ def _process_activity(
             zip(activity_tiles["tile_x"], activity_tiles["tile_y"]),
         ):
             if activity.kind.consider_for_achievements:
+                if time is not None and time.tz is None:
+                    time = time.tz_localize("UTC")
                 if tile not in tile_state["tile_visits"][zoom]:
                     new_tile_history_soa["activity_id"].append(activity_id)
                     new_tile_history_soa["time"].append(time)

geo_activity_playground/importers/activity_parsers.py

@@ -202,9 +202,32 @@ def read_gpx_activity(path: pathlib.Path, open) -> pd.DataFrame:
                     time = dateutil.parser.parse(str(point.time))
                 else:
                     time = None
-                points.append((time, point.latitude, point.longitude, point.elevation))
-
-    df = pd.DataFrame(points, columns=["time", "latitude", "longitude", "elevation"])
+                row = {
+                    "time": time,
+                    "latitude": point.latitude,
+                    "longitude": point.longitude,
+                    "elevation": point.elevation,
+                }
+                if point.extensions:
+                    for ext in point.extensions:
+                        if (
+                            ext.tag
+                            == "{http://www.garmin.com/xmlschemas/TrackPointExtension/v1}TrackPointExtension"
+                        ):
+                            for datum in ext:
+                                if (
+                                    datum.tag
+                                    == "{http://www.garmin.com/xmlschemas/TrackPointExtension/v1}hr"
+                                ):
+                                    row["heartrate"] = int(datum.text)
+                                if (
+                                    datum.tag
+                                    == "{http://www.garmin.com/xmlschemas/TrackPointExtension/v1}cad"
+                                ):
+                                    row["cadence"] = int(datum.text)
+
+                points.append(row)
+    df = pd.DataFrame(points)
     # Some files don't have elevation information. In these cases we remove the column.
     if not df["elevation"].any():
         del df["elevation"]

geo_activity_playground/importers/strava_api.py

@@ -117,6 +117,9 @@ def try_import_strava(
         for strava_activity in tqdm(
             client.get_activities(after=get_after), desc="Downloading Strava activities"
         ):
+            logger.info(
+                f"Examining Strava activity with ID {strava_activity.id} and name '{strava_activity.name}' …"
+            )
             if (
                 strava_end
                 and strava_activity.start_date is not None
@@ -195,6 +198,7 @@ def try_import_strava(
                 activity.moving_time = detailed_activity.moving_time
 
                 update_and_commit(activity, time_series, config)
+                logger.info(f"Added activity '{activity.name}' from Strava.")
                 compute_tile_visits_new(repository, tile_visit_accessor)
                 compute_tile_evolution(tile_visit_accessor.tile_state, config)
                 tile_visit_accessor.save()

geo_activity_playground/webui/blueprints/upload_blueprint.py

@@ -8,6 +8,7 @@ from flask import flash
 from flask import redirect
 from flask import render_template
 from flask import request
+from flask import Response
 from flask import url_for
 
 from ...core.activities import ActivityRepository
@@ -59,8 +60,9 @@ def make_upload_blueprint(
         if file.filename == "":
             flash("No selected file", "warning")
             return redirect("/upload")
-        if file:
+        for file in request.files.getlist("file"):
             filename = file.filename
+            assert filename is not None
             target_path = pathlib.Path(request.form["directory"]) / filename
             assert target_path.suffix in [
                 ".csv",
@@ -79,18 +81,18 @@ def make_upload_blueprint(
                 )
                 return redirect(url_for(".index"))
             file.save(target_path)
-            scan_for_activities(
-                repository,
-                tile_visit_accessor,
-                config,
-                skip_strava=True,
-            )
-            latest_activity = DB.session.scalar(
-                sqlalchemy.select(Activity).order_by(Activity.id.desc()).limit(1)
-            )
-            assert latest_activity is not None
-            flash(f"Activity was saved with ID {latest_activity.id}.", "success")
-            return redirect(f"/activity/{latest_activity.id}")
+        scan_for_activities(
+            repository,
+            tile_visit_accessor,
+            config,
+            skip_strava=True,
+        )
+        latest_activity = DB.session.scalar(
+            sqlalchemy.select(Activity).order_by(Activity.id.desc()).limit(1)
+        )
+        assert latest_activity is not None
+        flash(f"Activity was saved with ID {latest_activity.id}.", "success")
+        return redirect(f"/activity/{latest_activity.id}")
 
     @blueprint.route("/refresh")
     @needs_authentication(authenticator)

geo_activity_playground/webui/templates/upload/index.html.j2

@@ -6,7 +6,7 @@
 <form method="post" enctype="multipart/form-data" action="{{ url_for('.receive') }}">
     <div class="mb-3">
         <label for="file1" class="form-label">Activity file</label>
-        <input type="file" name="file" id="file1" class="form-control">
+        <input type="file" name="file" id="file1" class="form-control" multiple>
     </div>
     <div class="mb-3">
         <label for="directory" class="form-label">Target directory</label>

{geo_activity_playground-1.8.3.dist-info → geo_activity_playground-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.8.3
+Version: 1.9.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

{geo_activity_playground-1.8.3.dist-info → geo_activity_playground-1.9.0.dist-info}/RECORD

@@ -22,7 +22,7 @@ geo_activity_playground/core/config.py,sha256=mmdMQ5iCLNGnAlriT1ETEVS-gM6Aq_9sg2
 geo_activity_playground/core/coordinates.py,sha256=rW_OmMRpTUyIsQwrT6mgT9Y6uPGuwqTo5XDDMS7mGuo,1140
 geo_activity_playground/core/copernicus_dem.py,sha256=t6Bc9fsyGyx1awdePXvlN-Zc-tiT2eGSJ80SV5B1Z9A,2944
 geo_activity_playground/core/datamodel.py,sha256=yuq3XCynetp1OlMr3fpSlXBArElgzdfejbqnJJX-xC4,16728
-geo_activity_playground/core/enrichment.py,sha256=b27E_KK30xjq8MuGFZyIpKzz8fO2LwLVaGGTP0mb5N0,8618
+geo_activity_playground/core/enrichment.py,sha256=QMJla3r27Ejwa1fiS1Fc81m4oP8wiVHkdT1M0z830zE,8863
 geo_activity_playground/core/export.py,sha256=ayOmhWL72263oP9NLIZRYCg_Db0GLUFhgNIL_MCrV-E,4435
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=Sevl4AtBwJZMW3VJ6ihRqwjC0M9fhJqX3MN6tw_hIFQ,6627
@@ -48,14 +48,14 @@ geo_activity_playground/core/tiles.py,sha256=LBn2V6WAvMxZeXSIQ8ruZL71iyvOXoFZMz7
 geo_activity_playground/core/time_conversion.py,sha256=f5CByqyWSthCplrbXZThSFbt3eY-t1g-2H5lkfBlgc0,1556
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=YNL_c4O1-kxaajATJwj4ZLywCL5Hpj9qy2h-F7rk8Yg,3260
-geo_activity_playground/explorer/tile_visits.py,sha256=BEv6mUNO8Q71HbRPJDXe4OrzQW0CTMKh6DE9hNU9ukw,17188
+geo_activity_playground/explorer/tile_visits.py,sha256=DzAmZmyLSeGe8mIg6-Kx1gXtCf5Bj8YjfNFD_imJyjE,17296
 geo_activity_playground/explorer/video.py,sha256=7j6Qv3HG6On7Tn7xh7Olwrx_fbQnfzS7CeRg3TEApHg,4397
 geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuMCZkERWNkQjg,3318
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/activity_parsers.py,sha256=NAK_Fv_zy75WuNa1bgYgzjc7Dnsj1oVah6DW0faLCG4,11403
+geo_activity_playground/importers/activity_parsers.py,sha256=Ums6SQ_fggE2alwwDbZZakxbeLQz0_9Iq4limDTW31k,12431
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
 geo_activity_playground/importers/directory.py,sha256=sHcLIi0DOPEATt4wiE_vp00h89fO940wUQyJZUzzpnw,3978
-geo_activity_playground/importers/strava_api.py,sha256=IUmsN3Zor-CXXtdDVXJHsqBFnDNx-W0YoQ8d9ECcFT8,9377
+geo_activity_playground/importers/strava_api.py,sha256=1sRb_CD4tbsW-MwP6QPg7zpATlb6XpniS4rtH72iwkw,9606
 geo_activity_playground/importers/strava_checkout.py,sha256=joJI_uic9fYtu7E5Odh6GUq_LyiLqQ72Ucy_Mbjr-X0,9289
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
@@ -83,7 +83,7 @@ geo_activity_playground/webui/blueprints/square_planner_blueprint.py,sha256=xVax
 geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=7aJYvo8EERGnItL9PFCMLM6T26xiQa3VP2RUvWglgy4,6734
 geo_activity_playground/webui/blueprints/tile_blueprint.py,sha256=YzZf9OrNdjhc1_j4MtO1DMcw1uCv29ueNsYd-mWqgbg,837
 geo_activity_playground/webui/blueprints/time_zone_fixer_blueprint.py,sha256=PEHsk3kRHx2EvQ-6VPD4xeOmXGjh64GMAagFkQ0wbeg,2301
-geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=mwoLeanW8oN6u7msE_Lx0grxDOYev4beqPbkPZRemkM,4763
+geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=VLyMic2ptBRcMyunGXl-6Auxs1jglIO5fYgRGPhH25s,4816
 geo_activity_playground/webui/columns.py,sha256=FP0YfX-WFQk1JEXhrywv3NUEVq-x7Hv0or35X3Ltf9c,1525
 geo_activity_playground/webui/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
 geo_activity_playground/webui/plot_util.py,sha256=5Uesjj-xcMskQX2z9viDZYHSxLGrH2a5dHA1ogsJW9U,261
@@ -173,10 +173,10 @@ geo_activity_playground/webui/templates/square_planner/index.html.j2,sha256=-OnY
 geo_activity_playground/webui/templates/summary/index.html.j2,sha256=VuSed6GU-FzjPC1aCYuEuK5B8Rw2D8NcseNLTFIGxkA,1441
 geo_activity_playground/webui/templates/summary/vega-chart.html.j2,sha256=mw8HtigeSnShTFZNG56UGUqHLJe70kvFR3o0TT71dBI,94
 geo_activity_playground/webui/templates/time_zone_fixer/index.html.j2,sha256=s9r6BJMXmd7kLSyjkvH4xLi6e01S5bpGRcMgMMJyCAE,1760
-geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
+geo_activity_playground/webui/templates/upload/index.html.j2,sha256=5W2gpm4eSvidOyJOCSZZbvTZaTkSWNrOWux3-oIm0zI,784
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-1.8.3.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.8.3.dist-info/METADATA,sha256=OhfYXMd4NPi3vQcxAmHZKoRiNMwZtLwABe4_EC4sExA,1937
-geo_activity_playground-1.8.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.8.3.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.8.3.dist-info/RECORD,,
+geo_activity_playground-1.9.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.9.0.dist-info/METADATA,sha256=DO-gcjADFWzzSvxGFzgs9qfh2xs-EB39Rb_s2LYpXBg,1937
+geo_activity_playground-1.9.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.9.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.9.0.dist-info/RECORD,,