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

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

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

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/core/activities.py

@@ -1,5 +1,6 @@
 import datetime
 import functools
+import json
 import logging
 import pickle
 from typing import Any
@@ -16,6 +17,7 @@ from tqdm import tqdm
 from geo_activity_playground.core.paths import activities_file
 from geo_activity_playground.core.paths import activity_enriched_meta_dir
 from geo_activity_playground.core.paths import activity_enriched_time_series_dir
+from geo_activity_playground.core.paths import activity_meta_override_dir
 
 logger = logging.getLogger(__name__)
 
@@ -83,7 +85,12 @@ def build_activity_meta() -> None:
     rows = []
     for new_id in tqdm(new_ids, desc="Register new activities"):
         with open(activity_enriched_meta_dir() / f"{new_id}.pickle", "rb") as f:
-            rows.append(pickle.load(f))
+            data = pickle.load(f)
+        override_file = activity_meta_override_dir() / f"{new_id}.json"
+        if override_file.exists():
+            with open(override_file) as f:
+                data.update(json.load(f))
+        rows.append(data)
 
     if rows:
         new_shard = pd.DataFrame(rows)
@@ -140,7 +147,6 @@ class ActivityRepository:
             if not dropna or not pd.isna(row["start"]):
                 yield row
 
-    @functools.lru_cache()
     def get_activity_by_id(self, id: int) -> ActivityMeta:
         activity = self.meta.loc[id]
         assert isinstance(activity["name"], str), activity["name"]
@@ -158,6 +164,9 @@ class ActivityRepository:
 
         return df
 
+    def save(self) -> None:
+        self._meta.to_parquet(activities_file())
+
 
 def make_geojson_from_time_series(time_series: pd.DataFrame) -> str:
     fc = geojson.FeatureCollection(

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

@@ -53,6 +53,8 @@ _strava_last_activity_date_path = _cache_dir / "strava-last-activity-date.json"
 
 _new_config_file = pathlib.Path("config.json")
 
+_activity_meta_override_dir = pathlib.Path("Metadata Override")
+
 
 cache_dir = dir_wrapper(_cache_dir)
 
@@ -63,6 +65,7 @@ activity_enriched_meta_dir = dir_wrapper(_activity_enriched_meta_dir)
 activity_enriched_time_series_dir = dir_wrapper(_activity_enriched_time_series_dir)
 tiles_per_time_series = dir_wrapper(_tiles_per_time_series)
 strava_api_dir = dir_wrapper(_strava_api_dir)
+activity_meta_override_dir = dir_wrapper(_activity_meta_override_dir)
 
 activities_file = file_wrapper(_activities_file)
 strava_dynamic_config_path = file_wrapper(_strava_dynamic_config_path)

geo_activity_playground-0.31.0/geo_activity_playground/webui/activity/blueprint.py

@@ -0,0 +1,109 @@
+import json
+import urllib.parse
+from collections.abc import Collection
+
+from flask import Blueprint
+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
+from ...explorer.tile_visits import TileVisitAccessor
+from .controller import ActivityController
+from geo_activity_playground.core.config import Config
+from geo_activity_playground.core.paths import activity_meta_override_dir
+from geo_activity_playground.core.privacy_zones import PrivacyZone
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
+
+
+def make_activity_blueprint(
+    repository: ActivityRepository,
+    tile_visit_accessor: TileVisitAccessor,
+    config: Config,
+    authenticator: Authenticator,
+) -> Blueprint:
+    blueprint = Blueprint("activity", __name__, template_folder="templates")
+
+    activity_controller = ActivityController(repository, tile_visit_accessor, config)
+
+    @blueprint.route("/all")
+    def all():
+        return render_template(
+            "activity/lines.html.j2", **activity_controller.render_all()
+        )
+
+    @blueprint.route("/<id>")
+    def show(id: str):
+        return render_template(
+            "activity/show.html.j2", **activity_controller.render_activity(int(id))
+        )
+
+    @blueprint.route("/<id>/sharepic.png")
+    def sharepic(id: str):
+        return Response(
+            activity_controller.render_sharepic(int(id)),
+            mimetype="image/png",
+        )
+
+    @blueprint.route("/day/<year>/<month>/<day>")
+    def day(year: str, month: str, day: str):
+        return render_template(
+            "activity/day.html.j2",
+            **activity_controller.render_day(int(year), int(month), int(day)),
+        )
+
+    @blueprint.route("/name/<name>")
+    def name(name: str):
+        return render_template(
+            "activity/name.html.j2",
+            **activity_controller.render_name(urllib.parse.unquote(name)),
+        )
+
+    @blueprint.route("/edit/<id>", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def edit(id: str):
+        activity_id = int(id)
+        activity = repository.get_activity_by_id(activity_id)
+        override_file = activity_meta_override_dir() / f"{activity_id}.json"
+        if override_file.exists():
+            with open(override_file) as f:
+                override = json.load(f)
+        else:
+            override = {}
+
+        if request.method == "POST":
+            override = {}
+            if value := request.form.get("name"):
+                override["name"] = value
+                repository.meta.loc[activity_id, "name"] = value
+            if value := request.form.get("kind"):
+                override["kind"] = value
+                repository.meta.loc[activity_id, "kind"] = value
+            if value := request.form.get("equipment"):
+                override["equipment"] = value
+                repository.meta.loc[activity_id, "equipment"] = value
+            if value := request.form.get("commute"):
+                override["commute"] = True
+                repository.meta.loc[activity_id, "commute"] = True
+            if value := request.form.get("consider_for_achievements"):
+                override["consider_for_achievements"] = True
+                repository.meta.loc[activity_id, "consider_for_achievements"] = True
+
+            with open(override_file, "w") as f:
+                json.dump(override, f, ensure_ascii=False, indent=4, sort_keys=True)
+
+            repository.save()
+
+            return redirect(url_for(".show", id=activity_id))
+
+        return render_template(
+            "activity/edit.html.j2",
+            activity_id=activity_id,
+            activity=activity,
+            override=override,
+        )
+
+    return blueprint

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

@@ -58,9 +58,9 @@
                     <td><span style="color: {{ activity['color'] }};">█</span> <a
                             href="{{ url_for('activity.show', id=activity.id) }}">{{
                             activity.name }}</a></td>
-                    <td>{{ activity.start }}</td>
+                    <td>{{ activity.start|dt }}</td>
                     <td>{{ activity.distance_km | round(1) }}</td>
-                    <td>{{ activity.elapsed_time }}</td>
+                    <td>{{ activity.elapsed_time|td }}</td>
                     <td>{{ activity["equipment"] }}</td>
                     <td>{{ activity["kind"] }}</td>
                 </tr>
@@ -70,7 +70,7 @@
                     <td><b>Total</b></td>
                     <td></td>
                     <td><b>{{ total_distance | round(1) }}</b></td>
-                    <td><b>{{ total_elapsed_time }}</b></td>
+                    <td><b>{{ total_elapsed_time|td }}</b></td>
                     <td></td>
                     <td></td>
                 </tr>

geo_activity_playground-0.31.0/geo_activity_playground/webui/activity/templates/activity/edit.html.j2

@@ -0,0 +1,42 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Edit Activity</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Name</label>
+        <input type="text" class="form-control" id="name" name="name" value="{{ override['name'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="kind" class="form-label">Kind</label>
+        <input type="text" class="form-control" id="kind" name="kind" value="{{ override['kind'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="equipment" class="form-label">Equipment</label>
+        <input type="text" class="form-control" id="equipment" name="equipment" value="{{ override['equipment'] }}" />
+    </div>
+
+    <div class="mb-3">
+        <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="commute" name="commute" {% if override['commute'] %}
+                checked {% endif %} />
+            <label for="commute" class="form-check-label">Commute</label>
+        </div>
+    </div>
+
+    <div class="mb-3">
+        <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="consider_for_achievements"
+                name="consider_for_achievements" {% if override['consider_for_achievements'] %} checked {% endif %} />
+            <label for="consider_for_achievements" class="form-check-label">Consider for achievements</label>
+        </div>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

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

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

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

@@ -19,9 +19,9 @@
             <dt>Distance</dt>
             <dd>{{ activity.distance_km|round(1) }} km</dd>
             <dt>Elapsed time</dt>
-            <dd>{{ activity.elapsed_time }}</dd>
+            <dd>{{ activity.elapsed_time|td }}</dd>
             <dt>Moving time</dt>
-            <dd>{{ activity.moving_time }}</dd>
+            <dd>{{ activity.moving_time|td }}</dd>
             <dt>Start time</dt>
             <dd><a href="{{ url_for('activity.day', year=date.year, month=date.month, day=date.day) }}">{{ date }}</a>
                 {{ time }}
@@ -31,7 +31,7 @@
             <dt>Steps</dt>
             <dd>{{ activity.steps }}</dd>
             <dt>Equipment</dt>
-            <dd>{{ activity.equipment }}</dd>
+            <dd>{{ activity['equipment'] }}</dd>
             <dt>New Explorer Tiles</dt>
             <dd>{{ new_tiles[14] }}</dd>
             <dt>New Squadratinhos</dt>
@@ -41,6 +41,8 @@
             <dt>Source path</dt>
             <dd>{{ activity.path }}</dd>
         </dl>
+
+        <a href="{{ url_for('.edit', id=activity['id']) }}" class="btn btn-secondary btn-small">Edit metadata</a>
     </div>
     <div class="col-8">
         <div id="activity-map" style="height: 500px;" class="mb-3"></div>
@@ -201,10 +203,10 @@
             <tbody>
                 {% for other_activity in similar_activites %}
                 <tr>
-                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start
+                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start|dt
                             }}</a></td>
                     <td>{{ other_activity.distance_km | round(1) }}</td>
-                    <td>{{ other_activity.elapsed_time }}</td>
+                    <td>{{ other_activity.elapsed_time|td }}</td>
                     <td>{{ other_activity["equipment"] }}</td>
                     <td>{{ other_activity["kind"] }}</td>
                 </tr>

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/webui/app.py

@@ -1,3 +1,4 @@
+import datetime
 import importlib
 import json
 import pathlib
@@ -60,6 +61,18 @@ def web_ui_main(
     app.config["UPLOAD_FOLDER"] = "Activities"
     app.secret_key = get_secret_key()
 
+    @app.template_filter()
+    def dt(value: datetime.datetime):
+        return value.strftime("%Y-%m-%d %H:%M")
+
+    @app.template_filter()
+    def td(v: datetime.timedelta):
+        seconds = v.total_seconds()
+        h = int(seconds // 3600)
+        m = int(seconds // 60 % 60)
+        s = int(seconds // 1 % 60)
+        return f"{h}:{m:02d}:{s:02d}"
+
     authenticator = Authenticator(config_accessor())
 
     route_start(app, repository, config_accessor())
@@ -68,9 +81,7 @@ def web_ui_main(
 
     app.register_blueprint(
         make_activity_blueprint(
-            repository,
-            tile_visit_accessor,
-            config_accessor(),
+            repository, tile_visit_accessor, config_accessor(), authenticator
         ),
         url_prefix="/activity",
     )

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -90,23 +90,25 @@ class HeatmapController:
             tile_counts = np.zeros(tile_pixels, dtype=np.int32)
         tile_count_cache_path.parent.mkdir(parents=True, exist_ok=True)
         activity_ids = self.activities_per_tile[z].get((x, y), set())
-        if activity_ids:
+        activity_ids_kind = set()
+        for activity_id in activity_ids:
+            activity = self._repository.get_activity_by_id(activity_id)
+            if activity["kind"] == kind:
+                activity_ids_kind.add(activity_id)
+        if activity_ids_kind:
             with work_tracker(
                 tile_count_cache_path.with_suffix(".json")
             ) as parsed_activities:
-                if parsed_activities - activity_ids:
+                if parsed_activities - activity_ids_kind:
                     logger.warning(
                         f"Resetting heatmap cache for {kind=}/{x=}/{y=}/{z=} because activities have been removed."
                     )
                     tile_counts = np.zeros(tile_pixels, dtype=np.int32)
                     parsed_activities.clear()
-                for activity_id in activity_ids:
+                for activity_id in activity_ids_kind:
                     if activity_id in parsed_activities:
                         continue
                     parsed_activities.add(activity_id)
-                    activity = self._repository.get_activity_by_id(activity_id)
-                    if activity["kind"] != kind:
-                        continue
                     time_series = self._repository.get_time_series(activity_id)
                     for _, group in time_series.groupby("segment_id"):
                         xy_pixels = (

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/webui/search/templates/search/index.html.j2

@@ -78,10 +78,10 @@
                 {% 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['start']|dt }}</td>
                     <td>{{ activity['kind'] }}</td>
                     <td>{{ '%.1f' % activity["distance_km"] }} km</td>
-                    <td>{{ activity.elapsed_time }}</td>
+                    <td>{{ activity.elapsed_time|td }}</td>
                 </tr>
                 {% endfor %}
             </tbody>

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/webui/summary/templates/summary/index.html.j2

@@ -123,7 +123,7 @@
                 </p>
                 <p class="card-text"><small class="text-body-secondary"></small>{{ activity.kind }} with {{
                     (activity.distance_km)|round(1) }} km in {{
-                    activity.elapsed_time }} on {{ activity.start }}</small></p>
+                    activity.elapsed_time|td }} on {{ activity.start|dt }}</small></p>
             </div>
         </div>
     </div>

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/geo_activity_playground/webui/templates/home.html.j2

@@ -49,8 +49,8 @@
                     <h5 class="card-title">{{ elem.activity["name"] }}</h5>
                 </a>
                 <p class="card-text">{{ elem.activity.kind }} with {{ (elem.activity.distance_km)|round(1) }} km in {{
-                    elem.activity.elapsed_time }}</p>
-                <p class="card-text"><small class="text-body-secondary">{{ elem.activity.start }}</small></p>
+                    elem.activity.elapsed_time|td }}</p>
+                <p class="card-text"><small class="text-body-secondary">{{ elem.activity.start|dt }}</small></p>
             </div>
         </div>
     </div>

{geo_activity_playground-0.30.0 → geo_activity_playground-0.31.0}/pyproject.toml

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

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

@@ -1,57 +0,0 @@
-import urllib.parse
-from collections.abc import Collection
-
-from flask import Blueprint
-from flask import render_template
-from flask import Response
-
-from ...core.activities import ActivityRepository
-from ...explorer.tile_visits import TileVisitAccessor
-from .controller import ActivityController
-from geo_activity_playground.core.config import Config
-from geo_activity_playground.core.privacy_zones import PrivacyZone
-
-
-def make_activity_blueprint(
-    repository: ActivityRepository,
-    tile_visit_accessor: TileVisitAccessor,
-    config: Config,
-) -> Blueprint:
-    blueprint = Blueprint("activity", __name__, template_folder="templates")
-
-    activity_controller = ActivityController(repository, tile_visit_accessor, config)
-
-    @blueprint.route("/all")
-    def all():
-        return render_template(
-            "activity/lines.html.j2", **activity_controller.render_all()
-        )
-
-    @blueprint.route("/<id>")
-    def show(id: str):
-        return render_template(
-            "activity/show.html.j2", **activity_controller.render_activity(int(id))
-        )
-
-    @blueprint.route("/<id>/sharepic.png")
-    def sharepic(id: str):
-        return Response(
-            activity_controller.render_sharepic(int(id)),
-            mimetype="image/png",
-        )
-
-    @blueprint.route("/day/<year>/<month>/<day>")
-    def day(year: str, month: str, day: str):
-        return render_template(
-            "activity/day.html.j2",
-            **activity_controller.render_day(int(year), int(month), int(day))
-        )
-
-    @blueprint.route("/name/<name>")
-    def name(name: str):
-        return render_template(
-            "activity/name.html.j2",
-            **activity_controller.render_name(urllib.parse.unquote(name))
-        )
-
-    return blueprint