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

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

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

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/core/activities.py

@@ -2,6 +2,7 @@ import datetime
 import functools
 import logging
 import pickle
+from typing import Any
 from typing import Iterator
 from typing import Optional
 from typing import TypedDict
@@ -88,7 +89,10 @@ def build_activity_meta() -> None:
         new_shard = pd.DataFrame(rows)
         new_shard.index = new_shard["id"]
         new_shard.index.name = "index"
-        meta = pd.concat([meta, new_shard])
+        if len(meta):
+            meta = pd.concat([meta, new_shard])
+        else:
+            meta = new_shard
 
     if len(meta):
         assert pd.api.types.is_dtype_equal(meta["start"].dtype, "datetime64[ns]"), (
@@ -103,7 +107,7 @@ def build_activity_meta() -> None:
 
 class ActivityRepository:
     def __init__(self) -> None:
-        self.meta = None
+        self.meta = pd.DataFrame()
 
     def __len__(self) -> int:
         return len(self.meta)
@@ -116,10 +120,6 @@ class ActivityRepository:
             if activity_id in self.meta["id"]:
                 return True
 
-        for activity_meta in self._loose_activities:
-            if activity_meta["id"] == activity_id:
-                return True
-
         return False
 
     def last_activity_date(self) -> Optional[datetime.datetime]:
@@ -198,7 +198,7 @@ def make_geojson_color_line(time_series: pd.DataFrame) -> str:
     return geojson.dumps(feature_collection)
 
 
-def make_speed_color_bar(time_series: pd.DataFrame) -> dict[str, str]:
+def make_speed_color_bar(time_series: pd.DataFrame) -> dict[str, Any]:
     speed_without_na = time_series["speed"].dropna()
     low = min(speed_without_na)
     high = max(speed_without_na)

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/core/time_conversion.py

@@ -2,7 +2,7 @@ import numpy as np
 import pandas as pd
 
 
-def convert_to_datetime_ns(date) -> np.datetime64:
+def convert_to_datetime_ns(date) -> np.datetime64 | pd.Series:
     if isinstance(date, pd.Series):
         ts = pd.to_datetime(date)
         ts = ts.dt.tz_localize(None)

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/explorer/tile_visits.py

@@ -59,7 +59,7 @@ class TileEvolutionState:
 class TileState(TypedDict):
     tile_visits: dict[int, dict[tuple[int, int], TileInfo]]
     tile_history: dict[int, pd.DataFrame]
-    activities_per_tile: dict[int, set[int]]
+    activities_per_tile: dict[int, dict[tuple[int, int], set[int]]]
     processed_activities: set[int]
     evolution_state: dict[int, TileEvolutionState]
     version: int
@@ -165,7 +165,7 @@ def _process_activity(
     for zoom in reversed(range(20)):
         activities_per_tile = tile_state["activities_per_tile"][zoom]
 
-        new_tile_history_soa = {
+        new_tile_history_soa: dict[str, list] = {
             "activity_id": [],
             "time": [],
             "tile_x": [],

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/importers/activity_parsers.py

@@ -3,10 +3,10 @@ import gzip
 import logging
 import pathlib
 import xml
+from collections.abc import Iterator
 
 import charset_normalizer
 import dateutil.parser
-import fitdecode
 import fitdecode.exceptions
 import gpxpy
 import pandas as pd
@@ -246,26 +246,37 @@ def read_kml_activity(path: pathlib.Path, opener) -> pd.DataFrame:
     with opener(path, "rb") as f:
         kml_dict = xmltodict.parse(f)
     doc = kml_dict["kml"]["Document"]
-    keypoint_folder = doc["Folder"]
-    placemark = keypoint_folder["Placemark"]
-    track = placemark["gx:Track"]
     rows = []
-    for when, where in zip(track["when"], track["gx:coord"]):
-        time = dateutil.parser.parse(when)
-        time = convert_to_datetime_ns(time)
-        parts = where.split(" ")
-        if len(parts) == 2:
-            lon, lat = parts
-            alt = None
-        if len(parts) == 3:
-            lon, lat, alt = parts
-        row = {"time": time, "latitude": float(lat), "longitude": float(lon)}
-        if alt is not None:
-            row["altitude"] = float(alt)
-        rows.append(row)
+    for keypoint_folder in _list_or_scalar(doc["Folder"]):
+        for placemark in _list_or_scalar(keypoint_folder["Placemark"]):
+            for track in _list_or_scalar(placemark.get("gx:Track", [])):
+                for when, where in zip(track["when"], track["gx:coord"]):
+                    time = dateutil.parser.parse(when)
+                    time = convert_to_datetime_ns(time)
+                    parts = where.split(" ")
+                    if len(parts) == 2:
+                        lon, lat = parts
+                        alt = None
+                    if len(parts) == 3:
+                        lon, lat, alt = parts
+                    row = {
+                        "time": time,
+                        "latitude": float(lat),
+                        "longitude": float(lon),
+                    }
+                    if alt is not None:
+                        row["altitude"] = float(alt)
+                    rows.append(row)
     return pd.DataFrame(rows)
 
 
+def _list_or_scalar(thing) -> Iterator:
+    if isinstance(thing, list):
+        yield from thing
+    else:
+        yield thing
+
+
 def read_simra_activity(path: pathlib.Path, opener) -> pd.DataFrame:
     data = pd.read_csv(path, header=1)
     data["time"] = data["timeStamp"].apply(

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/importers/csv_parser.py

@@ -20,9 +20,8 @@ This module implements a "recursive descent parser" that parses this grammar.
 
 def parse_csv(text: str) -> list[list]:
     text = text.strip() + "\n"
-    result = {}
     index = 0
-    result = []
+    result: list[list] = []
     while index < len(text):
         line, index = _parse_line(text, index)
         result.append(line)

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/importers/directory.py

@@ -126,11 +126,12 @@ def _cache_single_file(path: pathlib.Path) -> Optional[tuple[pathlib.Path, str]]
             raise
 
         if len(timeseries) == 0:
-            return
+            return None
 
         timeseries.to_parquet(timeseries_path)
         with open(file_metadata_path, "wb") as f:
             pickle.dump(activity_meta_from_file, f)
+    return None
 
 
 def get_file_hash(path: pathlib.Path) -> int:

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

@@ -137,7 +137,7 @@ def try_import_strava(config: Config) -> bool:
                     **{
                         "id": activity.id,
                         "commute": activity.commute,
-                        "distance_km": activity.distance.magnitude / 1000,
+                        "distance_km": activity.distance / 1000,
                         "name": activity.name,
                         "kind": str(activity.type),
                         "start": convert_to_datetime_ns(activity.start_date),

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

@@ -72,6 +72,7 @@ class ActivityController:
         }
 
         new_tiles_geojson = {}
+        new_tiles_per_zoom = {}
         for zoom in sorted(self._config.explorer_zoom_levels):
             new_tiles = self._tile_visit_accessor.tile_state["tile_history"][zoom].loc[
                 self._tile_visit_accessor.tile_state["tile_history"][zoom][
@@ -88,6 +89,7 @@ class ActivityController:
                     zoom,
                 )
                 new_tiles_geojson[zoom] = make_grid_file_geojson(points)
+            new_tiles_per_zoom[zoom] = len(new_tiles)
 
         result = {
             "activity": activity,
@@ -100,7 +102,7 @@ class ActivityController:
             "speed_color_bar": make_speed_color_bar(time_series),
             "date": activity["start"].date(),
             "time": activity["start"].time(),
-            "new_tiles": new_tiles,
+            "new_tiles": new_tiles_per_zoom,
             "new_tiles_geojson": new_tiles_geojson,
         }
         if (

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

@@ -160,6 +160,7 @@
     {% for zoom, geojson in new_tiles_geojson.items() %}
     <div class="col-md-6">
         <h3>Zoom {{ zoom }}</h3>
+        <p>There are {{ new_tiles[zoom] }} new tiles:</p>
         <div id="map-{{ zoom }}" style="height: 300px; width: 100%;"></div>
         <script>
             let map{{ zoom }} = add_map("{{ zoom }}", {{ geojson | safe }})

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/explorer/controller.py

@@ -95,7 +95,7 @@ class ExplorerController:
         x2, y2 = compute_tile(south, east, zoom)
         tile_bounds = Bounds(x1, y1, x2 + 2, y2 + 2)
 
-        tile_histories = self._tile_visit_accessor.histories
+        tile_histories = self._tile_visit_accessor.tile_state["tile_history"]
         tiles = tile_histories[zoom]
         points = get_border_tiles(tiles, zoom, tile_bounds)
         if suffix == "geojson":
@@ -108,7 +108,7 @@ class ExplorerController:
         x2, y2 = compute_tile(south, east, zoom)
         tile_bounds = Bounds(x1, y1, x2 + 2, y2 + 2)
 
-        tile_visits = self._tile_visit_accessor.visits
+        tile_visits = self._tile_visit_accessor.tile_state["tile_visits"]
         tiles = tile_visits[zoom]
         points = make_grid_points(
             (tile for tile in tiles.keys() if tile_bounds.contains(*tile)), zoom

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

@@ -19,6 +19,8 @@ def int_or_none(s: str) -> Optional[int]:
             return int(s)
         except ValueError as e:
             flash(f"Cannot parse integer from {s}: {e}", category="danger")
+    else:
+        return None
 
 
 def make_settings_blueprint(

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/settings/controller.py

@@ -1,6 +1,7 @@
 import json
 import re
 import urllib.parse
+from typing import Any
 from typing import Optional
 
 from flask import flash
@@ -70,7 +71,7 @@ class SettingsController:
         flash("Updated equipment offsets.", category="success")
 
     def render_heart_rate(self) -> dict:
-        result = {
+        result: dict[str, Any] = {
             "birth_year": self._config_accessor().birth_year,
             "heart_rate_resting": self._config_accessor().heart_rate_resting,
             "heart_rate_maximum": self._config_accessor().heart_rate_maximum,
@@ -90,7 +91,7 @@ class SettingsController:
         heart_rate_maximum: Optional[int],
     ) -> None:
         self._config_accessor().birth_year = birth_year
-        self._config_accessor().heart_rate_resting = heart_rate_resting
+        self._config_accessor().heart_rate_resting = heart_rate_resting or 0
         self._config_accessor().heart_rate_maximum = heart_rate_maximum
         self._config_accessor.save()
         flash("Updated heart rate data.", category="success")
@@ -251,7 +252,7 @@ class SettingsController:
         return f"https://www.strava.com/oauth/authorize?{arg_string}"
 
     def save_strava_code(self, code: str) -> None:
-        self._config_accessor().strava_client_id = self._strava_client_id
+        self._config_accessor().strava_client_id = int(self._strava_client_id)
         self._config_accessor().strava_client_secret = self._strava_client_secret
         self._config_accessor().strava_client_code = code
         self._config_accessor.save()

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2

@@ -4,8 +4,7 @@
 
 <h1 class="mb-3">Metadata Extraction</h1>
 
-<p>There are a few metadata fields that can be populated with information from the path of the activity file or by a
-    default value. These are:</p>
+<p>If the current activity metadata is not to your liking, you can adjust how these fields are populated:</p>
 
 <ul>
     <li><tt>kind</tt>: The kind of the activity, like "Ride" or "Run".</li>
@@ -13,8 +12,9 @@
     <li><tt>name</tt>: Name for the activity, like "Ride with Friends".</li>
 </ul>
 
-<p>By default these fields are populated with information from within the activity files. In case one hasn't set these
-    values correctly, it can be nice to override this data.</p>
+<p>By default these fields are extracted from files that contain this data. Otherwise the filename is set as <tt>name</tt>.
+    You can overwrite this by setting up a directory structure with corresponding regular expressions using named capture groups.</p>
+
 
 <form method="POST">
     <div class="row">
@@ -32,19 +32,18 @@
         </div>
 
         <div class="col-md-6">
-            <p>To give an example of what is possible, consider a directory structure where we have
-                <tt>{kind}/{equipment}/{date} {name}.{ext}</tt>. Such an activity could be <tt>Ride/Red
-                    Roadbike/2024-08-10 11-45-00 Ride with Friends.fit</tt>. In order to extract this, we could use the
-                following regular expression:
-            </p>
+            <p>Consider a directory structure <tt>Ride/Red Roadbike/2024-08-10 11-45-00 Ride with Friends.fit</tt> under Activities. 
+                You can extract <tt>kind</tt>: "Ride", <tt>equipment</tt>: "Red Roadbike", <tt>name</tt>: "Ride with Friends" 
+                with the following regular expression:</p>
 
             <div class="code">
                 <pre
                     class="code literal-block">(?P&lt;kind&gt;[^/]+)/(?P&lt;equipment&gt;[^/]+)/[-\d_ .]+(?P&lt;name&gt;[^/\.]+)</pre>
             </div>
 
-            <p>This uses "capture groups". Have a look at the <a href="https://docs.python.org/3/library/re.html">Python
-                    regex documentation</a> if you want to build your own.</p>
+            <p>Have a look at the documentation 
+                <a href="https://martin-ueding.github.io/geo-activity-playground/getting-started/advanced-metadata-extraction">Advanced Metadata Extraction</a> 
+                for explanations and examples.</p>
         </div>
     </div>
 

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/square_planner/controller.py

@@ -79,6 +79,8 @@ class SquarePlannerController:
             return make_grid_file_geojson(points)
         elif suffix == "gpx":
             return make_grid_file_gpx(points)
+        else:
+            raise RuntimeError(f"Unsupported suffix {suffix}.")
 
     def _get_explored_tiles(self, zoom: int) -> set[tuple[int, int]]:
         return set(self._tile_visits[zoom].keys())

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/geo_activity_playground/webui/upload/controller.py

@@ -60,7 +60,7 @@ class UploadController:
             flash("No selected file", "warning")
             return redirect("/upload")
         if file:
-            filename = secure_filename(file.filename)
+            filename = file.filename
             target_path = pathlib.Path(request.form["directory"]) / filename
             assert target_path.suffix in [
                 ".csv",

{geo_activity_playground-0.29.0 → geo_activity_playground-0.29.2}/pyproject.toml

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