geo-activity-playground 0.29.2__tar.gz → 0.30.0__tar.gz

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/PKG-INFO

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

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/core/config.py

@@ -29,6 +29,7 @@ class Config:
     )
     heart_rate_resting: int = 0
     heart_rate_maximum: Optional[int] = None
+    kind_renames: dict[str, str] = dataclasses.field(default_factory=dict)
     kinds_without_achievements: list[str] = dataclasses.field(default_factory=list)
     metadata_extraction_regexes: list[str] = dataclasses.field(default_factory=list)
     num_processes: Optional[int] = 1
@@ -39,6 +40,7 @@ class Config:
     strava_client_id: int = 131693
     strava_client_secret: str = "0ccc0100a2c218512a7ef0cea3b0e322fb4b4365"
     strava_client_code: Optional[str] = None
+    time_diff_threshold_seconds: Optional[int] = 30
     upload_password: Optional[str] = None
 
 

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/core/enrichment.py

@@ -82,11 +82,15 @@ def enrich_activities(config: Config) -> None:
             )
             continue
 
+        # Rename kinds if needed.
+        if metadata["kind"] in config.kind_renames:
+            metadata["kind"] = config.kind_renames[metadata["kind"]]
+
         # Enrich time series.
         if metadata["kind"] in config.kinds_without_achievements:
             metadata["consider_for_achievements"] = False
         time_series = _embellish_single_time_series(
-            time_series, metadata.get("start", None)
+            time_series, metadata.get("start", None), config.time_diff_threshold_seconds
         )
         metadata.update(_get_metadata_from_timeseries(time_series))
 
@@ -131,7 +135,9 @@ def _compute_moving_time(time_series: pd.DataFrame) -> datetime.timedelta:
 
 
 def _embellish_single_time_series(
-    timeseries: pd.DataFrame, start: Optional[datetime.datetime] = None
+    timeseries: pd.DataFrame,
+    start: Optional[datetime.datetime],
+    time_diff_threshold_seconds: int,
 ) -> pd.DataFrame:
     if start is not None and pd.api.types.is_dtype_equal(
         timeseries["time"].dtype, "int64"
@@ -153,10 +159,12 @@ def _embellish_single_time_series(
         timeseries["latitude"],
         timeseries["longitude"],
     ).fillna(0.0)
-    time_diff_threshold_seconds = 30
-    time_diff = (timeseries["time"] - timeseries["time"].shift(1)).dt.total_seconds()
-    jump_indices = time_diff >= time_diff_threshold_seconds
-    distances.loc[jump_indices] = 0.0
+    if time_diff_threshold_seconds:
+        time_diff = (
+            timeseries["time"] - timeseries["time"].shift(1)
+        ).dt.total_seconds()
+        jump_indices = time_diff >= time_diff_threshold_seconds
+        distances.loc[jump_indices] = 0.0
 
     if "distance_km" not in timeseries.columns:
         timeseries["distance_km"] = pd.Series(np.cumsum(distances)) / 1000
@@ -173,7 +181,10 @@ def _embellish_single_time_series(
         timeseries = timeseries.loc[~potential_jumps].copy()
 
     if "segment_id" not in timeseries.columns:
-        timeseries["segment_id"] = np.cumsum(jump_indices)
+        if time_diff_threshold_seconds:
+            timeseries["segment_id"] = np.cumsum(jump_indices)
+        else:
+            timeseries["segment_id"] = 0
 
     if "x" not in timeseries.columns:
         x, y = compute_tile_float(timeseries["latitude"], timeseries["longitude"], 0)

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/core/paths.py

@@ -8,7 +8,6 @@ import typing
 
 
 def dir_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
-    @functools.cache
     def wrapper() -> pathlib.Path:
         path.mkdir(exist_ok=True, parents=True)
         return path
@@ -17,7 +16,6 @@ def dir_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
 
 
 def file_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
-    @functools.cache
     def wrapper() -> pathlib.Path:
         path.parent.mkdir(exist_ok=True, parents=True)
         return path

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/importers/strava_api.py

@@ -139,7 +139,7 @@ def try_import_strava(config: Config) -> bool:
                         "commute": activity.commute,
                         "distance_km": activity.distance / 1000,
                         "name": activity.name,
-                        "kind": str(activity.type),
+                        "kind": str(activity.type.root),
                         "start": convert_to_datetime_ns(activity.start_date),
                         "elapsed_time": activity.elapsed_time,
                         "equipment": gear_names[activity.gear_id],

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/activity/controller.py

@@ -115,6 +115,8 @@ class ActivityController:
             result["altitude_time_plot"] = altitude_time_plot(time_series)
         if "heartrate" in time_series.columns:
             result["heartrate_time_plot"] = heart_rate_time_plot(time_series)
+        if "cadence" in time_series.columns:
+            result["cadence_time_plot"] = cadence_time_plot(time_series)
         return result
 
     def render_sharepic(self, id: int) -> bytes:
@@ -324,6 +326,20 @@ def heart_rate_time_plot(time_series: pd.DataFrame) -> str:
     )
 
 
+def cadence_time_plot(time_series: pd.DataFrame) -> str:
+    return (
+        alt.Chart(time_series, title="Cadence")
+        .mark_line()
+        .encode(
+            alt.X("time", title="Time"),
+            alt.Y("cadence", title="Cadence"),
+            alt.Color("segment_id:N", title="Segment"),
+        )
+        .interactive(bind_y=False)
+        .to_json(format="vega")
+    )
+
+
 def heart_rate_zone_plot(heart_zones: pd.DataFrame) -> str:
     return (
         alt.Chart(heart_zones, title="Heart Rate Zones")

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/activity/templates/activity/day.html.j2

@@ -41,7 +41,7 @@
     <div class="col">
         <h2>Activities</h2>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Name</th>

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/activity/templates/activity/name.html.j2

@@ -50,12 +50,12 @@
     <div class="col">
         <h2>Activities</h2>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Name</th>
                     <th>Date</th>
-                    <th>Distance / km</th>
+                    <th class="numeric-sort">Distance / km</th>
                     <th>Elapsed time</th>
                     <th>Equipment</th>
                     <th>Kind</th>

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/activity/templates/activity/show.html.j2

@@ -129,6 +129,17 @@
 </div>
 {% endif %}
 
+{% if cadence_time_plot is defined %}
+<h2>Cadence</h2>
+
+<div class="row mb-3">
+    <div class="col-md-4">
+        {{ vega_direct("cadence_time_plot", cadence_time_plot) }}
+    </div>
+</div>
+{% endif %}
+
+
 <h2>Share picture</h2>
 
 <p><img src="{{ url_for('.sharepic', id=activity.id) }}" /></p>
@@ -177,11 +188,11 @@
 
         <p><a href="{{ url_for('.name', name=activity['name']) }}">Overview over these activities</a></p>
 
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Date</th>
-                    <th>Distance / km</th>
+                    <th class="numeric-sort">Distance / km</th>
                     <th>Elapsed time</th>
                     <th>Equipment</th>
                     <th>Kind</th>

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/equipment/templates/equipment/index.html.j2

@@ -9,7 +9,7 @@
 
 <div class="row mb-3">
     <div class="col">
-        <table class="table">
+        <table class="table table-sort table-arrows">
             <thead>
                 <tr>
                     <th>Equipment</th>

geo_activity_playground-0.30.0/geo_activity_playground/webui/search/blueprint.py

@@ -0,0 +1,101 @@
+from functools import reduce
+
+import dateutil.parser
+from flask import Blueprint
+from flask import flash
+from flask import render_template
+from flask import request
+from flask import Response
+
+from ...core.activities import ActivityRepository
+
+
+def reduce_or(selections):
+    return reduce(lambda a, b: a | b, selections)
+
+
+def reduce_and(selections):
+    return reduce(lambda a, b: a & b, selections)
+
+
+def make_search_blueprint(repository: ActivityRepository) -> Blueprint:
+    blueprint = Blueprint("search", __name__, template_folder="templates")
+
+    @blueprint.route("/")
+    def index():
+        kinds_avail = repository.meta["kind"].unique()
+        equipments_avail = repository.meta["equipment"].unique()
+
+        print(request.args)
+
+        activities = repository.meta
+
+        if equipments := request.args.getlist("equipment"):
+            selection = reduce_or(
+                activities["equipment"] == equipment for equipment in equipments
+            )
+            activities = activities.loc[selection]
+
+        if kinds := request.args.getlist("kind"):
+            selection = reduce_or(activities["kind"] == kind for kind in kinds)
+            activities = activities.loc[selection]
+
+        name_exact = bool(request.args.get("name_exact", False))
+        name_casing = bool(request.args.get("name_casing", False))
+        if name := request.args.get("name", ""):
+            if name_casing:
+                haystack = activities["name"]
+                needle = name
+            else:
+                haystack = activities["name"].str.lower()
+                needle = name.lower()
+            if name_exact:
+                selection = haystack == needle
+            else:
+                selection = [needle in an for an in haystack]
+            activities = activities.loc[selection]
+
+        begin = request.args.get("begin", "")
+        end = request.args.get("end", "")
+
+        if begin:
+            try:
+                begin_dt = dateutil.parser.parse(begin)
+            except ValueError:
+                flash(
+                    f"Cannot parse date `{begin}`, please use a different format.",
+                    category="danger",
+                )
+            else:
+                selection = begin_dt <= activities["start"]
+                activities = activities.loc[selection]
+
+        if end:
+            try:
+                end_dt = dateutil.parser.parse(end)
+            except ValueError:
+                flash(
+                    f"Cannot parse date `{end}`, please use a different format.",
+                    category="danger",
+                )
+            else:
+                selection = activities["start"] < end_dt
+                activities = activities.loc[selection]
+
+        activities = activities.sort_values("start", ascending=False)
+
+        return render_template(
+            "search/index.html.j2",
+            activities=list(activities.iterrows()),
+            equipments=request.args.getlist("equipment"),
+            equipments_avail=sorted(equipments_avail),
+            kinds=request.args.getlist("kind"),
+            kinds_avail=sorted(kinds_avail),
+            name=name,
+            name_exact=name_exact,
+            name_casing=name_casing,
+            begin=begin,
+            end=end,
+        )
+
+    return blueprint

geo_activity_playground-0.30.0/geo_activity_playground/webui/search/templates/search/index.html.j2

@@ -0,0 +1,91 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="row mb-3">Activities Overview & Search</h1>
+
+<div class="row mb-3">
+    <div class="col-md-2">
+        <form>
+            <div class="mb-3">
+                <label for="name" class="form-label">Name</label>
+                <input type="text" class="form-control" id="name" name="name" value="{{ name }}">
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="name_exact" value="true" id="name_exact" {% if
+                        name_exact %} checked {% endif %}>
+                    <label class="form-check-label" for="name_exact">
+                        Exact match
+                    </label>
+                </div>
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="name_casing" value="true" id="name_casing" {%
+                        if name_casing %} checked {% endif %}>
+                    <label class="form-check-label" for="name_casing">
+                        Case sensitive
+                    </label>
+                </div>
+            </div>
+
+            <div class="mb-3">
+                <label for="begin" class="form-label">After</label>
+                <input type="text" class="form-control" id="begin" name="begin" value="{{ begin }}">
+                <label for="end" class="form-label">Until</label>
+                <input type="text" class="form-control" id="end" name="end" value="{{ end }}">
+            </div>
+
+            <div class="mb-3">
+                <label for="" class="form-label">Kind</label>
+                {% for kind in kinds_avail %}
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="kind" value="{{ kind }}" id="kind_{{ kind }}"
+                        {% if kind in kinds %} checked {% endif %}>
+                    <label class="form-check-label" for="kind_{{ kind }}">
+                        {{ kind }}
+                    </label>
+                </div>
+                {% endfor %}
+            </div>
+
+            <div class="mb-3">
+                <label for="" class="form-label">Equipment</label>
+                {% for equipment in equipments_avail %}
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="equipment" value="{{ equipment }}"
+                        id="equipment_{{ equipment }}" {% if equipment in equipments %} checked {% endif %}>
+                    <label class="form-check-label" for="equipment_{{ equipment }}">
+                        {{ equipment }}
+                    </label>
+                </div>
+                {% endfor %}
+            </div>
+
+            <button type="submit" class="btn btn-primary">Search</button>
+        </form>
+    </div>
+
+    <div class="col-md-10">
+        <table class="table table-sort table-arrows">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Start</th>
+                    <th>Kind</th>
+                    <th class="numeric-sort">Distance</th>
+                    <th>Elapsed time</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for index, activity in activities %}
+                <tr>
+                    <td><a href="{{ url_for('activity.show', id=activity['id']) }}">{{ activity['name'] }}</a></td>
+                    <td>{{ activity['start'] }}</td>
+                    <td>{{ activity['kind'] }}</td>
+                    <td>{{ '%.1f' % activity["distance_km"] }} km</td>
+                    <td>{{ activity.elapsed_time }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+{% endblock %}

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/settings/blueprint.py

@@ -1,3 +1,4 @@
+import shutil
 from typing import Optional
 
 from flask import Blueprint
@@ -8,6 +9,7 @@ from flask import request
 from flask import url_for
 
 from geo_activity_playground.core.config import ConfigAccessor
+from geo_activity_playground.core.paths import _activity_enriched_dir
 from geo_activity_playground.webui.authenticator import Authenticator
 from geo_activity_playground.webui.authenticator import needs_authentication
 from geo_activity_playground.webui.settings.controller import SettingsController
@@ -139,6 +141,33 @@ def make_settings_blueprint(
             "settings/heart-rate.html.j2", **settings_controller.render_heart_rate()
         )
 
+    @blueprint.route("/kind-renames", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def kind_renames():
+        if request.method == "POST":
+            rules_str = request.form["rules_str"]
+            rules = {}
+            try:
+                for line in rules_str.strip().split("\n"):
+                    first, second = line.split(" => ")
+                    rules[first.strip()] = second.strip()
+                config_accessor().kind_renames = rules
+                config_accessor.save()
+                flash(f"Kind renames updated.", category="success")
+                shutil.rmtree(_activity_enriched_dir)
+                return redirect(url_for("upload.reload"))
+            except ValueError as e:
+                flash(f"Cannot parse this. Please try again.", category="danger")
+        else:
+            rules_str = "\n".join(
+                f"{key} => {value}"
+                for key, value in config_accessor().kind_renames.items()
+            )
+        return render_template(
+            "settings/kind-renames.html.j2",
+            rules_str=rules_str,
+        )
+
     @blueprint.route("/kinds-without-achievements", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def kinds_without_achievements():
@@ -173,6 +202,21 @@ def make_settings_blueprint(
             **settings_controller.render_privacy_zones(),
         )
 
+    @blueprint.route("/segmentation", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def segmentation():
+        if request.method == "POST":
+            threshold = int(request.form.get("threshold", 0))
+            config_accessor().time_diff_threshold_seconds = threshold
+            config_accessor.save()
+            flash(f"Threshold set to {threshold}.", category="success")
+            shutil.rmtree(_activity_enriched_dir)
+            return redirect(url_for("upload.reload"))
+        return render_template(
+            "settings/segmentation.html.j2",
+            threshold=config_accessor().time_diff_threshold_seconds,
+        )
+
     @blueprint.route("/sharepic", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def sharepic():

{geo_activity_playground-0.29.2 → geo_activity_playground-0.30.0}/geo_activity_playground/webui/settings/templates/settings/index.html.j2

@@ -47,6 +47,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Kind renames</h5>
+                    <p class="card-text">Bulk rename activity kinds</p>
+                    <a href="{{ url_for('.kind_renames') }}" class="btn btn-primary">Set up kind renames</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">
@@ -96,6 +105,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Track segmentation</h5>
+                    <p class="card-text">Split tracks into multiple segments if there are breaks or jumps.</p>
+                    <a href="{{ url_for('.segmentation') }}" class="btn btn-primary">Set up track segmentations</a>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 {% endblock %}

geo_activity_playground-0.30.0/geo_activity_playground/webui/settings/templates/settings/kind-renames.html.j2

@@ -0,0 +1,25 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Kind renaming</h1>
+
+<p>If you have used different apps for tracking, you might have that your bike rides have <i>kind</i> "ride", "Ride",
+    "Radfahrt" and so on. In order to unify these, you can specify mappings from old to new names.</p>
+
+<p>If you want to unify these to "Ride", enter the following:</p>
+
+<pre><code>
+ride =&gt; Ride
+Radfahrt =&gt; Ride
+</code></pre>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="rules" class="form-label">Rules</label>
+        <textarea class="form-control" id=rules" cols="80" rows="10" name="rules_str">{{ rules_str }}</textarea>
+    </div>
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

geo_activity_playground-0.30.0/geo_activity_playground/webui/settings/templates/settings/segmentation.html.j2

@@ -0,0 +1,27 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Track segmentation</h1>
+
+<p>Some activity tracking apps or devices automatically pause the recording when there is no movement for a while. Other
+    trackers do not record new points when one goes in a straight line. And some users manually pause the activity,
+    forget to resume and resume after having moved for a while.</p>
+
+<p>Depending on the usage patterns one wants to segment the tracks into segments or really keep them as one long track.
+    In order to cater for different use cases, this can be changed with a setting.</p>
+
+<p>In the following you can enter a threshold. If these many seconds elapse between two subsequent points in the track,
+    these will be considered different segments and not be connected with a straight line. Entering "0" disabled
+    segmentation.</p>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="threshold" class="form-label">Threshold / s</label>
+        <input type="text" class="form-control" id="threshold" name="threshold" value="{{ threshold }}" />
+    </div>
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}