geo-activity-playground 0.28.0__py3-none-any.whl → 0.29.1__py3-none-any.whl

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
@@ -103,7 +104,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 +117,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 +195,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/core/config.py

@@ -21,6 +21,8 @@ logger = logging.getLogger(__name__)
 @dataclasses.dataclass
 class Config:
     birth_year: Optional[int] = None
+    color_scheme_for_counts: str = "viridis"
+    color_scheme_for_kind: str = "category10"
     equipment_offsets: dict[str, float] = dataclasses.field(default_factory=dict)
     explorer_zoom_levels: list[int] = dataclasses.field(
         default_factory=lambda: [14, 17]
@@ -52,6 +54,7 @@ class ConfigAccessor:
         return self._config
 
     def save(self) -> None:
+        print(self._config)
         with open(new_config_file(), "w") as f:
             json.dump(
                 dataclasses.asdict(self._config),

geo_activity_playground/core/paths.py

@@ -1,6 +1,7 @@
 """
 Paths within the playground and cache.
 """
+import contextlib
 import functools
 import pathlib
 import typing
@@ -24,6 +25,15 @@ def file_wrapper(path: pathlib.Path) -> typing.Callable[[], pathlib.Path]:
     return wrapper
 
 
+@contextlib.contextmanager
+def atomic_open(path: pathlib.Path, mode: str):
+    temp_path = path.with_stem(path.stem + "-temp")
+    with open(temp_path, mode) as f:
+        yield f
+    path.unlink(missing_ok=True)
+    temp_path.rename(path)
+
+
 _cache_dir = pathlib.Path("Cache")
 
 _activity_dir = _cache_dir / "Activity"

geo_activity_playground/core/tasks.py

@@ -8,6 +8,7 @@ from typing import Generic
 from typing import Sequence
 from typing import TypeVar
 
+from geo_activity_playground.core.paths import atomic_open
 from geo_activity_playground.core.paths import cache_dir
 
 
@@ -24,11 +25,8 @@ def stored_object(path: pathlib.Path, default):
 
     yield payload
 
-    temp_location = path.with_suffix(".tmp")
-    with open(temp_location, "wb") as f:
+    with atomic_open(path, "wb") as f:
         pickle.dump(payload, f)
-    path.unlink(missing_ok=True)
-    temp_location.rename(path)
 
 
 def work_tracker_path(name: str) -> pathlib.Path:
@@ -68,6 +66,9 @@ class WorkTracker:
     def discard(self, id) -> None:
         self._done.discard(id)
 
+    def reset(self) -> None:
+        self._done = set()
+
     def close(self) -> None:
         with open(self._path, "wb") as f:
             pickle.dump(self._done, f)

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/explorer/tile_visits.py

@@ -14,6 +14,7 @@ from tqdm import tqdm
 
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.config import Config
+from geo_activity_playground.core.paths import atomic_open
 from geo_activity_playground.core.paths import tiles_per_time_series
 from geo_activity_playground.core.tasks import try_load_pickle
 from geo_activity_playground.core.tasks import work_tracker_path
@@ -58,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
@@ -79,11 +80,12 @@ class TileVisitAccessor:
             self.tile_state = make_tile_state()
             # TODO: Reset work tracker
 
+    def reset(self) -> None:
+        self.tile_state = make_tile_state()
+
     def save(self) -> None:
-        tmp_path = self.PATH.with_suffix(".tmp")
-        with open(tmp_path, "wb") as f:
+        with atomic_open(self.PATH, "wb") as f:
             pickle.dump(self.tile_state, f)
-        tmp_path.rename(self.PATH)
 
 
 def make_defaultdict_dict():
@@ -106,20 +108,52 @@ def make_tile_state() -> TileState:
     return tile_state
 
 
+def _consistency_check(
+    repository: ActivityRepository, tile_visit_accessor: TileVisitAccessor
+) -> bool:
+    present_activity_ids = set(repository.get_activity_ids())
+
+    for zoom, activities_per_tile in tile_visit_accessor.tile_state[
+        "activities_per_tile"
+    ].items():
+        for tile, tile_activity_ids in activities_per_tile.items():
+            deleted_activity_ids = tile_activity_ids - present_activity_ids
+            if deleted_activity_ids:
+                logger.info(f"Activities {deleted_activity_ids} have been deleted.")
+                return False
+
+    for zoom, tile_visits in tile_visit_accessor.tile_state["tile_visits"].items():
+        for tile, meta in tile_visits.items():
+            if meta["first_id"] not in present_activity_ids:
+                logger.info(f"Activity {meta['first_id']} have been deleted.")
+                return False
+            if meta["last_id"] not in present_activity_ids:
+                logger.info(f"Activity {meta['last_id']} have been deleted.")
+                return False
+
+    return True
+
+
 def compute_tile_visits_new(
     repository: ActivityRepository, tile_visit_accessor: TileVisitAccessor
 ) -> None:
     work_tracker = WorkTracker(work_tracker_path("tile-state"))
+
+    if not _consistency_check(repository, tile_visit_accessor):
+        logger.warning("Need to recompute Explorer Tiles due to deleted activities.")
+        tile_visit_accessor.reset()
+        work_tracker.reset()
+
     for activity_id in tqdm(
-        work_tracker.filter(repository.get_activity_ids()), desc="Tile visits (new)"
+        work_tracker.filter(repository.get_activity_ids()), desc="Tile visits"
     ):
-        do_tile_stuff(repository, tile_visit_accessor.tile_state, activity_id)
+        _process_activity(repository, tile_visit_accessor.tile_state, activity_id)
         work_tracker.mark_done(activity_id)
     tile_visit_accessor.save()
     work_tracker.close()
 
 
-def do_tile_stuff(
+def _process_activity(
     repository: ActivityRepository, tile_state: TileState, activity_id: int
 ) -> None:
     activity = repository.get_activity_by_id(activity_id)
@@ -131,7 +165,7 @@ def do_tile_stuff(
     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": [],
@@ -145,7 +179,7 @@ def do_tile_stuff(
             zip(activity_tiles["tile_x"], activity_tiles["tile_y"]),
         ):
             if activity["consider_for_achievements"]:
-                if tile not in activities_per_tile:
+                if tile not in tile_state["tile_visits"][zoom]:
                     new_tile_history_soa["activity_id"].append(activity_id)
                     new_tile_history_soa["time"].append(time)
                     new_tile_history_soa["tile_x"].append(tile[0])

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

@@ -12,6 +12,8 @@ import pandas as pd
 from PIL import Image
 from PIL import ImageDraw
 
+from ...explorer.grid_file import make_grid_file_geojson
+from ...explorer.grid_file import make_grid_points
 from geo_activity_playground.core.activities import ActivityMeta
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import make_geojson_color_line
@@ -66,9 +68,27 @@ class ActivityController:
                 ]
                 == activity["id"]
             )
-            for zoom in [14, 17]
+            for zoom in sorted(self._config.explorer_zoom_levels)
         }
 
+        new_tiles_geojson = {}
+        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][
+                    "activity_id"
+                ]
+                == activity["id"]
+            ]
+            if len(new_tiles):
+                points = make_grid_points(
+                    (
+                        (row["tile_x"], row["tile_y"])
+                        for index, row in new_tiles.iterrows()
+                    ),
+                    zoom,
+                )
+                new_tiles_geojson[zoom] = make_grid_file_geojson(points)
+
         result = {
             "activity": activity,
             "line_json": line_json,
@@ -81,6 +101,7 @@ class ActivityController:
             "date": activity["start"].date(),
             "time": activity["start"].time(),
             "new_tiles": new_tiles,
+            "new_tiles_geojson": new_tiles_geojson,
         }
         if (
             heart_zones := _extract_heart_rate_zones(

geo_activity_playground/webui/activity/templates/activity/show.html.j2

@@ -136,6 +136,39 @@
 <p>Not happy with the displayed data? <a href="{{ url_for('settings.sharepic') }}">Change share picture
         settings</a>.</p>
 
+{% if new_tiles_geojson %}
+<h2>New explorer tiles</h2>
+<p>With this activity you have explored new explorer tiles. The following maps show the new tiles on the respective zoom
+    levels.</p>
+<script>
+    function add_map(id, geojson) {
+        let map = L.map(`map-${id}`, {
+            fullscreenControl: true
+        })
+        L.tileLayer('/tile/color/{z}/{x}/{y}.png', {
+            maxZoom: 19,
+            attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+        }).addTo(map)
+
+        let geojson_layer = L.geoJSON(geojson).addTo(map)
+        map.fitBounds(geojson_layer.getBounds())
+        return map
+    }
+</script>
+
+<div class="row mb-3">
+    {% for zoom, geojson in new_tiles_geojson.items() %}
+    <div class="col-md-6">
+        <h3>Zoom {{ zoom }}</h3>
+        <div id="map-{{ zoom }}" style="height: 300px; width: 100%;"></div>
+        <script>
+            let map{{ zoom }} = add_map("{{ zoom }}", {{ geojson | safe }})
+        </script>
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
+
 {% if similar_activites|length > 0 %}
 <div class="row mb-3">
     <div class="col">

geo_activity_playground/webui/app.py

@@ -5,7 +5,6 @@ import secrets
 
 from flask import Flask
 from flask import render_template
-from flask import request
 
 from ..core.activities import ActivityRepository
 from ..explorer.tile_visits import TileVisitAccessor
@@ -16,31 +15,20 @@ from .entry_controller import EntryController
 from .equipment.blueprint import make_equipment_blueprint
 from .explorer.blueprint import make_explorer_blueprint
 from .heatmap.blueprint import make_heatmap_blueprint
-from .search_controller import SearchController
+from .search.blueprint import make_search_blueprint
 from .square_planner.blueprint import make_square_planner_blueprint
 from .summary.blueprint import make_summary_blueprint
 from .tile.blueprint import make_tile_blueprint
 from .upload.blueprint import make_upload_blueprint
+from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.config import ConfigAccessor
 from geo_activity_playground.webui.auth.blueprint import make_auth_blueprint
 from geo_activity_playground.webui.authenticator import Authenticator
 from geo_activity_playground.webui.settings.blueprint import make_settings_blueprint
 
 
-def route_search(app: Flask, repository: ActivityRepository) -> None:
-    search_controller = SearchController(repository)
-
-    @app.route("/search", methods=["POST"])
-    def search():
-        form_input = request.form
-        return render_template(
-            "search.html.j2",
-            **search_controller.render_search_results(form_input["name"])
-        )
-
-
-def route_start(app: Flask, repository: ActivityRepository) -> None:
-    entry_controller = EntryController(repository)
+def route_start(app: Flask, repository: ActivityRepository, config: Config) -> None:
+    entry_controller = EntryController(repository, config)
 
     @app.route("/")
     def index():
@@ -66,7 +54,6 @@ def web_ui_main(
     host: str,
     port: int,
 ) -> None:
-
     repository.reload()
 
     app = Flask(__name__)
@@ -75,8 +62,7 @@ def web_ui_main(
 
     authenticator = Authenticator(config_accessor())
 
-    route_search(app, repository)
-    route_start(app, repository)
+    route_start(app, repository, config_accessor())
 
     app.register_blueprint(make_auth_blueprint(authenticator), url_prefix="/auth")
 
@@ -111,7 +97,11 @@ def web_ui_main(
         url_prefix="/square-planner",
     )
     app.register_blueprint(
-        make_summary_blueprint(repository),
+        make_search_blueprint(repository),
+        url_prefix="/search",
+    )
+    app.register_blueprint(
+        make_summary_blueprint(repository, config_accessor()),
         url_prefix="/summary",
     )
     app.register_blueprint(make_tile_blueprint(), url_prefix="/tile")

geo_activity_playground/webui/authenticator.py

@@ -14,9 +14,6 @@ class Authenticator:
         self._config = config
 
     def is_authenticated(self) -> bool:
-        print(
-            f"Password={self._config.upload_password}, Session={session.get('is_authenticated', False)}"
-        )
         return not self._config.upload_password or session.get(
             "is_authenticated", False
         )

geo_activity_playground/webui/entry_controller.py

@@ -6,18 +6,22 @@ import pandas as pd
 
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import make_geojson_from_time_series
+from geo_activity_playground.core.config import Config
+from geo_activity_playground.webui.plot_util import make_kind_scale
 
 
 class EntryController:
-    def __init__(self, repository: ActivityRepository) -> None:
+    def __init__(self, repository: ActivityRepository, config: Config) -> None:
         self._repository = repository
+        self._config = config
 
     def render(self) -> dict:
+        kind_scale = make_kind_scale(self._repository.meta, self._config)
         result = {"latest_activities": []}
 
         if len(self._repository):
             result["distance_last_30_days_plot"] = distance_last_30_days_meta_plot(
-                self._repository.meta
+                self._repository.meta, kind_scale
             )
 
         for activity in itertools.islice(
@@ -33,7 +37,7 @@ class EntryController:
         return result
 
 
-def distance_last_30_days_meta_plot(meta: pd.DataFrame) -> str:
+def distance_last_30_days_meta_plot(meta: pd.DataFrame, kind_scale: alt.Scale) -> str:
     before_30_days = pd.to_datetime(
         datetime.datetime.now() - datetime.timedelta(days=31)
     )
@@ -48,7 +52,7 @@ def distance_last_30_days_meta_plot(meta: pd.DataFrame) -> str:
         .encode(
             alt.X("yearmonthdate(start)", title="Date"),
             alt.Y("sum(distance_km)", title="Distance / km"),
-            alt.Color("kind", scale=alt.Scale(scheme="category10"), title="Kind"),
+            alt.Color("kind", scale=kind_scale, title="Kind"),
             [
                 alt.Tooltip("yearmonthdate(start)", title="Date"),
                 alt.Tooltip("kind", title="Kind"),

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
@@ -161,6 +161,7 @@ def get_three_color_tiles(
             "last_visit": tile_data["last_time"].date().isoformat(),
             "num_visits": len(tile_data["activity_ids"]),
             "square": False,
+            "tile": f"({zoom}, {tile[0]}, {tile[1]})",
         }
 
     # Mark biggest square.

geo_activity_playground/webui/explorer/templates/explorer/index.html.j2

@@ -48,6 +48,8 @@
             function onEachFeature(feature, layer) {
                 if (feature.properties && feature.properties.first_visit) {
                     let lines = [
+                        `<dt>Tile</dt>`,
+                        `<dd>${feature.properties.tile}</dd>`,
                         `<dt>First visit</dt>`,
                         `<dd>${feature.properties.first_visit}</br><a href=/activity/${feature.properties.first_activity_id}>${feature.properties.first_activity_name}</a></dd>`,
                         `<dt>Last visit</dt>`,

geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -123,6 +123,7 @@ class HeatmapController:
                         tile_counts += aim
             tmp_path = tile_count_cache_path.with_suffix(".tmp.npy")
             np.save(tmp_path, tile_counts)
+            tile_count_cache_path.unlink(missing_ok=True)
             tmp_path.rename(tile_count_cache_path)
         return tile_counts
 

geo_activity_playground/webui/plot_util.py

@@ -0,0 +1,9 @@
+import altair as alt
+import pandas as pd
+
+from geo_activity_playground.core.config import Config
+
+
+def make_kind_scale(meta: pd.DataFrame, config: Config) -> alt.Scale:
+    kinds = sorted(meta["kind"].unique())
+    return alt.Scale(domain=kinds, scheme=config.color_scheme_for_kind)

geo_activity_playground/webui/search/blueprint.py

@@ -0,0 +1,20 @@
+from flask import Blueprint
+from flask import render_template
+from flask import request
+from flask import Response
+
+from ...core.activities import ActivityRepository
+
+
+def make_search_blueprint(repository: ActivityRepository) -> Blueprint:
+    blueprint = Blueprint("search", __name__, template_folder="templates")
+
+    @blueprint.route("/", methods=["POST"])
+    def index():
+        activities = []
+        for _, row in repository.meta.iterrows():
+            if request.form["name"] in row["name"]:
+                activities.append(row)
+        return render_template("search/index.html.j2", activities=activities)
+
+    return blueprint

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(
@@ -42,6 +44,73 @@ def make_settings_blueprint(
             **settings_controller.render_admin_password(),
         )
 
+    @blueprint.route("/color-schemes", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def color_schemes():
+        if request.method == "POST":
+            config_accessor().color_scheme_for_counts = request.form[
+                "color_scheme_for_counts"
+            ]
+            config_accessor().color_scheme_for_kind = request.form[
+                "color_scheme_for_kind"
+            ]
+            config_accessor.save()
+            flash("Updated color schemes.", category="success")
+        return render_template(
+            "settings/color-schemes.html.j2",
+            color_scheme_for_counts=config_accessor().color_scheme_for_counts,
+            color_scheme_for_counts_avail=[
+                "viridis",
+                "magma",
+                "inferno",
+                "plasma",
+                "cividis",
+                "turbo",
+                "bluegreen",
+                "bluepurple",
+                "goldgreen",
+                "goldorange",
+                "goldred",
+                "greenblue",
+                "orangered",
+                "purplebluegreen",
+                "purpleblue",
+                "purplered",
+                "redpurple",
+                "yellowgreenblue",
+                "yellowgreen",
+                "yelloworangebrown",
+                "yelloworangered",
+                "darkblue",
+                "darkgold",
+                "darkgreen",
+                "darkmulti",
+                "darkred",
+                "lightgreyred",
+                "lightgreyteal",
+                "lightmulti",
+                "lightorange",
+                "lighttealblue",
+            ],
+            color_scheme_for_kind=config_accessor().color_scheme_for_kind,
+            color_scheme_for_kind_avail=[
+                "accent",
+                "category10",
+                "category20",
+                "category20b",
+                "category20c",
+                "dark2",
+                "paired",
+                "pastel1",
+                "pastel2",
+                "set1",
+                "set2",
+                "set3",
+                "tableau10",
+                "tableau20",
+            ],
+        )
+
     @blueprint.route("/equipment-offsets", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def equipment_offsets():

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/webui/settings/templates/settings/color-schemes.html.j2

@@ -0,0 +1,33 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Color Schemes for Plots</h1>
+
+<p>Don't like color schemes in the plots? Have a look at the <a href="https://vega.github.io/vega/docs/schemes/"
+        target="_blank">colors schemes of Vega</a> and pick one that you like.</p>
+
+<form method="POST">
+    <div class="mb-3">
+        <label class="form-label">Color scheme for activity kinds</label>
+        <select class="form-select" aria-label="Color scheme for activity kinds" name="color_scheme_for_kind">
+            {% for cs in color_scheme_for_kind_avail %}
+            <option {% if cs==color_scheme_for_kind %} selected {% endif %}>{{ cs }}</option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label class="form-label">Color scheme for heatmaps</label>
+        <select class="form-select" aria-label="Color scheme for heatmaps" name="color_scheme_for_counts">
+            {% for cs in color_scheme_for_counts_avail %}
+            <option {% if cs==color_scheme_for_counts %} selected {% endif %}>{{ cs }}</option>
+            {% endfor %}
+        </select>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground/webui/settings/templates/settings/index.html.j2

@@ -20,6 +20,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Color schemes</h5>
+                    <p class="card-text">Don't like the colors in the plots?</p>
+                    <a href="{{ url_for('.color_schemes') }}" class="btn btn-primary">Set up color schemes</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">

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

@@ -3,10 +3,11 @@ from flask import render_template
 
 from ...core.activities import ActivityRepository
 from .controller import SummaryController
+from geo_activity_playground.core.config import Config
 
 
-def make_summary_blueprint(repository: ActivityRepository) -> Blueprint:
-    summary_controller = SummaryController(repository)
+def make_summary_blueprint(repository: ActivityRepository, config: Config) -> Blueprint:
+    summary_controller = SummaryController(repository, config)
     blueprint = Blueprint("summary", __name__, template_folder="templates")
 
     @blueprint.route("/")

geo_activity_playground/webui/summary/controller.py

@@ -8,14 +8,18 @@ import pandas as pd
 
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import make_geojson_from_time_series
+from geo_activity_playground.core.config import Config
+from geo_activity_playground.webui.plot_util import make_kind_scale
 
 
 class SummaryController:
-    def __init__(self, repository: ActivityRepository) -> None:
+    def __init__(self, repository: ActivityRepository, config: Config) -> None:
         self._repository = repository
+        self._config = config
 
     @functools.cache
     def render(self) -> dict:
+        kind_scale = make_kind_scale(self._repository.meta, self._config)
         df = embellished_activities(self._repository.meta)
         df = df.loc[df["consider_for_achievements"]]
 
@@ -27,14 +31,14 @@ class SummaryController:
         )
 
         return {
-            "plot_distance_heatmap": plot_distance_heatmap(df),
-            "plot_monthly_distance": plot_monthly_distance(df),
-            "plot_yearly_distance": plot_yearly_distance(year_kind_total),
+            "plot_distance_heatmap": plot_distance_heatmap(df, self._config),
+            "plot_monthly_distance": plot_monthly_distance(df, kind_scale),
+            "plot_yearly_distance": plot_yearly_distance(year_kind_total, kind_scale),
             "plot_year_cumulative": plot_year_cumulative(df),
             "tabulate_year_kind_mean": tabulate_year_kind_mean(df)
             .reset_index()
             .to_dict(orient="split"),
-            "plot_weekly_distance": plot_weekly_distance(df),
+            "plot_weekly_distance": plot_weekly_distance(df, kind_scale),
             "nominations": [
                 (
                     self._repository.get_activity_by_id(activity_id),
@@ -108,7 +112,7 @@ def embellished_activities(meta: pd.DataFrame) -> pd.DataFrame:
     return df
 
 
-def plot_distance_heatmap(meta: pd.DataFrame) -> str:
+def plot_distance_heatmap(meta: pd.DataFrame, config: Config) -> str:
     return (
         alt.Chart(
             meta.loc[
@@ -129,7 +133,10 @@ def plot_distance_heatmap(meta: pd.DataFrame) -> str:
                 scale=alt.Scale(reverse=True),
                 title="Year and month",
             ),
-            alt.Color("sum(distance_km)", scale=alt.Scale(scheme="viridis")),
+            alt.Color(
+                "sum(distance_km)",
+                scale=alt.Scale(scheme=config.color_scheme_for_counts),
+            ),
             [
                 alt.Tooltip("yearmonthdate(start)", title="Date"),
                 alt.Tooltip(
@@ -142,7 +149,7 @@ def plot_distance_heatmap(meta: pd.DataFrame) -> str:
     )
 
 
-def plot_monthly_distance(meta: pd.DataFrame) -> str:
+def plot_monthly_distance(meta: pd.DataFrame, kind_scale: alt.Scale) -> str:
     return (
         alt.Chart(
             meta.loc[
@@ -159,7 +166,7 @@ def plot_monthly_distance(meta: pd.DataFrame) -> str:
         .encode(
             alt.X("month(start)", title="Month"),
             alt.Y("sum(distance_km)", title="Distance / km"),
-            alt.Color("kind", scale=alt.Scale(scheme="category10"), title="Kind"),
+            alt.Color("kind", scale=kind_scale, title="Kind"),
             alt.Column("year(start):O", title="Year"),
         )
         .resolve_axis(x="independent")
@@ -167,14 +174,14 @@ def plot_monthly_distance(meta: pd.DataFrame) -> str:
     )
 
 
-def plot_yearly_distance(year_kind_total: pd.DataFrame) -> str:
+def plot_yearly_distance(year_kind_total: pd.DataFrame, kind_scale: alt.Scale) -> str:
     return (
         alt.Chart(year_kind_total, title="Total Distance per Year")
         .mark_bar()
         .encode(
             alt.X("year:O", title="Year"),
             alt.Y("distance_km", title="Distance / km"),
-            alt.Color("kind", title="Kind"),
+            alt.Color("kind", scale=kind_scale, title="Kind"),
             [
                 alt.Tooltip("year:O", title="Year"),
                 alt.Tooltip("kind", title="Kind"),
@@ -231,7 +238,7 @@ def tabulate_year_kind_mean(df: pd.DataFrame) -> pd.DataFrame:
     return year_kind_mean_distance
 
 
-def plot_weekly_distance(df: pd.DataFrame) -> str:
+def plot_weekly_distance(df: pd.DataFrame, kind_scale: alt.Scale) -> str:
     week_kind_total_distance = (
         df[["year", "week", "kind", "distance_km"]]
         .groupby(["year", "week", "kind"])
@@ -261,7 +268,7 @@ def plot_weekly_distance(df: pd.DataFrame) -> str:
         .encode(
             alt.X("year_week", title="Year and Week"),
             alt.Y("distance_km", title="Distance / km"),
-            alt.Color("kind", title="Kind"),
+            alt.Color("kind", scale=kind_scale, title="Kind"),
             [
                 alt.Tooltip("year_week", title="Year and Week"),
                 alt.Tooltip("kind", title="Kind"),

geo_activity_playground/webui/templates/home.html.j2

@@ -12,7 +12,7 @@
     </div>
     <div class="col-md-3">
         <h2>Search activities</h2>
-        <form method="post" action="/search">
+        <form method="post" action="{{ url_for('search.index') }}">
             <input type="search" name="name" />
             <input type="submit" class="button" />
         </form>

geo_activity_playground/webui/templates/page.html.j2

@@ -62,42 +62,70 @@
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
 
                         {% if num_activities > 0 %}
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('summary.index') }}">Summary</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('calendar.index') }}">Calendar</a>
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
+                                aria-expanded="false">
+                                Activities
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for('calendar.index') }}">Calendar</a></li>
+                                {# <li><a class="dropdown-item" href="{{ url_for('search.index') }}">Search</a></li> #}
+                            </ul>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page"
-                                href="{{ url_for('explorer.map', zoom=14) }}">Explorer</a>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
+                                aria-expanded="false">
+                                Statistics
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for('summary.index') }}">Summary
+                                        Statistics</a>
+                                </li>
+                                <li><a class="dropdown-item" href="{{ url_for('eddington.index') }}">Eddington
+                                        Number</a>
+                                </li>
+                                <li><a class="dropdown-item" href="{{ url_for('equipment.index') }}">Equipment</a></li>
+                            </ul>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page"
-                                href="{{ url_for('explorer.map', zoom=17) }}">Squadratinhos</a>
+
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
+                                aria-expanded="false">
+                                Explorer
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for('explorer.map', zoom=14) }}">Explorer
+                                        Tiles (Zoom 14)</a></li>
+                                <li><a class="dropdown-item" href="{{ url_for('explorer.map', zoom=17) }}">Squadratinhos
+                                        (Zoom 17)</a></li>
+                            </ul>
                         </li>
+
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('heatmap.index') }}">Heatmap</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page"
-                                href="{{ url_for('eddington.index') }}">Eddington</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page"
-                                href="{{ url_for('equipment.index') }}">Equipment</a>
-                        </li>
                         {% endif %}
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('upload.index') }}">Upload</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('upload.reload') }}">Refresh</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('settings.index') }}">Settings</a>
-                        </li>
 
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
+                                aria-expanded="false">
+                                Admin
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a class="dropdown-item" href="{{ url_for('upload.index') }}">Upload Activities</a>
+                                </li>
+                                <li><a class="dropdown-item" href="{{ url_for('upload.reload') }}">Scan New
+                                        Activities</a>
+                                </li>
+
+                                <li>
+                                    <hr class="dropdown-divider">
+                                </li>
+
+                                <li><a class="dropdown-item" href="{{ url_for('settings.index') }}">Settings</a></li>
+                            </ul>
+                        </li>
 
                         <li class="nav-item dropdown">
                             <button

{geo_activity_playground-0.28.0.dist-info → geo_activity_playground-0.29.1.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.28.0
+Version: 0.29.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.9,<3.13
+Requires-Python: >=3.10,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -30,7 +29,7 @@ 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 (>=1.3.3,<2.0.0)
+Requires-Dist: stravalib (>=2.0,<3.0)
 Requires-Dist: tcxreader (>=0.4.5,<0.5.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tqdm (>=4.64.0,<5.0.0)

{geo_activity_playground-0.28.0.dist-info → geo_activity_playground-0.29.1.dist-info}/RECORD

@@ -1,28 +1,28 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/__main__.py,sha256=MBZn9K1m3PofiPNTtpsSTVCyB_Gz95TjVP-nb9v_-JE,3989
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/core/activities.py,sha256=yDjf3aVOC3LvnAwAvQUl_e7S3NXq_vKgccq0hGuFdLI,6609
-geo_activity_playground/core/config.py,sha256=uys4O2OfXC6yNAsgbgm72WGIhy903zomr_SOwk4GNmA,4498
+geo_activity_playground/core/activities.py,sha256=HcxgLsM2tE48eqZh1t1QBk9O7vxCV9MaL2QRp0loXu0,6509
+geo_activity_playground/core/config.py,sha256=DsjZhiq2BZs94rjd7zgt_KTZIjVfxfntiEQZhgq8NeA,4617
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
 geo_activity_playground/core/enrichment.py,sha256=CwZhW-svgPAYbdx3n9kvKlTgcsiCaeuJfSRCC4JxX6g,7411
 geo_activity_playground/core/heart_rate.py,sha256=IwMt58TpjOYqpAxtsj07zP2ttpN_J3GZeiv-qGhYyJc,1598
 geo_activity_playground/core/heatmap.py,sha256=bRLQHzmTEsQbX8XWeg85x_lRGk272UoYRiCnoxZ5da0,4189
-geo_activity_playground/core/paths.py,sha256=AiYUJv46my_FGYbHZmSs5ZrqeE65GNdWEMmXZgunZrk,2150
+geo_activity_playground/core/paths.py,sha256=BZYuIg1LVHjuWLKB0Iz6Cevlq-XSalpCes_ClFuXa0s,2410
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/similarity.py,sha256=Jo8jRViuORCxdIGvyaflgsQhwu9S_jn10a450FRL18A,3159
-geo_activity_playground/core/tasks.py,sha256=f3C2gCJiiqMS1eRQ-Hp5hxRbkwl60rotrYfzKsWdpSU,2937
+geo_activity_playground/core/tasks.py,sha256=aMDBWJqp6ek2ao6G6Xa8GOSZbcQqXoWL74SGRowRPIk,2942
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
 geo_activity_playground/core/test_time_conversion.py,sha256=Sh6nZA3uCTOdZTZa3yOijtR0m74QtZu2mcWXsDNnyQI,984
 geo_activity_playground/core/tiles.py,sha256=KpzD-h3kNzZ2ieLt6f2xHilSF3lHyfaEXPnrGvlIAz0,3379
-geo_activity_playground/core/time_conversion.py,sha256=9J6aTlqJhWvsknQkoECNL-CIG-8BKs6ZatJJ9XJnTsg,367
+geo_activity_playground/core/time_conversion.py,sha256=x5mXG6Y4GtdX7CBmwucGNSWBp9JQJDbZ7u0JkdUY1Vs,379
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=k6j6KBEk2a2BY-onE8SV5TJsERGGyOrlY4as__meWpA,3304
-geo_activity_playground/explorer/tile_visits.py,sha256=IqkaGPq-xrmR81Ze31VL1v4NUxQ2YGQeQawvsjYe25s,12776
+geo_activity_playground/explorer/tile_visits.py,sha256=CSHAjgzKWe1iB-zvaqgsR5Z_lFycpWqUfxnPCAWvYaU,14173
 geo_activity_playground/explorer/video.py,sha256=ROAmV9shfJyqTgnXVD41KFORiwnRgVpEWenIq4hMCRM,4389
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/importers/activity_parsers.py,sha256=m2SpvGlTZ8F3gG6YB24_ZFrlOAbtqbfWi-GIYspeUco,10593
-geo_activity_playground/importers/csv_parser.py,sha256=7x0U4MyKNCsVFnXU6US8FQ28X9PTIoQS8U_hzF5l4So,2147
-geo_activity_playground/importers/directory.py,sha256=lJVSAZpq8NAIjVQuCiVxPSNt9m_rIY0yJlOOMB-ZTG0,5746
+geo_activity_playground/importers/activity_parsers.py,sha256=XNQs0ziqAcVqIoiLAX5Ndmhb6v__29XdjUPvNvc7oBI,11082
+geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
+geo_activity_playground/importers/directory.py,sha256=IPnr1xk3beznmPVjfWL6AQiEKA4WN5EDIfnzrM0Tzlc,5767
 geo_activity_playground/importers/strava_api.py,sha256=pgWZp-cWOLkvlDE85lTiEKM8BCZYzOlAAdKoa2F7c6o,7780
 geo_activity_playground/importers/strava_checkout.py,sha256=N-uGTkhBJMC7cPYjRRXHOSLwpK3wc6aaSrY2RQfSitA,9419
 geo_activity_playground/importers/test_csv_parser.py,sha256=LXqva7GuSAfXYE2zZQrg-69lCtfy5MxLSq6BRwL_VyI,1191
@@ -31,15 +31,15 @@ geo_activity_playground/importers/test_strava_api.py,sha256=4vX7wDr1a9aRh8myxNrI
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/blueprint.py,sha256=upQzZa5sKApj_Fmu6PziFDboi7SBL5Zsi-tNSSNPlEE,1759
-geo_activity_playground/webui/activity/controller.py,sha256=YaWHXIfSYSeybEFY706s_m4uHbfJ9FHxqIYtqwR5sGQ,17955
+geo_activity_playground/webui/activity/controller.py,sha256=PJIZ7pFqpUyWDrintnnlW6Hxj7DbdPswARozws6TE30,18861
 geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3qKl9uTzOko4R-ZzyYAZt1j61JSevYP4g0Yi06HHPg,2702
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=5gB1aDjRgi_RventenRfC10_FtMT4ch_VuWvA9AMlBY,1121
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=RDLEt6ip8_ngmdLgaC5jg92Dk-F2umGwKkd8cWmvVko,2400
-geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=6k3_MC_AR_sSWVYvH53E5o6YFtE9HZD62NlPf90Rj8Q,5509
-geo_activity_playground/webui/app.py,sha256=Vn8G6wf2YSKc_n7JBkulry51Gl57_UjrAW0TftXLQgM,4456
+geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=W77M1S7RQOGY3Vg9LRT5mFnefuMWUKKU1Vd-ZKxUoKg,6552
+geo_activity_playground/webui/app.py,sha256=foON49jw8klBJ3GF70DDjgz-_KRDPFvC31_mScaqDXk,4255
 geo_activity_playground/webui/auth/blueprint.py,sha256=Lx-ZvMnfHLC1CMre1xPQI3k_pCtQoZvgRhtmafULzoE,812
 geo_activity_playground/webui/auth/templates/auth/index.html.j2,sha256=ILQ5HvTEYc3OrtOAIFt1VrqWorVD70V9DC342znmP70,579
-geo_activity_playground/webui/authenticator.py,sha256=jXwWJFuinSE-7sQxdi7s7WO9ifvERmeXAM5-hsAPmwQ,1546
+geo_activity_playground/webui/authenticator.py,sha256=k278OEVuOfAmTGT4F2X4pqSTwwkK_FA87EIhAeysEqc,1416
 geo_activity_playground/webui/calendar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/calendar/blueprint.py,sha256=rlnhgU2DWAcdLMRq7m77NzrM_aDyp4s3kuuQHuzjHhg,782
 geo_activity_playground/webui/calendar/controller.py,sha256=QpSAkR2s1sbLSu6P_fNNTccgGglOzEH2PIv1XwKxeVY,2778
@@ -49,26 +49,29 @@ geo_activity_playground/webui/eddington/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 geo_activity_playground/webui/eddington/blueprint.py,sha256=evIvueLfDWVTxJ9pRguqmZ9-Pybd2WmBRst_-7vX2QA,551
 geo_activity_playground/webui/eddington/controller.py,sha256=ly7JSkSS79kO4CL_xugB62uRuuWKVqOjbN-pheelv94,2910
 geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256=XHKeUymQMS5x00PLOVlg-nSRCz_jHB2pvD8QunULWJ4,1839
-geo_activity_playground/webui/entry_controller.py,sha256=n9v4MriyL8kDR91LE9eeqc2tAvxyzFgoNMMXpr0qh4g,1906
+geo_activity_playground/webui/entry_controller.py,sha256=kTEToBtR1T4l30cV3HkCK3KO2hVYfb22BSgcWLdLEXQ,2164
 geo_activity_playground/webui/equipment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/equipment/blueprint.py,sha256=_NIhRJuJNbXpEd_nEPo01AqnUqPgo1vawFn7E3yoeng,636
 geo_activity_playground/webui/equipment/controller.py,sha256=Sx9i2RCK7m4W6FgpDfRMewcH64VBQfUhHJdTSCwMqOU,4079
 geo_activity_playground/webui/equipment/templates/equipment/index.html.j2,sha256=FEfxB4XwVYELAOdjVlSlprjJH_kLmE-pNWEEXdPqc6I,1778
 geo_activity_playground/webui/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/explorer/blueprint.py,sha256=EKnBs8llqT6Wy1uac18dF2epp3TebF9p3iGlSbj6Vl0,2337
-geo_activity_playground/webui/explorer/controller.py,sha256=-iMsuB05JgUYKahJxiOPZeNVmzr_Uw2psHwmaFiptkI,11614
-geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=cm9pWY0vB84DtkTH-LBvSzfLU1FnmxQ2ECyw3Bl7dTo,6945
+geo_activity_playground/webui/explorer/controller.py,sha256=pIzWh0TpLJgKQZlS325-QT7nA1q9ms7fRqQIp24PNfo,11705
+geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=u2htecx-XwINRiINHFN6EZDaRXVtiape1OCUZexTBU8,7049
 geo_activity_playground/webui/heatmap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/heatmap/blueprint.py,sha256=bjQu-HL3QN5UpJ6tHOifhcLGlPr_hIKvaRu78md4JqM,1470
-geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=Bn7FO_ciMEXghSwz2tEQ8fJsbK8AXaHTPNgnGuQ7an8,7353
+geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=Q17Ay8hbU5ZlUiz2a9S-ULWrnNGWQHvTTV3kDY5FhNc,7411
 geo_activity_playground/webui/heatmap/templates/heatmap/index.html.j2,sha256=YLeu6P4djl8G4qAXR6DhetseqrbOodN7aN4coocknc4,1875
-geo_activity_playground/webui/search_controller.py,sha256=PzMf7b8tiJKZIZoPvQ9A2hOrzoKV9cS3jq05w2fK94c,532
-geo_activity_playground/webui/settings/blueprint.py,sha256=boKeKkG4bbSA7HvgpaqlUXzrcCnOPwys6KWw-Dp5sAE,5416
-geo_activity_playground/webui/settings/controller.py,sha256=v14oKvI1QzWn0g41Sm4NA_g9q4SUVZ_bO9SUOZuPAaY,9121
+geo_activity_playground/webui/plot_util.py,sha256=pTTQoqOCkLVjkgOit7mbry28kMruZIL8amZozSzEpxQ,283
+geo_activity_playground/webui/search/blueprint.py,sha256=b3TCIplY60MWE2_VsKHuoV1LAgNwd_T5ft5t0CKALFI,642
+geo_activity_playground/webui/search/templates/search/index.html.j2,sha256=FvNRoDfUlSzXjM_tqZY_fDhuhUDgbPaY73q56gdvF1A,1130
+geo_activity_playground/webui/settings/blueprint.py,sha256=O5GqbbzETOYq5JESoI-F2br8hnk6xHyJzqWTQDnbNEE,7623
+geo_activity_playground/webui/settings/controller.py,sha256=MIZVBfoGNvmJnB_ECV_x5eH2i6gDZvkWSQ4PcSKyLKs,9170
 geo_activity_playground/webui/settings/templates/settings/admin-password.html.j2,sha256=VYwddpObD1RpeTH5Dm4y7VtmT7kwURDCIjxyzJeq08c,495
+geo_activity_playground/webui/settings/templates/settings/color-schemes.html.j2,sha256=CaFbYkkU1yGTOlAzGq97u3tVgS79RIo7PEmiVjuZiBc,1226
 geo_activity_playground/webui/settings/templates/settings/equipment-offsets.html.j2,sha256=ltaYwFe8S8Mi72ddmIp1vwqlu8MEXXjBGfbpN2WBTC4,1728
 geo_activity_playground/webui/settings/templates/settings/heart-rate.html.j2,sha256=UPT3MegRgSeff36lhCo0l3ZwhqNSIg5gM6h2s32GkCY,4255
-geo_activity_playground/webui/settings/templates/settings/index.html.j2,sha256=rXKq2v42J0eW5OSWx7VU6EFT9jZkbzKTW600Y0OqBtY,4035
+geo_activity_playground/webui/settings/templates/settings/index.html.j2,sha256=-ZSlR6htaeMMOf4ISUSzWPu5BUhYODuAmcWPN0ZoBno,4443
 geo_activity_playground/webui/settings/templates/settings/kinds-without-achievements.html.j2,sha256=IdUfXon1Pu8zX3NirKb28ypshLHOvZRpz2T4bJrzrak,1067
 geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2,sha256=Ppa8O-zRJznbeCsF4YQj37_HM9nOW8fyTi66jvWvHmA,2285
 geo_activity_playground/webui/settings/templates/settings/privacy-zones.html.j2,sha256=7BxFvCaVJOEqbImyK5vxCmhh-NGSFaRa9ARhqjZeYJ0,3093
@@ -76,7 +79,7 @@ geo_activity_playground/webui/settings/templates/settings/sharepic.html.j2,sha25
 geo_activity_playground/webui/settings/templates/settings/strava.html.j2,sha256=FrXgT-m1PgvsQWo9kMKpk8QenKeifSDBCZFqKgsHRxQ,1827
 geo_activity_playground/webui/square_planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/square_planner/blueprint.py,sha256=r2VkSM547chX85g6c1BQ8NC-tkdqGdYp-2ZALBiiDTc,1320
-geo_activity_playground/webui/square_planner/controller.py,sha256=vV7Wd4Kt1YPOI-UVoqLtIqUb3nke9PJQwWynlA31Lto,3483
+geo_activity_playground/webui/square_planner/controller.py,sha256=ML6ftOyr3tTh7D4DBcRP76CvkyTxqI5QWgMeG9wC8FE,3561
 geo_activity_playground/webui/square_planner/templates/square_planner/index.html.j2,sha256=aIB0ql5qW4HXfp0ENksYYOk9vTgBitwyHJX5W7bqkeY,6512
 geo_activity_playground/webui/static/android-chrome-192x192.png,sha256=yxZgo8Jw4hrgOgrn3tvi9G0AXWGFD29kjCuxC07WoT4,17610
 geo_activity_playground/webui/static/android-chrome-384x384.png,sha256=bgeqAdyvDZBMch7rVi3qSawf0Zr4Go0EG8Ws_B8NApY,49297
@@ -91,12 +94,11 @@ geo_activity_playground/webui/static/mstile-150x150.png,sha256=j1ANUQJ1Xi1DR2sGq
 geo_activity_playground/webui/static/safari-pinned-tab.svg,sha256=OzoEVGY0igWRXM1NiM3SRKugdICBN7aB_XuxaC3Mu9Q,8371
 geo_activity_playground/webui/static/site.webmanifest,sha256=4vYxdPMpwTdB8EmOvHkkYcjZ8Yrci3pOwwY3o_VwACA,440
 geo_activity_playground/webui/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/summary/blueprint.py,sha256=kzQ6MDOycQKfDcVoEUmL7HYHJA_gu8DlzVHwO37-_jA,514
-geo_activity_playground/webui/summary/controller.py,sha256=ZOrwfrKjpc8hecUYImBvesKXZi06obfR1yhQkVTeWzw,8981
+geo_activity_playground/webui/summary/blueprint.py,sha256=tfA2aPF19yKwkQOb5lPQBySoQYYhTn49Iuh0SYvsGP8,593
+geo_activity_playground/webui/summary/controller.py,sha256=cWn5szA1o5Vjht0DyhRwBjmwqJryrLcmm4FUdmVpUoo,9443
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=rsII1eMY-xNugh8A9SecnEcDZqkEOWYIfiHAGroQYuM,4442
-geo_activity_playground/webui/templates/home.html.j2,sha256=FjEwr9kt_3qu_evIHpa7F_oGAINN8W2Z1T_j56ugJ5c,2406
-geo_activity_playground/webui/templates/page.html.j2,sha256=8DkXaXx_cc9FvfI6eo9z3fbeNDRcvJC2NXcHXs8ytSU,9588
-geo_activity_playground/webui/templates/search.html.j2,sha256=FvNRoDfUlSzXjM_tqZY_fDhuhUDgbPaY73q56gdvF1A,1130
+geo_activity_playground/webui/templates/home.html.j2,sha256=eIPNyLHhUNVTITDbn6nR82-ZJA5Dp4SY41cZTjymZDU,2428
+geo_activity_playground/webui/templates/page.html.j2,sha256=HN7s4i4kR3laMFkToktjwmTQiTHdrY3nqKcCVO9nKdA,11088
 geo_activity_playground/webui/tile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/tile/blueprint.py,sha256=cK0o2Z3BrLycgF9zw0F8s9qF-JaYDbF5Gog-GXDtUZ8,943
 geo_activity_playground/webui/tile/controller.py,sha256=PISh4vKs27b-LxFfTARtr5RAwHFresA1Kw1MDcERSRU,1221
@@ -105,8 +107,8 @@ geo_activity_playground/webui/upload/blueprint.py,sha256=xX9scEmleN_dL03jfhWRh5y
 geo_activity_playground/webui/upload/controller.py,sha256=disRtrlvPiqsIFt9UaAokgtRtXCvosg7bXkAnN_qaxk,4102
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/upload/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-0.28.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.28.0.dist-info/METADATA,sha256=0ZheRNfyebSkkcFUph4A3Wo3EheMmw0c0U2fi9C-MWc,1665
-geo_activity_playground-0.28.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.28.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.28.0.dist-info/RECORD,,
+geo_activity_playground-0.29.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.29.1.dist-info/METADATA,sha256=O9NvI6x-QQvVw7XklVLmq2pkz2UFTTg9PnLwAK6KhWY,1612
+geo_activity_playground-0.29.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.29.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.29.1.dist-info/RECORD,,

geo_activity_playground/webui/search_controller.py

@@ -1,19 +0,0 @@
-import logging
-
-from ..core.activities import ActivityRepository
-
-logger = logging.getLogger(__name__)
-
-
-class SearchController:
-    def __init__(self, repository: ActivityRepository) -> None:
-        self._repository = repository
-
-    def render_search_results(self, name: str) -> dict:
-        logger.info(f"Searching for {name=}")
-        activities = []
-        for _, row in self._repository.meta.iterrows():
-            if name in row["name"]:
-                activities.append(row)
-
-        return {"activities": activities}