geo-activity-playground 1.8.3__tar.gz → 1.9.1__tar.gz

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/PKG-INFO

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

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/core/activities.py

@@ -40,7 +40,7 @@ class ActivityRepository:
             sqlalchemy.select(Activity).order_by(Activity.start)
         ).all()
         if result:
-            return result[-1].start
+            return result[-1].start_local_tz
         else:
             return None
 

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/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.3 → geo_activity_playground-1.9.1}/geo_activity_playground/core/parametric_plot.py

@@ -17,7 +17,7 @@ CONTINUOUS_VARIABLES = {
     "distance_km_cumsum": "Cumulative Distance / km",
     "sum(distance_km)": "Total distance / km",
     "mean(distance_km)": "Average distance / km",
-    "start": "Date",
+    "start_local": "Date",
     "hours": "Elapsed time / h",
     "hours_moving": "Moving time / h",
     "calories": "Energy / kcal",
@@ -40,17 +40,17 @@ DISCRETE_VARIABLES = {
     "equipment": "Equipment",
     "kind": "Activity kind",
     "consider_for_achievements": "Consider for achievements",
-    "year(start):O": "Year",
+    "year(start_local):O": "Year",
     "iso_year:O": "ISO Year",
-    "yearquarter(start)": "Year, Quarter",
-    "yearquartermonth(start)": "Year, Quarter, Month",
-    "yearmonth(start)": "Year, Month",
-    "quarter(start)": "Quarter",
-    "quartermonth(start)": "Quarter, Month",
-    "month(start)": "Month",
+    "yearquarter(start_local)": "Year, Quarter",
+    "yearquartermonth(start_local)": "Year, Quarter, Month",
+    "yearmonth(start_local)": "Year, Month",
+    "quarter(start_local)": "Quarter",
+    "quartermonth(start_local)": "Quarter, Month",
+    "month(start_local)": "Month",
     "week:O": "ISO Week",
-    "date(start)": "Day of month",
-    "weekday(start)": "Day of week",
+    "date(start_local)": "Day of month",
+    "weekday(start_local)": "Day of week",
     "iso_day:O": "ISO Day",
 }
 GROUP_BY_VARIABLES = {

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/core/summary_stats.py

@@ -10,8 +10,8 @@ def get_equipment_use_table(
             lambda group: pd.Series(
                 {
                     "total_distance_km": group["distance_km"].sum(),
-                    "first_use": group["start"].min(skipna=True),
-                    "last_use": group["start"].max(skipna=True),
+                    "first_use": group["start_local"].min(skipna=True),
+                    "last_use": group["start_local"].max(skipna=True),
                 },
             ),
             include_groups=False,

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/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.3 → geo_activity_playground-1.9.1}/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.3 → geo_activity_playground-1.9.1}/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-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -207,7 +207,7 @@ def make_activity_blueprint(
     @blueprint.route("/day/<int:year>/<int:month>/<int:day>")
     def day(year: int, month: int, day: int) -> ResponseReturnValue:
         meta = repository.meta
-        selection = meta["start"].dt.date == datetime.date(year, month, day)
+        selection = meta["start_local"].dt.date == datetime.date(year, month, day)
         activities_that_day = meta.loc[selection]
 
         time_series = [
@@ -258,7 +258,7 @@ def make_activity_blueprint(
     @blueprint.route("/day-sharepic/<int:year>/<int:month>/<int:day>/sharepic.png")
     def day_sharepic(year: int, month: int, day: int) -> ResponseReturnValue:
         meta = repository.meta
-        selection = meta["start"].dt.date == datetime.date(year, month, day)
+        selection = meta["start_local"].dt.date == datetime.date(year, month, day)
         activities_that_day = meta.loc[selection]
 
         time_series = [
@@ -583,7 +583,7 @@ def name_tick_plot(meta: pd.DataFrame) -> str:
         alt.Chart(meta, title="Repetitions")
         .mark_tick()
         .encode(
-            alt.X("start", title="Date"),
+            alt.X("start_local", title="Date"),
         )
         .to_json(format="vega")
     )
@@ -693,8 +693,8 @@ def make_sharepic(
     facts = {
         "distance_km": f"\n{activity.distance_km:.1f} km",
     }
-    if activity.start:
-        facts["start"] = f"{activity.start.date()}"
+    if activity.start_local_tz:
+        facts["start"] = f"{activity.start_local_tz.date()}"
     if activity.elapsed_time:
         facts["elapsed_time"] = re.sub(r"^0 days ", "", f"{activity.elapsed_time}")
     if activity.kind:
@@ -744,7 +744,7 @@ def make_day_sharepic(
         [0, img.height - footer_height, img.width, img.height], fill=(0, 0, 0, 180)
     )
 
-    date = activities.iloc[0]["start"].date()
+    date = activities.iloc[0]["start_local"].date()
     distance_km = activities["distance_km"].sum()
     elapsed_time: pd.Timedelta = activities["elapsed_time"].sum()
     elapsed_time = elapsed_time.round("s")

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py

@@ -25,7 +25,7 @@ def make_bubble_chart_blueprint(repository) -> Blueprint:
         # Prepare the bubble chart data
         bubble_data = activities[
             [
-                "start",
+                "start_local",
                 "kind",
                 "activity_id",
                 column_distance.name,
@@ -33,7 +33,7 @@ def make_bubble_chart_blueprint(repository) -> Blueprint:
             ]
         ].rename(
             columns={
-                "start": "date",
+                "start_local": "date",
                 "kind": "activity",
                 "activity_id": "id",
             }

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/calendar_blueprint.py

@@ -55,7 +55,7 @@ def make_calendar_blueprint(repository: ActivityRepository) -> Blueprint:
 
         filtered = meta.loc[
             (meta["year"] == year) & (meta["month"] == month)
-        ].sort_values("start")
+        ].sort_values("start_local")
 
         weeks = collections.defaultdict(dict)
         day_of_month = collections.defaultdict(dict)
@@ -67,7 +67,7 @@ def make_calendar_blueprint(repository: ActivityRepository) -> Blueprint:
             date += datetime.timedelta(days=1)
 
         for index, row in filtered.iterrows():
-            iso = row["start"].isocalendar()
+            iso = row["start_local"].isocalendar()
             weeks[iso.week][iso.weekday].append(
                 {
                     "name": row["name"],

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/eddington_blueprints.py

@@ -64,22 +64,19 @@ def _render_eddington_template(
 
     query = search_query_from_form(request.args)
     search_query_history.register_query(query)
-    activities = apply_search_query(query).dropna(subset=["start", column_name]).copy()
+    activities = (
+        apply_search_query(query).dropna(subset=["start_local", column_name]).copy()
+    )
 
     assert (
         len(activities) > 0
     ), "The filter has selected zero elements, that cannot work here."
 
-    activities["year"] = [start.year for start in activities["start"]]
-    activities["date"] = [start.date() for start in activities["start"]]
-    activities["isoyear"] = [start.isocalendar().year for start in activities["start"]]
-    activities["isoweek"] = [start.isocalendar().week for start in activities["start"]]
-
     en_per_day, eddington_df_per_day = _get_values_per_group(
         activities.groupby("date"), column_name, divisor
     )
     en_per_week, eddington_df_per_week = _get_values_per_group(
-        activities.groupby(["isoyear", "isoweek"]), column_name, divisor
+        activities.groupby(["iso_year", "week"]), column_name, divisor
     )
 
     return render_template(
@@ -207,9 +204,7 @@ def _get_eddington_number(elevation_gains: pd.Series, divisor: int) -> int:
 def _get_yearly_eddington(
     meta: pd.DataFrame, columnName: str, divisor: int
 ) -> dict[int, int]:
-    meta = meta.dropna(subset=["start", columnName]).copy()
-    meta["year"] = [start.year for start in meta["start"]]
-    meta["date"] = [start.date() for start in meta["start"]]
+    meta = meta.dropna(subset=["start_local", columnName]).copy()
 
     yearly_eddington = meta.groupby("year").apply(
         lambda group: _get_eddington_number(

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/entry_views.py

@@ -64,18 +64,18 @@ def _last_30_days_meta_plot(
     )
     return (
         alt.Chart(
-            meta.loc[meta["start"] > before_30_days],
+            meta.loc[meta["start_local"] > before_30_days],
             width=700,
             height=200,
             title=f"{column.display_name} per day",
         )
         .mark_bar()
         .encode(
-            alt.X("yearmonthdate(start)", title="Date"),
+            alt.X("yearmonthdate(start_local)", title="Date"),
             alt.Y(f"sum({column.name})", title=f"{column.name} / {column.unit}"),
             alt.Color("kind", scale=kind_scale, title="Kind"),
             [
-                alt.Tooltip("yearmonthdate(start)", title="Date"),
+                alt.Tooltip("yearmonthdate(start_local)", title="Date"),
                 alt.Tooltip("kind", title="Kind"),
                 alt.Tooltip(
                     f"sum({column.name})",

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/equipment_blueprint.py

@@ -22,9 +22,9 @@ def make_equipment_blueprint(
         )
 
         # Prepare data for the stacked area chart
-        activities = repository.meta.dropna(subset=["start"])
+        activities = repository.meta.dropna(subset=["start_local"])
         activities["month"] = (
-            activities["start"].dt.to_period("M").apply(lambda r: r.start_time)
+            activities["start_local"].dt.to_period("M").apply(lambda r: r.start_time)
         )
         monthly_data = (
             activities.groupby(["month", "equipment"])
@@ -58,7 +58,7 @@ def make_equipment_blueprint(
             selection = repository.meta.loc[repository.meta["equipment"] == equipment]
             total_distances = pd.DataFrame(
                 {
-                    "time": selection["start"],
+                    "time": selection["start_local"],
                     "total_distance_km": selection["distance_km"].cumsum(),
                 }
             )
@@ -95,7 +95,7 @@ def make_equipment_blueprint(
                 )
                 .mark_bar()
                 .encode(
-                    alt.X("year(start):O", title="Year"),
+                    alt.X("year(start_local):O", title="Year"),
                     alt.Y("sum(distance_km)", title="Distance / km"),
                     alt.Color(
                         "kind",
@@ -103,7 +103,7 @@ def make_equipment_blueprint(
                         title="Kind",
                     ),
                     tooltip=[
-                        alt.Tooltip("year(start):O", title="Year"),
+                        alt.Tooltip("year(start_local):O", title="Year"),
                         alt.Tooltip(
                             "sum(distance_km):Q", title="Distance / km", format=".0f"
                         ),

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/explorer_blueprint.py

@@ -173,7 +173,7 @@ def make_explorer_blueprint(
         return redirect(url_for(".map", zoom=zoom))
 
     @blueprint.route(
-        "/<int:zoom>/<float:north>/<float:east>/<float:south>/<float:west>/missing.<suffix>"
+        "/<int:zoom>/<float(signed=True):north>/<float(signed=True):east>/<float(signed=True):south>/<float(signed=True):west>/missing.<suffix>"
     )
     def download_missing(
         zoom: int, north: float, east: float, south: float, west: float, suffix: str
@@ -198,7 +198,7 @@ def make_explorer_blueprint(
         )
 
     @blueprint.route(
-        "/<int:zoom>/<float:north>/<float:east>/<float:south>/<float:west>/explored.<suffix>"
+        "/<int:zoom>/<float(signed=True):north>/<float(signed=True):east>/<float(signed=True):south>/<float(signed=True):west>/explored.<suffix>"
     )
     def download_explored(
         zoom: int, north: float, east: float, south: float, west: float, suffix: str
@@ -424,7 +424,9 @@ def make_explorer_blueprint(
         pl.imsave(f, result, format="png")
         return Response(bytes(f.getbuffer()), mimetype="image/png")
 
-    @blueprint.route("/<int:zoom>/info/<float:latitude>/<float:longitude>")
+    @blueprint.route(
+        "/<int:zoom>/info/<float(signed=True):latitude>/<float(signed=True):longitude>"
+    )
     def info(zoom: int, latitude: float, longitude: float) -> dict:
         tile_visits = tile_visit_accessor.tile_state["tile_visits"][zoom]
         evolution_state = tile_visit_accessor.tile_state["evolution_state"][zoom]

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/plot_builder_blueprint.py

@@ -42,7 +42,7 @@ def make_plot_builder_blueprint(
         spec = PlotSpec(
             name="My New Plot",
             mark="bar",
-            x="year(start):O",
+            x="year(start_local):O",
             y="sum(distance_km)",
             color="kind",
         )

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/blueprints/summary_blueprint.py

@@ -164,7 +164,7 @@ def heatmap_per_day(df: pd.DataFrame, column: ColumnDescription) -> str:
 def _filter_past_year(df: pd.DataFrame) -> pd.DataFrame:
     now = datetime.datetime.combine(datetime.date.today(), datetime.time.min)
     start = now - datetime.timedelta(days=365)
-    return df.loc[df["start"] >= start]
+    return df.loc[df["start_local"] >= start]
 
 
 def make_summary_blueprint(
@@ -181,7 +181,7 @@ def make_summary_blueprint(
         df = apply_search_query(query)
 
         kind_scale = make_kind_scale(repository.meta, config)
-        df_without_nan = df.loc[~pd.isna(df["start"])]
+        df_without_nan = df.loc[~pd.isna(df["start_local"])]
 
         return render_template(
             "summary/index.html.j2",

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/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.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/templates/activity/day.html.j2

@@ -50,7 +50,7 @@
                         <td><span style="color: {{ activity['color'] }};">█</span> <a
                                 href="{{ url_for('activity.show', id=activity.id) }}">{{
                                 activity.name }}</a></td>
-                        <td>{{ activity.start|dt }}</td>
+                        <td>{{ activity.start_local|dt }}</td>
                         <td>{{ activity.distance_km | round(1) }}</td>
                         <td>{{ activity.elapsed_time|td }}</td>
                         <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/templates/activity/show.html.j2

@@ -308,7 +308,7 @@
                 <tbody>
                     {% for other_activity in similar_activites %}
                     <tr>
-                        <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start|dt
+                        <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start_local|dt
                                 }}</a></td>
                         <td>{{ other_activity.distance_km | round(1) }}</td>
                         <td>{{ other_activity.elapsed_time|td }}</td>

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/geo_activity_playground/webui/templates/search/index.html.j2

@@ -25,8 +25,8 @@
         <tr>
             <td><a href="{{ url_for('activity.show', id=activity['id']) }}">{{ activity['name'] }}</a></td>
             <td>
-                {% if activity['start'] is defined %}
-                {{ activity['start']|dt }}
+                {% if activity['start_local'] is defined %}
+                {{ activity['start_local']|dt }} {{ activity.iana_timezone }}
                 {% endif %}
             </td>
             <td>{{ '%.1f' % activity["distance_km"] }} km</td>

{geo_activity_playground-1.8.3 → geo_activity_playground-1.9.1}/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 → geo_activity_playground-1.9.1}/pyproject.toml

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