geo-activity-playground 1.8.2__tar.gz → 1.9.0__tar.gz

{geo_activity_playground-1.8.2 → geo_activity_playground-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.8.2
+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.2 → geo_activity_playground-1.9.0}/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-1.8.2 → geo_activity_playground-1.9.0}/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-1.8.2 → geo_activity_playground-1.9.0}/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-1.8.2 → geo_activity_playground-1.9.0}/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
@@ -142,9 +145,6 @@ def try_import_strava(
                 / "Strava Activity Metadata"
                 / f"{strava_activity.id}.pickle"
             )
-            # Sometimes we still get an activity here although it has already been imported from the Strava checkout.
-            if cache_file.exists():
-                continue
             cache_file.parent.mkdir(exist_ok=True, parents=True)
             with open(cache_file, "wb") as f:
                 pickle.dump(strava_activity, f)
@@ -198,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-1.8.2 → geo_activity_playground-1.9.0}/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-1.8.2 → geo_activity_playground-1.9.0}/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.2 → geo_activity_playground-1.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "1.8.2"
+version = "1.9.0"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"