geo-activity-playground 1.3.0__tar.gz → 1.3.2__tar.gz

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/PKG-INFO

@@ -1,13 +1,14 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.3.0
+Version: 1.3.2
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
 Author-email: mu@martin-ueding.de
-Requires-Python: >=3.11,<3.14
+Requires-Python: >=3.10,<3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -15,7 +16,6 @@ Requires-Dist: Pillow (>=11.0.0,<12.0.0)
 Requires-Dist: alembic (>=1.15.2,<2.0.0)
 Requires-Dist: altair (>=5.5.0,<6.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
-Requires-Dist: boto3 (>=1.38.45,<2.0.0)
 Requires-Dist: charset-normalizer (>=3.3.2,<4.0.0)
 Requires-Dist: coloredlogs (>=15.0.1,<16.0.0)
 Requires-Dist: exifread (>=3.2.0,<4.0.0)
@@ -24,19 +24,15 @@ Requires-Dist: flask (>=3.0.0,<4.0.0)
 Requires-Dist: flask-alembic (>=3.1.1,<4.0.0)
 Requires-Dist: flask-sqlalchemy (>=3.1.1,<4.0.0)
 Requires-Dist: geojson (>=3.0.1,<4.0.0)
-Requires-Dist: geotiff (>=0.2.10,<0.3.0)
 Requires-Dist: gpxpy (>=1.5.0,<2.0.0)
-Requires-Dist: imagecodecs (>=2025.3.30,<2026.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: matplotlib (>=3.10.1,<4.0.0)
-Requires-Dist: numcodecs (<0.15.0)
 Requires-Dist: numpy (>=2.2.3,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: pyarrow (>=19.0.1,<20.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
-Requires-Dist: scipy (>=1.16.0,<2.0.0)
 Requires-Dist: shapely (>=2.0.5,<3.0.0)
 Requires-Dist: sqlalchemy (>=2.0.40,<3.0.0)
 Requires-Dist: stravalib (>=2.0,<3.0)

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/core/copernicus_dem.py

@@ -13,7 +13,7 @@ from scipy.interpolate import RegularGridInterpolator
 from .paths import USER_CACHE_DIR
 
 
-def s3_path(lat: int, lon: int) -> pathlib.Path:
+def _s3_path(lat: int, lon: int) -> pathlib.Path:
     lat_str = f"N{(lat):02d}" if lat >= 0 else f"S{(-lat):02d}"
     lon_str = f"E{(lon):03d}" if lon >= 0 else f"W{(-lon):03d}"
     result = (
@@ -26,7 +26,7 @@ def s3_path(lat: int, lon: int) -> pathlib.Path:
     return result
 
 
-def ensure_copernicus_file(p: pathlib.Path) -> None:
+def _ensure_copernicus_file(p: pathlib.Path) -> None:
     if p.exists():
         return
     s3 = boto3.client(
@@ -39,10 +39,12 @@ def ensure_copernicus_file(p: pathlib.Path) -> None:
 
 
 @functools.lru_cache(9)
-def get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
-    ensure_copernicus_file(p)
+def _get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
+
+    _ensure_copernicus_file(p)
     if not p.exists():
         return None
+
     gt = geotiff.GeoTiff(p)
     a = np.array(gt.read())
     lon_array, lat_array = gt.get_coord_arrays()
@@ -50,8 +52,8 @@ def get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
 
 
 @functools.lru_cache(1)
-def get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
-    arrays = get_elevation_arrays(s3_path(lat, lon))
+def _get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
+    arrays = _get_elevation_arrays(_s3_path(lat, lon))
     # If we don't have data for the current center, we cannot do anything.
     if arrays is None:
         return None
@@ -88,7 +90,7 @@ def get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
 
 
 def get_elevation(lat: float, lon: float) -> float:
-    interpolator = get_interpolator(math.floor(lat), math.floor(lon))
+    interpolator = _get_interpolator(math.floor(lat), math.floor(lon))
     if interpolator is not None:
         return float(interpolator((lat, lon)))
     else:

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/core/enrichment.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import uuid
 import zoneinfo
 from typing import Callable
 
@@ -8,7 +9,6 @@ import pandas as pd
 
 from .config import Config
 from .coordinates import get_distance
-from .copernicus_dem import get_elevation
 from .datamodel import Activity
 from .datamodel import DB
 from .missing_values import some
@@ -108,6 +108,8 @@ def enrichment_compute_tile_xy(
 def enrichment_copernicus_elevation(
     activity: Activity, time_series: pd.DataFrame, config: Config
 ) -> bool:
+    from .copernicus_dem import get_elevation
+
     if "copernicus_elevation" not in time_series.columns:
         time_series["copernicus_elevation"] = [
             get_elevation(lat, lon)
@@ -246,7 +248,7 @@ enrichments: list[Callable[[Activity, pd.DataFrame, Config], bool]] = [
     enrichment_normalize_time,
     enrichment_rename_altitude,
     enrichment_compute_tile_xy,
-    enrichment_copernicus_elevation,
+    # enrichment_copernicus_elevation,
     enrichment_elevation_gain,
     enrichment_add_calories,
     enrichment_distance,
@@ -268,6 +270,8 @@ def update_and_commit(
     activity: Activity, time_series: pd.DataFrame, config: Config
 ) -> None:
     changed = apply_enrichments(activity, time_series, config)
+    if not activity.time_series_uuid:
+        activity.time_series_uuid = str(uuid.uuid4())
     if changed:
         activity.replace_time_series(time_series)
     DB.session.add(activity)

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/importers/activity_parsers.py

@@ -27,6 +27,9 @@ def read_activity(path: pathlib.Path) -> tuple[Activity, pd.DataFrame]:
     suffixes = [s.lower() for s in path.suffixes]
     activity = Activity()
 
+    if len(suffixes) == 0:
+        raise ActivityParseError(f"File has no suffix, ignoring")
+
     if suffixes[-1] == ".gz":
         opener = gzip.open
         file_type = suffixes[-2]
@@ -132,7 +135,13 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                             factor = _fit_speed_unit_factor(
                                 fields["enhanced_speed"].units
                             )
-                            row["speed"] = values["enhanced_speed"] * factor
+                            try:
+                                row["speed"] = values["enhanced_speed"] * factor
+                            except TypeError as e:
+                                # https://github.com/martin-ueding/geo-activity-playground/issues/301
+                                raise ActivityParseError(
+                                    f'Cannot work with {values["enhanced_speed"]!r}, {factor!r}'
+                                ) from e
                         if "grade" in fields:
                             row["grade"] = values["grade"]
                         if "temperature" in fields:

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/importers/directory.py

@@ -38,13 +38,15 @@ def import_from_directory(
         and not path.suffix in config.ignore_suffixes
     ]
 
-    for activity_path in activity_paths:
+    for i, activity_path in enumerate(activity_paths):
         with DB.session.no_autoflush:
             activity = DB.session.scalar(
                 sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))
             )
             if activity is None:
-                import_from_file(activity_path, repository, tile_visit_accessor, config)
+                import_from_file(
+                    activity_path, repository, tile_visit_accessor, config, i
+                )
 
 
 def import_from_file(
@@ -52,6 +54,7 @@ def import_from_file(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    i: int,
 ) -> None:
     logger.info(f"Importing {path} …")
     try:
@@ -74,6 +77,10 @@ def import_from_file(
 
     meta_from_path = _get_metadata_from_path(path, config.metadata_extraction_regexes)
     activity.name = meta_from_path.get("name", activity.name)
+    if "equipment" in meta_from_path:
+        activity.equipment = get_or_make_equipment(meta_from_path["equipment"], config)
+    if "kind" in meta_from_path:
+        activity.kind = get_or_make_kind(meta_from_path["kind"])
     if activity.equipment is None:
         activity.equipment = get_or_make_equipment(
             meta_from_path.get("equipment", DEFAULT_UNKNOWN_NAME), config
@@ -85,7 +92,7 @@ def import_from_file(
 
     update_and_commit(activity, time_series, config)
 
-    if len(repository) > 0:
+    if len(repository) > 0 and i % 50 == 0:
         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.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/importers/strava_api.py

@@ -25,6 +25,8 @@ from ..core.paths import strava_api_dir
 from ..core.paths import strava_last_activity_date_path
 from ..core.tasks import get_state
 from ..core.tasks import set_state
+from ..explorer.tile_visits import compute_tile_evolution
+from ..explorer.tile_visits import compute_tile_visits_new
 from ..explorer.tile_visits import TileVisitAccessor
 
 

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/importers/strava_checkout.py

@@ -3,6 +3,7 @@ import logging
 import pathlib
 import shutil
 import sys
+import urllib.parse
 import zoneinfo
 from typing import Optional
 
@@ -266,7 +267,7 @@ def convert_strava_checkout(
                 "-",
                 f"{activity_date.hour:02d}-{activity_date.minute:02d}-{activity_date.second:02d}",
                 " ",
-                activity_name.replace("/", "_"),
+                urllib.parse.quote_plus(activity_name),
             ]
             + activity_file.suffixes
         )

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/webui/app.py

@@ -131,6 +131,12 @@ def web_ui_main(
             old_path = TIME_SERIES_DIR() / f"{activity.id}.parquet"
             if old_path.exists() and not activity.time_series_path.exists():
                 old_path.rename(activity.time_series_path)
+            if not activity.time_series_path.exists():
+                logger.error(
+                    f"Time series for {activity.id=}, expected at {activity.time_series_path}, does not exist. Deleting activity."
+                )
+                DB.session.delete(activity)
+                DB.session.commit()
 
     if not skip_reload:
         thread = threading.Thread(

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -177,7 +177,7 @@ def make_activity_blueprint(
             )
         ) is not None:
             context["heart_zones_plot"] = heart_rate_zone_plot(heart_zones)
-        if "copernicus_elevation" in time_series.columns:
+        if "elevation" in time_series.columns:
             context["elevation_time_plot"] = elevation_time_plot(time_series)
         if "elevation_gain_cum" in time_series.columns:
             context["elevation_gain_cum_plot"] = elevation_gain_cum_plot(time_series)
@@ -508,7 +508,7 @@ def elevation_time_plot(time_series: pd.DataFrame) -> str:
         .encode(
             alt.X("time", title="Time"),
             alt.Y(
-                "copernicus_elevation",
+                "elevation",
                 scale=alt.Scale(zero=False),
                 title="Elevation / m",
             ),

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/geo_activity_playground/webui/templates/activity/show.html.j2

@@ -42,6 +42,8 @@
             <dt>Average elapsed speed</dt>
             <dd>{{ activity.average_speed_elapsed_kmh|round(1) }} km/h = {{
                 (60/activity.average_speed_elapsed_kmh)|round(1) }} min/km</dd>
+            {% endif %}
+            {% if date is defined %}
             <dt>Start time</dt>
             <dd><a href="{{ url_for('activity.day', year=date.year, month=date.month, day=date.day) }}">{{ date }}</a>
                 {{ time }} {{ activity.iana_timezone }}

{geo_activity_playground-1.3.0 → geo_activity_playground-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "1.3.0"
+version = "1.3.2"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"
@@ -9,7 +9,7 @@ license = "MIT"
 geo-activity-playground = "geo_activity_playground.__main__:main"
 
 [tool.poetry.dependencies]
-python = "^3.11,<3.14"
+python = "^3.10,<3.14"
 
 alembic = "^1.15.2"
 altair = "^5.5.0"
@@ -42,11 +42,12 @@ flask-sqlalchemy = "^3.1.1"
 flask-alembic = "^3.1.1"
 exifread = "^3.2.0"
 openpyxl = "^3.1.5"
-boto3 = "^1.38.45"
-scipy = "^1.16.0"
-geotiff = "^0.2.10"
-numcodecs = "<0.15.0"
-imagecodecs = "^2025.3.30"
+# boto3 = "^1.38.45"
+# scipy = "^1.16.0"
+# geotiff = "^0.2.10"
+# numcodecs = "<0.15.0"
+# imagecodecs = "^2025.3.30"
+# tifffile = "2025.5.10"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.0.0"