geo-activity-playground 1.5.2__py3-none-any.whl → 1.7.0__py3-none-any.whl

geo_activity_playground/__main__.py

@@ -53,6 +53,8 @@ def main() -> None:
             options.skip_reload,
             host=options.host,
             port=options.port,
+            strava_begin=options.strava_begin,
+            strava_end=options.strava_end,
         )
     )
     subparser.add_argument(
@@ -62,6 +64,12 @@ def main() -> None:
         "--port", default=5000, type=int, help="the port to run listen on"
     )
     subparser.add_argument("--skip-reload", action=argparse.BooleanOptionalAction)
+    subparser.add_argument(
+        "--strava-begin", help="Start date to limit Strava sync, format YYYY-MM-DD"
+    )
+    subparser.add_argument(
+        "--strava-end", help="End date to limit Strava sync, format YYYY-MM-DD"
+    )
 
     subparser = subparsers.add_parser(
         "heatmap-video", help="Create a video with the evolution of the heatmap"

geo_activity_playground/core/datamodel.py

@@ -231,7 +231,7 @@ class Activity(DB.Model):
             return self.start
 
     @property
-    def start_utc(self) -> Optional[datetime.datetime]:
+    def start_local(self) -> Optional[datetime.datetime]:
         if self.start:
             return self.start.replace(microsecond=0, tzinfo=zoneinfo.ZoneInfo("UTC"))
         else:
@@ -270,6 +270,7 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
             Activity.path,
             Activity.distance_km,
             Activity.start,
+            Activity.iana_timezone,
             Activity.elapsed_time,
             Activity.moving_time,
             Activity.start_latitude,
@@ -302,6 +303,24 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
         # df["start"] = pd.Series(start)
         df["elapsed_time"] = pd.to_timedelta(df["elapsed_time"])
 
+        start_local = []
+        for start, iana_timezone in zip(df["start"], df["iana_timezone"]):
+            if pd.isna(start) or iana_timezone is None:
+                start_local.append(start)
+            else:
+                start_local.append(
+                    start.tz_localize(zoneinfo.ZoneInfo("UTC"))
+                    .tz_convert(iana_timezone)
+                    .tz_localize(None)
+                )
+        df["start_local"] = start_local
+
+        # Work around bytes stored in DB.
+        df["calories"] = [
+            sum(a * 256**b for b, a in enumerate(c)) if isinstance(c, bytes) else c
+            for c in df["calories"]
+        ]
+
         for old, new in [
             ("elapsed_time", "average_speed_elapsed_kmh"),
             ("moving_time", "average_speed_moving_kmh"),
@@ -312,14 +331,14 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
                 df.loc[mask, old].dt.total_seconds() / 3_600
             )
 
-        df["date"] = df["start"].dt.date
-        df["year"] = df["start"].dt.year
-        df["month"] = df["start"].dt.month
-        df["day"] = df["start"].dt.day
-        df["week"] = df["start"].dt.isocalendar().week
-        df["day_of_week"] = df["start"].dt.day_of_week
-        df["iso_year"] = df["start"].dt.isocalendar().year
-        df["iso_day"] = df["start"].dt.isocalendar().day
+        df["date"] = df["start_local"].dt.date
+        df["year"] = df["start_local"].dt.year
+        df["month"] = df["start_local"].dt.month
+        df["day"] = df["start_local"].dt.day
+        df["week"] = df["start_local"].dt.isocalendar().week
+        df["day_of_week"] = df["start_local"].dt.day_of_week
+        df["iso_year"] = df["start_local"].dt.isocalendar().year
+        df["iso_day"] = df["start_local"].dt.isocalendar().day
         df["hours"] = df["elapsed_time"].dt.total_seconds() / 3_600
         df["hours_moving"] = df["moving_time"].dt.total_seconds() / 3_600
         df["iso_year_week"] = [

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/core/meta_search.py

@@ -124,9 +124,7 @@ class SearchQuery:
         )
 
 
-def apply_search_query(
-    activity_meta: pd.DataFrame, search_query: SearchQuery
-) -> pd.DataFrame:
+def apply_search_query(search_query: SearchQuery) -> pd.DataFrame:
 
     filter_clauses = []
 

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/core/test_meta_search.py

@@ -24,7 +24,7 @@ def test_empty_query() -> None:
 
     search_query = SearchQuery()
 
-    actual = apply_search_query(activity_meta, search_query)
+    actual = apply_search_query(search_query)
     assert (actual["id"] == activity_meta["id"]).all()
 
 
@@ -43,7 +43,7 @@ def test_equipment_query() -> None:
         }
     )
     search_query = SearchQuery(equipment=["B"])
-    actual = apply_search_query(activity_meta, search_query)
+    actual = apply_search_query(search_query)
     assert set(actual["id"]) == {2, 3}
 
 
@@ -62,7 +62,7 @@ def test_date_query() -> None:
         }
     )
     search_query = SearchQuery(start_begin=datetime.date(2024, 12, 31))
-    actual = apply_search_query(activity_meta, search_query)
+    actual = apply_search_query(search_query)
     assert set(actual["id"]) == {2}
 
 
@@ -81,7 +81,7 @@ def test_name_query() -> None:
         }
     )
     search_query = SearchQuery(name="Test1")
-    actual = apply_search_query(activity_meta, search_query)
+    actual = apply_search_query(search_query)
     assert set(actual["id"]) == {1}
 
 

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/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/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
@@ -184,10 +185,13 @@ def compute_tile_visits_new(
 
     for zoom in reversed(range(20)):
         tile_state = tile_visit_accessor.tile_state
-        if not (
-            tile_state["tile_history"][zoom]["time"].diff().dropna()
-            >= datetime.timedelta(seconds=0)
-        ).all():
+        if (
+            len(tile_state["tile_history"][zoom])
+            and not (
+                tile_state["tile_history"][zoom]["time"].dropna().diff().dropna()
+                >= datetime.timedelta(seconds=0)
+            ).all()
+        ):
             logger.warning(
                 f"The order of the tile history at {zoom=} is not chronological, resetting."
             )
@@ -250,12 +254,17 @@ def _process_activity(
 
                 first_time = tile_visit.get("first_time", None)
                 last_time = tile_visit.get("last_time", None)
-                if first_time is None or time < first_time:
-                    tile_visit["first_id"] = activity_id
-                    tile_visit["first_time"] = time
-                if last_time is None or time > last_time:
-                    tile_visit["last_id"] = activity_id
-                    tile_visit["last_time"] = time
+                try:
+                    if first_time is None or time < first_time:
+                        tile_visit["first_id"] = activity_id
+                        tile_visit["first_time"] = time
+                    if last_time is None or time > last_time:
+                        tile_visit["last_id"] = activity_id
+                        tile_visit["last_time"] = time
+                except TypeError as e:
+                    raise TypeError(
+                        f"Mismatch in timezone awareness: {time=}, {first_time=}, {last_time=}"
+                    ) from e
 
             activities_per_tile[tile].add(activity_id)
 
@@ -272,6 +281,10 @@ def _process_activity(
 def _tiles_from_points(
     time_series: pd.DataFrame, zoom: int
 ) -> Iterator[tuple[datetime.datetime, int, int]]:
+    # XXX 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/importers/activity_parsers.py

@@ -4,6 +4,7 @@ import logging
 import pathlib
 import xml
 from collections.abc import Iterator
+from typing import Union
 
 import charset_normalizer
 import dateutil.parser
@@ -127,7 +128,9 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                         if "altitude" in fields:
                             row["elevation"] = values["altitude"]
                         if "enhanced_altitude" in fields:
-                            row["elevation"] = values["enhanced_altitude"]
+                            row["elevation"] = _first_of_tuple(
+                                values["enhanced_altitude"]
+                            )
                         if "speed" in fields:
                             factor = _fit_speed_unit_factor(fields["speed"].units)
                             row["speed"] = values["speed"] * factor
@@ -135,13 +138,9 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                             factor = _fit_speed_unit_factor(
                                 fields["enhanced_speed"].units
                             )
-                            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
+                            row["speed"] = (
+                                _first_of_tuple(values["enhanced_speed"]) * factor
+                            )
                         if "grade" in fields:
                             row["grade"] = values["grade"]
                         if "temperature" in fields:
@@ -159,7 +158,7 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[Activity, pd.DataFrame]
                             kind_name += " " + str(values["sub_sport"])
                         activity.kind = get_or_make_kind(kind_name)
                     if "total_calories" in fields:
-                        activity.calories = values["total_calories"]
+                        activity.calories = int(str(values["total_calories"]))
                     if "total_strides" in fields:
                         activity.steps = 2 * int(values["total_strides"])
 
@@ -175,6 +174,13 @@ def _fit_speed_unit_factor(unit: str) -> float:
         raise ActivityParseError(f"Unknown speed unit {unit}")
 
 
+def _first_of_tuple(value: Union[float, tuple[float, float]]) -> float:
+    try:
+        return float(value)
+    except TypeError:
+        return float(value[0])
+
+
 def read_gpx_activity(path: pathlib.Path, open) -> pd.DataFrame:
     points = []
     with open(path, "rb") as f:

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/importers/strava_api.py

@@ -4,6 +4,7 @@ import pathlib
 import pickle
 import time
 import zoneinfo
+from typing import Optional
 
 import pandas as pd
 from stravalib import Client
@@ -80,8 +81,12 @@ def import_from_strava_api(
     config: Config,
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
+    strava_begin: Optional[str] = None,
+    strava_end: Optional[str] = None,
 ) -> None:
-    while try_import_strava(config, repository, tile_visit_accessor):
+    while try_import_strava(
+        config, repository, tile_visit_accessor, strava_begin, strava_end
+    ):
         now = datetime.datetime.now()
         next_quarter = round_to_next_quarter_hour(now)
         seconds_to_wait = (next_quarter - now).total_seconds() + 10
@@ -95,8 +100,13 @@ def try_import_strava(
     config: Config,
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
+    strava_begin: Optional[str] = None,
+    strava_end: Optional[str] = None,
 ) -> bool:
-    get_after = get_state(strava_last_activity_date_path(), "2000-01-01T00:00:00Z")
+    if strava_begin:
+        get_after = f"{strava_begin}T00:00:00Z"
+    else:
+        get_after = get_state(strava_last_activity_date_path(), "2000-01-01T00:00:00Z")
 
     gear_names = {None: "None"}
 
@@ -106,6 +116,13 @@ def try_import_strava(
         for strava_activity in tqdm(
             client.get_activities(after=get_after), desc="Downloading Strava activities"
         ):
+            if (
+                strava_end
+                and strava_activity.start_date is not None
+                and str(strava_activity.start_date) > strava_end
+            ):
+                break
+
             cache_file = (
                 pathlib.Path("Cache")
                 / "Strava Activity Metadata"
@@ -171,10 +188,11 @@ def try_import_strava(
                 compute_tile_evolution(tile_visit_accessor.tile_state, config)
                 tile_visit_accessor.save()
 
-            set_state(
-                strava_last_activity_date_path(),
-                strava_activity.start_date.isoformat().replace("+00:00", "Z"),
-            )
+            if strava_begin is None and strava_end is None:
+                set_state(
+                    strava_last_activity_date_path(),
+                    strava_activity.start_date.isoformat().replace("+00:00", "Z"),
+                )
 
         limit_exceeded = False
     except RateLimitExceeded:

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/webui/app.py

@@ -11,15 +11,16 @@ import threading
 import urllib.parse
 import uuid
 import warnings
+from typing import Optional
 
 import pandas as pd
 import sqlalchemy
-from flask import Config
 from flask import Flask
 from flask import request
 from flask_alembic import Alembic
 
 from ..core.activities import ActivityRepository
+from ..core.config import Config
 from ..core.config import ConfigAccessor
 from ..core.config import import_old_config
 from ..core.config import import_old_strava_config
@@ -84,9 +85,13 @@ def importer_thread(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    strava_begin: Optional[str],
+    strava_end: Optional[str],
 ) -> None:
     with app.app_context():
-        scan_for_activities(repository, tile_visit_accessor, config)
+        scan_for_activities(
+            repository, tile_visit_accessor, config, strava_begin, strava_end
+        )
     logger.info("Importer thread is done.")
 
 
@@ -95,6 +100,8 @@ def web_ui_main(
     skip_reload: bool,
     host: str,
     port: int,
+    strava_begin: Optional[str],
+    strava_end: Optional[str],
 ) -> None:
     os.chdir(basedir)
 
@@ -109,6 +116,7 @@ def web_ui_main(
     database_path = pathlib.Path("database.sqlite")
     logger.info(f"Using database file at '{database_path.absolute()}'.")
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{database_path.absolute()}"
+    # app.config["SQLALCHEMY_ECHO"] = True
     app.config["ALEMBIC"] = {"script_location": "../alembic/versions"}
     DB.init_app(app)
 
@@ -144,7 +152,14 @@ def web_ui_main(
     if not skip_reload:
         thread = threading.Thread(
             target=importer_thread,
-            args=(app, repository, tile_visit_accessor, config_accessor()),
+            args=(
+                app,
+                repository,
+                tile_visit_accessor,
+                config_accessor(),
+                strava_begin,
+                strava_end,
+            ),
         )
         thread.start()
 

geo_activity_playground/webui/blueprints/eddington_blueprints.py

@@ -64,11 +64,7 @@ def _render_eddington_template(
 
     query = search_query_from_form(request.args)
     search_query_history.register_query(query)
-    activities = (
-        apply_search_query(repository.meta, query)
-        .dropna(subset=["start", column_name])
-        .copy()
-    )
+    activities = apply_search_query(query).dropna(subset=["start", column_name]).copy()
 
     assert (
         len(activities) > 0

geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py

@@ -26,7 +26,7 @@ def make_hall_of_fame_blueprint(
     def index() -> str:
         query = search_query_from_form(request.args)
         search_query_history.register_query(query)
-        activities = apply_search_query(repository.meta, query)
+        activities = apply_search_query(query)
         df = activities
 
         nominations = nominate_activities(df)

geo_activity_playground/webui/blueprints/heatmap_blueprint.py

@@ -183,7 +183,7 @@ def _get_counts(
         tile_count_cache_path.unlink(missing_ok=True)
         tmp_path.rename(tile_count_cache_path)
     else:
-        activities = apply_search_query(repository.meta, query)
+        activities = apply_search_query(query)
         activity_ids = activities_per_tile[z].get((x, y), set())
         for activity_id in activity_ids:
             if activity_id not in activities["id"]:

geo_activity_playground/webui/blueprints/photo_blueprint.py

@@ -42,6 +42,7 @@ def make_photo_blueprint(
         if not small_path.exists():
             with Image.open(original_path) as im:
                 target_size = (size, size)
+                im = ImageOps.exif_transpose(im)
                 im = ImageOps.contain(im, target_size)
                 small_path.parent.mkdir(exist_ok=True)
                 im.save(small_path)

geo_activity_playground/webui/blueprints/search_blueprint.py

@@ -35,7 +35,7 @@ def make_search_blueprint(
     def index():
         query = search_query_from_form(request.args)
         search_query_history.register_query(query)
-        activities = apply_search_query(repository.meta, query)
+        activities = apply_search_query(query)
 
         return render_template(
             "search/index.html.j2",

geo_activity_playground/webui/blueprints/summary_blueprint.py

@@ -178,7 +178,7 @@ def make_summary_blueprint(
     def index():
         query = search_query_from_form(request.args)
         search_query_history.register_query(query)
-        df = apply_search_query(repository.meta, query)
+        df = apply_search_query(query)
 
         kind_scale = make_kind_scale(repository.meta, config)
         df_without_nan = df.loc[~pd.isna(df["start"])]

geo_activity_playground/webui/blueprints/upload_blueprint.py

@@ -1,5 +1,6 @@
 import os
 import pathlib
+from typing import Optional
 
 import sqlalchemy
 from flask import Blueprint
@@ -115,6 +116,8 @@ def scan_for_activities(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    strava_begin: Optional[str] = None,
+    strava_end: Optional[str] = None,
     skip_strava: bool = False,
 ) -> None:
     if pathlib.Path("Activities").exists():
@@ -122,7 +125,9 @@ def scan_for_activities(
     if pathlib.Path("Strava Export").exists():
         import_from_strava_checkout(config)
     if config.strava_client_code and not skip_strava:
-        import_from_strava_api(config, repository, tile_visit_accessor)
+        import_from_strava_api(
+            config, repository, tile_visit_accessor, strava_begin, strava_end
+        )
 
     if len(repository) > 0:
         compute_tile_visits_new(repository, tile_visit_accessor)

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/webui/templates/activity/trim.html.j2

@@ -9,47 +9,12 @@
 
 <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());
+    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">

{geo_activity_playground-1.5.2.dist-info → geo_activity_playground-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 1.5.2
+Version: 1.7.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.dist-info → geo_activity_playground-1.7.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=y49XBk0PmAiunx2pZvxLjng1C-AMgAB-f_DljtTCb34,3209
+geo_activity_playground/__main__.py,sha256=KZr5_l6K3mqTqGKU9mUsI1y6UZokxgcq7fLPwEUCMJY,3531
 geo_activity_playground/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 geo_activity_playground/alembic/env.py,sha256=46oMzwSROaAsYuYWTd46txFdRLD3adm_SCn01A_ex8Q,2081
 geo_activity_playground/alembic/script.py.mako,sha256=g1k4U3D8y4PPYRzW3DH7GEu6yN4EiAr62GgCu6cRpBo,524
@@ -21,73 +21,74 @@ geo_activity_playground/core/activities.py,sha256=apP_-Rg1ub3lh7RARMGXf2BOmJTiah
 geo_activity_playground/core/config.py,sha256=mmdMQ5iCLNGnAlriT1ETEVS-gM6Aq_9sg22QECHj4n8,5358
 geo_activity_playground/core/coordinates.py,sha256=rW_OmMRpTUyIsQwrT6mgT9Y6uPGuwqTo5XDDMS7mGuo,1140
 geo_activity_playground/core/copernicus_dem.py,sha256=t6Bc9fsyGyx1awdePXvlN-Zc-tiT2eGSJ80SV5B1Z9A,2944
-geo_activity_playground/core/datamodel.py,sha256=PRqxKlExXxRXkHYIJeNsRr1DZQmdzAwa3PLyivJoix8,15983
-geo_activity_playground/core/enrichment.py,sha256=pw9VEyDAtdNbjQ1HOPYyXCXT8SLL5i3Cp6KWjKK7puM,8708
+geo_activity_playground/core/datamodel.py,sha256=DVKgvS8nIuvGBUiXGJbNci3xdY1TxXrFGhsYin86E5Q,16730
+geo_activity_playground/core/enrichment.py,sha256=b27E_KK30xjq8MuGFZyIpKzz8fO2LwLVaGGTP0mb5N0,8618
 geo_activity_playground/core/export.py,sha256=ayOmhWL72263oP9NLIZRYCg_Db0GLUFhgNIL_MCrV-E,4435
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
-geo_activity_playground/core/meta_search.py,sha256=nyvCuR7v0pd6KjA8W5Kr71bBafRdE_ol7uSFRJs4eAM,6662
+geo_activity_playground/core/meta_search.py,sha256=Sevl4AtBwJZMW3VJ6ihRqwjC0M9fhJqX3MN6tw_hIFQ,6627
 geo_activity_playground/core/missing_values.py,sha256=HjonaLV0PFMICnuMrbdUNnK9uy_8PBh_RxI5GuEMQK0,250
 geo_activity_playground/core/parametric_plot.py,sha256=8CKB8dey7EmZtQnl6IOgBhpxkw0UCpQPWeiBw5PqW8k,5737
 geo_activity_playground/core/paths.py,sha256=qQ4ujaIHmsxTGEWzf-76XS8FclEI2RC5COTUeuLEbDI,2938
-geo_activity_playground/core/photos.py,sha256=pUnEfVesEKESlew6_KkYAF582ejLupnWTqs_RcvnRsA,1070
+geo_activity_playground/core/photos.py,sha256=pHdVUpgKfbyrTddZL_mgmsXQJ3k_IHKf70jtcIjjcCA,1229
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/raster_map.py,sha256=y7maiC_bmUwXsULC_XCZ1m8nGgU2jFe47QFB7TpC_V4,8257
 geo_activity_playground/core/similarity.py,sha256=L2de3DPRdDeDY5AxZwLDcH7FjHWRWklr41VNU06q9kQ,3117
 geo_activity_playground/core/summary_stats.py,sha256=v5FtWnE1imDF5axI6asVN55wCrlD73oZ6lvqzxsTN2c,1006
 geo_activity_playground/core/tasks.py,sha256=-_9cxekoHSWzCW4XblNeqrwi2tTqr5AE7_-p8fdqhwc,2886
 geo_activity_playground/core/test_datamodel.py,sha256=-VrGHgx5Z3MSQPqHGmmm7atRJYbg5y_ukvRHKxk22PI,569
-geo_activity_playground/core/test_meta_search.py,sha256=zhuD343Xce-4Fkznw81DHQ7pK5eyX5UbcyCHuYRKsr8,3091
+geo_activity_playground/core/test_meta_search.py,sha256=R0fvFvXR3N23HFcACidixe3Dl1CwBZMNRnOjG3cT39s,3031
 geo_activity_playground/core/test_missing_values.py,sha256=7yvg6dUu7p8PR_rxUxgFaJCrGzfYUcF8Zf6y7bCEYKw,356
 geo_activity_playground/core/test_pandas_timezone.py,sha256=-MDiLoLG5tDMqkI0iKno24kFn9X3tslh9ZpoDYLWNJU,771
 geo_activity_playground/core/test_summary_stats.py,sha256=qH_45mPRFD2H-Rr0Ku-RYc67vhC7qKxbPr7J2F36uV8,3081
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
-geo_activity_playground/core/test_time_zone_from_location.py,sha256=PKxDysm8D0FJjyuc4Kzrv65UxzP-ogUtFHQZ7mGKZQw,229
+geo_activity_playground/core/test_time_zone_from_location.py,sha256=frL5QHV7-Tuwo2Igx2kIEyTPbW2t3lusCc4Sl5xWlz0,393
 geo_activity_playground/core/test_time_zone_import.py,sha256=1CAJyGTHYPoxabBNVRfLhaRNbvvWcAYjJyDR-qvbRjg,3349
 geo_activity_playground/core/test_timezone_sqlalchemy.py,sha256=OXjdowGXM-DsM4-Mpab8c3j3AtdW_yXp2NgI-B_cbvA,1172
 geo_activity_playground/core/tiles.py,sha256=LBn2V6WAvMxZeXSIQ8ruZL71iyvOXoFZMz7PZgNUf7M,2189
-geo_activity_playground/core/time_conversion.py,sha256=F-vQ-MdbTOqPTAELplDjT5m7kdaf1RsqBXELfsR5eOU,1329
+geo_activity_playground/core/time_conversion.py,sha256=f5CByqyWSthCplrbXZThSFbt3eY-t1g-2H5lkfBlgc0,1556
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=YNL_c4O1-kxaajATJwj4ZLywCL5Hpj9qy2h-F7rk8Yg,3260
-geo_activity_playground/explorer/tile_visits.py,sha256=NUzC4jNb_vQExAIALrO2H1MiNs5JJKsOQKGietAcATE,16271
+geo_activity_playground/explorer/tile_visits.py,sha256=QlotWptXgv_uvtBr4qSdGpC4as6PR5Idharv_utwNyU,16943
 geo_activity_playground/explorer/video.py,sha256=7j6Qv3HG6On7Tn7xh7Olwrx_fbQnfzS7CeRg3TEApHg,4397
 geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuMCZkERWNkQjg,3318
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/activity_parsers.py,sha256=kL0PcS5eIjRokphQqkWs3ETNj-xdFkYLP7kdQW8y23o,11430
+geo_activity_playground/importers/activity_parsers.py,sha256=NAK_Fv_zy75WuNa1bgYgzjc7Dnsj1oVah6DW0faLCG4,11403
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
-geo_activity_playground/importers/directory.py,sha256=ucnB5sPBvXzLdaza2v8GVU75ArfGG4E7d5OXrCgoFq4,3562
-geo_activity_playground/importers/strava_api.py,sha256=Fiqlc-VeuzsvgDcWt71JoPMri221cMjkeL4SH80gC5s,8426
-geo_activity_playground/importers/strava_checkout.py,sha256=Pugtv0nbgfuVzBDC5e5Tfv1jShUYmMcDbpCQp2ULXow,9232
+geo_activity_playground/importers/directory.py,sha256=sHcLIi0DOPEATt4wiE_vp00h89fO940wUQyJZUzzpnw,3978
+geo_activity_playground/importers/strava_api.py,sha256=0lUmC6u829vJpaIs7plQq4mOPgc7yQI65vN9qhAEqVs,9015
+geo_activity_playground/importers/strava_checkout.py,sha256=joJI_uic9fYtu7E5Odh6GUq_LyiLqQ72Ucy_Mbjr-X0,9289
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
 geo_activity_playground/importers/test_strava_api.py,sha256=7b8bl5Rh2BctCmvTPEhCadxtUOq3mfzuadD6F5XxRio,398
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/app.py,sha256=F1gHR2BtiMizwACxFrR_Egm2cNL_cAhWEEToP5H9EEg,10695
+geo_activity_playground/webui/app.py,sha256=YxzUhvAgmSHiUfIEmvbey1PNStgB5Wcdj-b734OehdY,11087
 geo_activity_playground/webui/authenticator.py,sha256=dhREYOu_TCD_nzFNuSlHIbf5K6TmwKdXtr1wxD8fBcc,1491
 geo_activity_playground/webui/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=tFy0GpOBhIP8xlmYc9PF4kAng-0MosXMJudVupGz2Yw,26771
 geo_activity_playground/webui/blueprints/auth_blueprint.py,sha256=iCm3hZphQKR9qFgytOrfnSmr-Og1gHuQ1Djiv2o_bkE,1031
 geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py,sha256=8R1rUVoyofGhUgesPunys1HoLPYinvhA46BBnMvEn9Q,2880
 geo_activity_playground/webui/blueprints/calendar_blueprint.py,sha256=SmOu5AfNNoWcJJNduEfPtaPRvr4EZLYAeIDLUK9P1LY,2939
-geo_activity_playground/webui/blueprints/eddington_blueprints.py,sha256=Ya5GJxfVESwmRlgMTYe9g75g8JHHTAAvYFmSD-3Uz4Q,8987
+geo_activity_playground/webui/blueprints/eddington_blueprints.py,sha256=m0IhM1cr_LbAOP0us4MXUbSAuT5nx_yiHljpWTrz-js,8936
 geo_activity_playground/webui/blueprints/entry_views.py,sha256=SDCzpUSb1FAb84tM0SnmrZQvtaTlO-Rqdj94hyIMDSc,2936
 geo_activity_playground/webui/blueprints/equipment_blueprint.py,sha256=8L_7NZGErvu4jyigi2gg7HN_gegZRdsSFahUH7Dz6Lw,5727
 geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=6ldVAKhYLNSnkI4X_NbuKtnV_Pm9t_Bm5UZOJoiLN_s,20835
 geo_activity_playground/webui/blueprints/export_blueprint.py,sha256=C9yFH5gEJs2YtWE-EhcGDEyGwwaLgC1umybgIRi6duE,1036
-geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py,sha256=9CfcXE7v-p6IDR4L6ccBmSXlt89xTwitYetSF8xxI9g,3138
-geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=5LlYKMeOMIE7c3xGRZ52ld4Jxtdc3GNcb6lvt3v7NVA,8435
-geo_activity_playground/webui/blueprints/photo_blueprint.py,sha256=ql8gfJ-HYgy99PXPHGdbF_sp5wHsxjePQjWJipfpw1A,7250
+geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py,sha256=NGVk8Xgwpt-YNX5_zgGWTMRctN_N4NCnMq10DSDteVg,3121
+geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=prERVBOxq2xvmgyH_dwtLwMMMFILeu-6yZE9h9U_T9g,8418
+geo_activity_playground/webui/blueprints/photo_blueprint.py,sha256=i4-AS9icK6pDypTdl-coTZyKldXtpukGiNbKsihfpl0,7299
 geo_activity_playground/webui/blueprints/plot_builder_blueprint.py,sha256=nGtYblRTJ0rasJvl_L35cs1Iry4LONPy_9TY4ytXB-Q,3838
-geo_activity_playground/webui/blueprints/search_blueprint.py,sha256=Sv_KL1Cdai26y51qVfI-5jZLhtElREsEar1dbR_VAC4,2275
+geo_activity_playground/webui/blueprints/search_blueprint.py,sha256=hY3hfGTip24AEf7NVTPtQt2hj7MEAcG3gbJd42NY3Ic,2258
 geo_activity_playground/webui/blueprints/settings_blueprint.py,sha256=cwes3QmRrC_HMP1g-Yc-x2BJycF4jF3StJl75v9acWo,20377
 geo_activity_playground/webui/blueprints/square_planner_blueprint.py,sha256=xVaxJxmt8Dysl3UL9f2y__LVLtTH2Np1Ust4OSXKRAk,4746
-geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=ZF9Mocewddpn09pElSqrVS6jkqajhEJMn-7KbIvZodY,6751
+geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=7aJYvo8EERGnItL9PFCMLM6T26xiQa3VP2RUvWglgy4,6734
 geo_activity_playground/webui/blueprints/tile_blueprint.py,sha256=YzZf9OrNdjhc1_j4MtO1DMcw1uCv29ueNsYd-mWqgbg,837
 geo_activity_playground/webui/blueprints/time_zone_fixer_blueprint.py,sha256=PEHsk3kRHx2EvQ-6VPD4xeOmXGjh64GMAagFkQ0wbeg,2301
-geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=K7bWCN9kotklbkrjPR-IV08p9O2aekzG_vuksduSJB4,4609
+geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=mwoLeanW8oN6u7msE_Lx0grxDOYev4beqPbkPZRemkM,4763
 geo_activity_playground/webui/columns.py,sha256=FP0YfX-WFQk1JEXhrywv3NUEVq-x7Hv0or35X3Ltf9c,1525
 geo_activity_playground/webui/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
 geo_activity_playground/webui/plot_util.py,sha256=5Uesjj-xcMskQX2z9viDZYHSxLGrH2a5dHA1ogsJW9U,261
 geo_activity_playground/webui/search_util.py,sha256=gH2cOM1FTAozZUlSQ4C1dR1xlV-8e82pD1PPi_pPBNY,2647
+geo_activity_playground/webui/static/activity-trim.js,sha256=TVU32IGVweK9KfcMIXbtEo8IeQ36mS--_D8gjBXqBz0,1076
 geo_activity_playground/webui/static/bootstrap/bootstrap-dark-mode.js,sha256=XfyhxIFgjDc6aEj0kYgKpG5zjS5gvyhWCJmNfUG4HJY,2622
 geo_activity_playground/webui/static/bootstrap/bootstrap.bundle.min.js,sha256=gvZPYrsDwbwYJLD5yeBfcNujPhRoGOY831wwbIzz3t0,80663
 geo_activity_playground/webui/static/bootstrap/bootstrap.min.css,sha256=MBffSnbbXwHCuZtgPYiwMQbfE7z-GOZ7fBPCNB06Z98,232948
@@ -130,7 +131,7 @@ geo_activity_playground/webui/templates/activity/edit.html.j2,sha256=r979JPqaZi_
 geo_activity_playground/webui/templates/activity/lines.html.j2,sha256=_ZDg1ruW-9UMJfOudy1-uY_-IcSSaagq7tPCih5Bb8g,1079
 geo_activity_playground/webui/templates/activity/name.html.j2,sha256=RYbNGzPexa4gRUWRjw-C9nWvp5lI7agAZZCS3Du7nAs,2661
 geo_activity_playground/webui/templates/activity/show.html.j2,sha256=gE4RraLi-h63KvHO4oXLDWPcXN1FB6wqMxVKB75Zn0k,10974
-geo_activity_playground/webui/templates/activity/trim.html.j2,sha256=3oAXQab6QqWjGBC9KCvWNOVn8uRmxoDLj3hx_O63TXc,1836
+geo_activity_playground/webui/templates/activity/trim.html.j2,sha256=4ALQ6ZruhGfK4gAyCzVFl4jEHC-3w9iWjmigsunCe7s,1022
 geo_activity_playground/webui/templates/auth/index.html.j2,sha256=wzA0uxpiT1ktDadgnjvFXc9iUGMFm9GhjDkavl3S1h4,646
 geo_activity_playground/webui/templates/bubble_chart/index.html.j2,sha256=yd7lWjtxxVmJZqCiXb0Y1gMEOQ7LQYJXEdpE7JB1OZY,1616
 geo_activity_playground/webui/templates/calendar/index.html.j2,sha256=8dV9yeDwfv0Mm81mhiPHN5r3hdPUWl1Yye03x0Rqbo8,1601
@@ -174,8 +175,8 @@ geo_activity_playground/webui/templates/summary/vega-chart.html.j2,sha256=mw8Hti
 geo_activity_playground/webui/templates/time_zone_fixer/index.html.j2,sha256=s9r6BJMXmd7kLSyjkvH4xLi6e01S5bpGRcMgMMJyCAE,1760
 geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-1.5.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-1.5.2.dist-info/METADATA,sha256=smMUq_xNvcfzZpxkimkxsJG7OkBD52yEARb7M8Qqc74,1890
-geo_activity_playground-1.5.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-1.5.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-1.5.2.dist-info/RECORD,,
+geo_activity_playground-1.7.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-1.7.0.dist-info/METADATA,sha256=HCy1RVSW8KTPYzUWo9XW5ozzP9HV87ueYQO3Aq6mXjY,1937
+geo_activity_playground-1.7.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-1.7.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-1.7.0.dist-info/RECORD,,