geo-activity-playground 1.5.2__tar.gz → 1.6.0__tar.gz

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.5.2
+Version: 1.6.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
@@ -37,6 +37,7 @@ 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)
 Requires-Dist: tcxreader (>=0.4.5,<0.5.0)
+Requires-Dist: timezonefinder (>=6.5.9,<7.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tqdm (>=4.64.0,<5.0.0)
 Requires-Dist: vegafusion-python-embed (>=1.4.3,<2.0.0)

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/core/enrichment.py

@@ -13,7 +13,7 @@ from .datamodel import Activity
 from .datamodel import DB
 from .missing_values import some
 from .tiles import compute_tile_float
-from .time_conversion import get_country_timezone
+from .time_conversion import get_timezone
 
 logger = logging.getLogger(__name__)
 
@@ -26,9 +26,7 @@ def enrichment_set_timezone(
     ), f"You cannot import an activity without points. {activity=}"
     latitude, longitude = time_series[["latitude", "longitude"]].iloc[0].to_list()
     if activity.iana_timezone is None or activity.start_country is None:
-        country, tz_str = get_country_timezone(latitude, longitude)
-        activity.iana_timezone = tz_str
-        activity.start_country = country
+        activity.iana_timezone = get_timezone(latitude, longitude)
         return True
     else:
         return False

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/core/photos.py

@@ -23,10 +23,14 @@ def get_metadata_from_image(path: pathlib.Path) -> dict:
     except KeyError:
         pass
     try:
-        metadata["time"] = dateutil.parser.parse(
-            str(tags["EXIF DateTimeOriginal"])
-            + str(tags.get("EXIF OffsetTime", "+00:00"))
+        date_time_original = str(tags["EXIF DateTimeOriginal"]) + str(
+            tags.get("EXIF OffsetTime", "+00:00")
+        ).replace(":", "")
+        print(f"Extracted date: {date_time_original}")
+        metadata["time"] = datetime.datetime.strptime(
+            date_time_original, "%Y:%m:%d %H:%M:%S%z"
         ).astimezone(zoneinfo.ZoneInfo("UTC"))
+
     except KeyError:
         pass
 

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/core/test_time_zone_from_location.py

@@ -1,7 +1,13 @@
 from .time_conversion import get_country_timezone
+from .time_conversion import get_timezone
 
 
 def test_time_zone_from_location() -> None:
     country, iana_timezone = get_country_timezone(50, 7)
     assert country == "Germany"
     assert iana_timezone == "Europe/Berlin"
+
+
+def test_timezone_finder() -> None:
+    iana_timezone = get_timezone(50, 7)
+    assert iana_timezone == "Europe/Berlin"

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/core/time_conversion.py

@@ -2,8 +2,10 @@ import datetime
 import json
 import logging
 import zoneinfo
+from typing import Optional
 
 import requests
+import timezonefinder
 
 from .paths import USER_CACHE_DIR
 
@@ -40,3 +42,8 @@ def get_country_timezone(latitude: float, longitude: float) -> tuple[str, str]:
         with open(cache_file, "w") as f:
             json.dump(data, f)
     return data["location"], data["iana_timezone"]
+
+
+def get_timezone(latitude: float, longitude: float) -> Optional[str]:
+    tf = timezonefinder.TimezoneFinder()  # reuse
+    return tf.timezone_at(lng=longitude, lat=latitude)

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/explorer/tile_visits.py

@@ -4,6 +4,7 @@ import itertools
 import logging
 import pathlib
 import pickle
+import zoneinfo
 from typing import Iterator
 from typing import Optional
 from typing import TypedDict
@@ -272,6 +273,10 @@ def _process_activity(
 def _tiles_from_points(
     time_series: pd.DataFrame, zoom: int
 ) -> Iterator[tuple[datetime.datetime, int, int]]:
+    # Some people haven't localized their time series yet. This breaks the tile history part. Just assume that it is UTC, should be good enough for tiles.
+    if time_series["time"].dt.tz is None:
+        time_series = time_series.copy()
+        time_series["time"].dt.tz_localize(zoneinfo.ZoneInfo("UTC"))
     xf = time_series["x"] * 2**zoom
     yf = time_series["y"] * 2**zoom
     for t1, x1, y1, x2, y2, s1, s2 in zip(

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/importers/activity_parsers.py

@@ -138,10 +138,9 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                             try:
                                 row["speed"] = values["enhanced_speed"] * factor
                             except TypeError as e:
-                                # https://github.com/martin-ueding/geo-activity-playground/issues/301
-                                raise ActivityParseError(
+                                logger.warning(
                                     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.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/importers/directory.py

@@ -4,6 +4,7 @@ import re
 import traceback
 
 import sqlalchemy
+from tqdm import tqdm
 
 from ..core.activities import ActivityRepository
 from ..core.config import Config
@@ -37,8 +38,22 @@ def import_from_directory(
         and not path.stem.startswith(".")
         and not path.suffix in config.ignore_suffixes
     ]
+    activity_paths.sort()
 
-    for i, activity_path in enumerate(activity_paths):
+    paths_to_import = [
+        activity_path
+        for activity_path in tqdm(
+            activity_paths, desc="Scanning for new files", delay=1
+        )
+        if DB.session.scalar(
+            sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))
+        )
+        is None
+    ]
+
+    for i, activity_path in enumerate(
+        tqdm(paths_to_import, desc="Importing activity files", delay=0)
+    ):
         with DB.session.no_autoflush:
             activity = DB.session.scalar(
                 sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/geo_activity_playground/importers/strava_checkout.py

@@ -198,6 +198,8 @@ def import_from_strava_checkout(config: Config) -> None:
 
         activity_file = checkout_path / row["Filename"]
 
+        logger.info(f"Importing '{activity_file}' …")
+
         try:
             activity, time_series = read_activity(activity_file)
         except ActivityParseError as e:

geo_activity_playground-1.6.0/geo_activity_playground/webui/static/activity-trim.js

@@ -0,0 +1,39 @@
+var map = L.map('activity-map', {
+    fullscreenControl: true
+});
+L.tileLayer('/tile/pastel/{z}/{x}/{y}.png', {
+    maxZoom: 19,
+    attribution: map_tile_attribution
+}).addTo(map);
+
+let copy_to_input = function (value, input) {
+    document.getElementById(input).value = value;
+}
+
+let layer = L.geoJSON(color_line_geojson, {
+    pointToLayer: function (feature, lat_lon) {
+        let p = feature.properties
+
+        let marker = null
+        if (p.markerType == "circle") {
+            marker = L.circleMarker(lat_lon, p.markerStyle)
+        } else {
+            marker = L.marker(lat_lon)
+        }
+
+        let text = ''
+        if (p.name) {
+            text += `<button class="btn btn-primary" onclick="copy_to_input(${p.name}, 'begin')">Use as Begin</button>`
+            text += ' '
+            text += `<button class="btn btn-primary" onclick="copy_to_input(${p.name}+1, 'end')">Use as End</button>`
+        }
+        if (text) {
+            marker = marker.bindPopup(text)
+        }
+
+        return marker
+    }
+})
+
+layer.addTo(map)
+map.fitBounds(layer.getBounds());

geo_activity_playground-1.6.0/geo_activity_playground/webui/templates/activity/trim.html.j2

@@ -0,0 +1,33 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>{{ activity["name"] }}</h1>
+    </div>
+</div>
+
+<a href="{{ url_for('.show', id=activity['id']) }}" class="btn btn-primary btn-small">Back</a>
+
+<div id="activity-map" style="height: 600px;" class="mb-3"></div>
+<script>
+    var map_tile_attribution = '{{ map_tile_attribution }}';
+    var color_line_geojson = {{ color_line_geojson | safe }};
+</script>
+<script src="/static/activity-trim.js"></script>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="begin" class="form-label">Begin</label>
+        <input type="number" class="form-control" id="begin" name="begin" value="{{ activity.index_begin }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="end" class="form-label">End</label>
+        <input type="number" class="form-control" id="end" name="end" value="{{ activity.index_end }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+{% endblock %}

{geo_activity_playground-1.5.2 → geo_activity_playground-1.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "1.5.2"
+version = "1.6.0"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"
@@ -48,6 +48,7 @@ openpyxl = "^3.1.5"
 # numcodecs = "<0.15.0"
 # imagecodecs = "^2025.3.30"
 # tifffile = "2025.5.10"
+timezonefinder = "^6.5.9"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.0.0"

geo_activity_playground-1.5.2/geo_activity_playground/webui/templates/activity/trim.html.j2

@@ -1,68 +0,0 @@
-{% extends "page.html.j2" %}
-
-{% block container %}
-<div class="row mb-3">
-    <div class="col">
-        <h1>{{ activity["name"] }}</h1>
-    </div>
-</div>
-
-<a href="{{ url_for('.show', id=activity['id']) }}" class="btn btn-primary btn-small">Back</a>
-
-
-<div id="activity-map" style="height: 600px;" class="mb-3"></div>
-<script>
-    var map = L.map('activity-map', {
-        fullscreenControl: true
-    });
-    L.tileLayer('/tile/pastel/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: '{{ map_tile_attribution|safe }}'
-    }).addTo(map);
-
-
-    let layer = L.geoJSON({{ color_line_geojson| safe }}, {
-        pointToLayer: function (feature, lat_lon) {
-            let p = feature.properties
-
-            let marker = null
-            if (p.markerType == "circle") {
-                marker = L.circleMarker(lat_lon, p.markerStyle)
-            } else {
-                marker = L.marker(lat_lon)
-            }
-
-            let text = ''
-            if (p.name) {
-                text += `<p><b>${p.name}</b></p>`
-            }
-            if (p.description) {
-                text += p.description
-            }
-            if (text) {
-                marker = marker.bindPopup(text)
-            }
-
-            return marker
-        }
-    })
-
-    layer.addTo(map)
-    map.fitBounds(layer.getBounds());
-</script>
-
-<form method="POST">
-    <div class="mb-3">
-        <label for="begin" class="form-label">Begin</label>
-        <input type="number" class="form-control" id="begin" name="begin" value="{{ activity.index_begin }}" />
-    </div>
-
-    <div class="mb-3">
-        <label for="end" class="form-label">End</label>
-        <input type="number" class="form-control" id="end" name="end" value="{{ activity.index_end }}" />
-    </div>
-
-    <button type="submit" class="btn btn-primary">Save</button>
-</form>
-
-{% endblock %}