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

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

@@ -1,17 +1,17 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.30.0
+Version: 0.34.1
 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.10,<3.13
+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
-Requires-Dist: Pillow (>=10.3.0,<11.0.0)
+Requires-Dist: Pillow (>=11.0.0,<12.0.0)
 Requires-Dist: altair (>=5.1.2,<6.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: charset-normalizer (>=3.3.2,<4.0.0)
@@ -22,12 +22,11 @@ Requires-Dist: geojson (>=3.0.1,<4.0.0)
 Requires-Dist: gpxpy (>=1.5.0,<2.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: matplotlib (>=3.6.3,<4.0.0)
-Requires-Dist: numpy (>=1.22.4,<2.0.0)
+Requires-Dist: numpy (>=2.1.3,<3.0.0)
 Requires-Dist: pandas (>=2.2,<3.0)
-Requires-Dist: pyarrow (>=16.1.0,<17.0.0)
+Requires-Dist: pyarrow (>=18.1.0,<19.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.8.1,<2.0.0)
 Requires-Dist: shapely (>=2.0.5,<3.0.0)
 Requires-Dist: stravalib (>=2.0,<3.0)
 Requires-Dist: tcxreader (>=0.4.5,<0.5.0)

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/__main__.py

@@ -13,7 +13,7 @@ from geo_activity_playground.core.config import import_old_strava_config
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 from geo_activity_playground.explorer.video import explorer_video_main
 from geo_activity_playground.webui.app import web_ui_main
-from geo_activity_playground.webui.upload.controller import scan_for_activities
+from geo_activity_playground.webui.upload_blueprint import scan_for_activities
 
 logger = logging.getLogger(__name__)
 

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/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.34.1}/geo_activity_playground/core/config.py

@@ -21,14 +21,16 @@ logger = logging.getLogger(__name__)
 @dataclasses.dataclass
 class Config:
     birth_year: Optional[int] = None
-    color_scheme_for_counts: str = "viridis"
+    color_scheme_for_counts: str = "teals"
     color_scheme_for_kind: str = "category10"
+    color_scheme_for_heatmap: str = "hot"
     equipment_offsets: dict[str, float] = dataclasses.field(default_factory=dict)
     explorer_zoom_levels: list[int] = dataclasses.field(
         default_factory=lambda: [14, 17]
     )
     heart_rate_resting: int = 0
     heart_rate_maximum: Optional[int] = None
+    ignore_suffixes: list[str] = dataclasses.field(default_factory=list)
     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)
@@ -42,6 +44,8 @@ class Config:
     strava_client_code: Optional[str] = None
     time_diff_threshold_seconds: Optional[int] = 30
     upload_password: Optional[str] = None
+    map_tile_url: str = "https://tile.openstreetmap.org/{zoom}/{x}/{y}.png"
+    map_tile_attribution: str = '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> | <a href="https://www.openstreetmap.org/fixthemap">Correct Map</a>'
 
 
 class ConfigAccessor:

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/core/heatmap.py

@@ -6,6 +6,7 @@ import logging
 
 import numpy as np
 
+from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.tiles import compute_tile_float
 from geo_activity_playground.core.tiles import get_tile
 from geo_activity_playground.core.tiles import get_tile_upper_left_lat_lon
@@ -123,21 +124,66 @@ def get_sensible_zoom_level(
     )
 
 
-def build_map_from_tiles(tile_bounds: TileBounds) -> np.ndarray:
-    background = np.zeros((*PixelBounds.from_tile_bounds(tile_bounds).shape, 3))
-
-    for x in range(tile_bounds.x_tile_min, tile_bounds.x_tile_max):
-        for y in range(tile_bounds.y_tile_min, tile_bounds.y_tile_max):
-            tile = np.array(get_tile(tile_bounds.zoom, x, y)) / 255
-
-            i = y - tile_bounds.y_tile_min
-            j = x - tile_bounds.x_tile_min
-
-            background[
-                i * OSM_TILE_SIZE : (i + 1) * OSM_TILE_SIZE,
-                j * OSM_TILE_SIZE : (j + 1) * OSM_TILE_SIZE,
-                :,
-            ] = tile[:, :, :3]
+def build_map_from_tiles_around_center(
+    center: tuple[float, float],
+    zoom: int,
+    target: tuple[int, int],
+    inner_target: tuple[int, int],
+    config: Config,
+) -> np.ndarray:
+    background = np.zeros((target[1], target[0], 3))
+
+    # We will work with the center point and have it in terms of tiles `t` and also in terms of pixels `p`. At the start we know that the tile center must be in the middle of the image.
+    t = np.array(center)
+    p = np.array([inner_target[0] / 2, inner_target[1] / 2])
+
+    # Shift both such that they are in the top-left corner of an even tile.
+    t_offset = np.array([center[0] % 1, center[1] % 1])
+    t -= t_offset
+    p -= t_offset * OSM_TILE_SIZE
+
+    # Shift until we have left the image.
+    shift = np.ceil(p / OSM_TILE_SIZE)
+    p -= shift * OSM_TILE_SIZE
+    t -= shift
+
+    num_tiles = np.ceil(np.array(target) / OSM_TILE_SIZE) + 1
+
+    for x in range(int(t[0]), int(t[0] + num_tiles[0])):
+        for y in range(int(t[1]), int(t[1]) + int(num_tiles[1])):
+            source_x_min = 0
+            source_y_min = 0
+            source_x_max = source_x_min + OSM_TILE_SIZE
+            source_y_max = source_y_min + OSM_TILE_SIZE
+
+            target_x_min = (x - int(t[0])) * OSM_TILE_SIZE + int(p[0])
+            target_y_min = (y - int(t[1])) * OSM_TILE_SIZE + int(p[1])
+            target_x_max = target_x_min + OSM_TILE_SIZE
+            target_y_max = target_y_min + OSM_TILE_SIZE
+
+            if target_x_min < 0:
+                source_x_min -= target_x_min
+                target_x_min = 0
+            if target_y_min < 0:
+                source_y_min -= target_y_min
+                target_y_min = 0
+            if target_x_max > target[0]:
+                a = target_x_max - target[0]
+                target_x_max -= a
+                source_x_max -= a
+            if target_y_max > target[1]:
+                a = target_y_max - target[1]
+                target_y_max -= a
+                source_y_max -= a
+
+            if source_x_max < 0 or source_y_max < 0:
+                continue
+
+            tile = np.array(get_tile(zoom, x, y, config.map_tile_url)) / 255
+
+            background[target_y_min:target_y_max, target_x_min:target_x_max] = tile[
+                source_y_min:source_y_max, source_x_min:source_x_max, :3
+            ]
 
     return background
 

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/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.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/core/tiles.py

@@ -3,6 +3,7 @@ import logging
 import math
 import pathlib
 import time
+import urllib.parse
 from typing import Iterator
 from typing import Optional
 
@@ -13,8 +14,10 @@ from PIL import Image
 logger = logging.getLogger(__name__)
 
 
-def osm_tile_path(x: int, y: int, zoom: int) -> pathlib.Path:
-    path = pathlib.Path("Open Street Map Tiles") / f"{zoom}/{x}/{y}.png"
+def osm_tile_path(x: int, y: int, zoom: int, url_template: str) -> pathlib.Path:
+    base_dir = pathlib.Path("Open Street Map Tiles")
+    dir_for_source = base_dir / urllib.parse.quote_plus(url_template)
+    path = dir_for_source / f"{zoom}/{x}/{y}.png"
     path.parent.mkdir(parents=True, exist_ok=True)
     return path
 
@@ -62,11 +65,11 @@ def download_file(url: str, destination: pathlib.Path):
 
 
 @functools.lru_cache()
-def get_tile(zoom: int, x: int, y: int) -> Image.Image:
-    destination = osm_tile_path(x, y, zoom)
+def get_tile(zoom: int, x: int, y: int, url_template: str) -> Image.Image:
+    destination = osm_tile_path(x, y, zoom, url_template)
     if not destination.exists():
         logger.info(f"Downloading OSM tile {x=}, {y=}, {zoom=} …")
-        url = f"https://tile.openstreetmap.org/{zoom}/{x}/{y}.png"
+        url = url_template.format(x=x, y=y, zoom=zoom)
         download_file(url, destination)
     with Image.open(destination) as image:
         image.load()

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/explorer/video.py

@@ -9,13 +9,14 @@ from typing import Tuple
 
 import numpy as np
 import pandas as pd
-import scipy.interpolate
 from PIL import Image
 from PIL import ImageEnhance
 from tqdm import tqdm
 
 from ..core.tiles import get_tile
 
+# import scipy.interpolate
+
 
 def build_image(
     center_x: float,

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/importers/directory.py

@@ -10,6 +10,7 @@ from typing import Optional
 from tqdm import tqdm
 
 from geo_activity_playground.core.activities import ActivityMeta
+from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.paths import activity_extracted_dir
 from geo_activity_playground.core.paths import activity_extracted_meta_dir
 from geo_activity_playground.core.paths import activity_extracted_time_series_dir
@@ -24,13 +25,16 @@ ACTIVITY_DIR = pathlib.Path("Activities")
 
 
 def import_from_directory(
-    metadata_extraction_regexes: list[str], num_processes: Optional[int]
+    metadata_extraction_regexes: list[str], num_processes: Optional[int], config: Config
 ) -> None:
 
     activity_paths = [
         path
         for path in ACTIVITY_DIR.rglob("*.*")
-        if path.is_file() and path.suffixes and not path.stem.startswith(".")
+        if path.is_file()
+        and path.suffixes
+        and not path.stem.startswith(".")
+        and not path.suffix in config.ignore_suffixes
     ]
     work_tracker = WorkTracker(activity_extracted_dir() / "work-tracker-extract.pickle")
     new_activity_paths = work_tracker.filter(activity_paths)

{geo_activity_playground-0.30.0 → geo_activity_playground-0.34.1}/geo_activity_playground/importers/strava_checkout.py

@@ -146,7 +146,7 @@ def float_with_comma_or_period(x: str) -> Optional[float]:
 
 def import_from_strava_checkout() -> None:
     checkout_path = pathlib.Path("Strava Export")
-    with open(checkout_path / "activities.csv") as f:
+    with open(checkout_path / "activities.csv", encoding="utf-8") as f:
         rows = parse_csv(f.read())
     header = rows[0]
 
@@ -159,9 +159,15 @@ def import_from_strava_checkout() -> None:
 
     if header[0] == EXPECTED_COLUMNS[0]:
         dayfirst = False
-    if header[0] == "Aktivitäts-ID":
+    elif header[0] == "Aktivitäts-ID":
         header = EXPECTED_COLUMNS
         dayfirst = True
+    else:
+        logger.error(
+            f"You are trying to import a Strava checkout where the `activities.csv` contains an unexpected header format. In order to import this, we need to map these to the English ones. Unfortunately Strava often changes the number of columns. This means that the program needs to be updated to match the new Strava export format. Please go to https://github.com/martin-ueding/geo-activity-playground/issues and open a new issue and share the following output in the ticket:"
+        )
+        print(header)
+        sys.exit(1)
 
     table = {
         header[i]: [rows[r][i] for r in range(1, len(rows))] for i in range(len(header))

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

@@ -0,0 +1,116 @@
+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("/day-sharepic/<year>/<month>/<day>/sharepic.png")
+    def day_sharepic(year: str, month: str, day: str):
+        return Response(
+            activity_controller.render_day_sharepic(int(year), int(month), int(day)),
+            mimetype="image/png",
+        )
+
+    @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