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

geo_activity_playground/__main__.py

@@ -109,10 +109,9 @@ def make_activity_repository(
 
 
 def main_cache(basedir: pathlib.Path) -> None:
-    repository, tile_visit_accessor, config_accessor = make_activity_repository(
+    (repository, tile_visit_accessor, config_accessor) = make_activity_repository(
         basedir, False
     )
-    scan_for_activities(repository, tile_visit_accessor, config_accessor())
 
 
 if __name__ == "__main__":

geo_activity_playground/core/activities.py

@@ -128,11 +128,11 @@ class ActivityRepository:
         else:
             return None
 
-    def get_activity_ids(self, only_achievements: bool = False) -> set[int]:
+    def get_activity_ids(self, only_achievements: bool = False) -> list[int]:
         if only_achievements:
-            return set(self.meta.loc[self.meta["consider_for_achievements"]].index)
+            return list(self.meta.loc[self.meta["consider_for_achievements"]].index)
         else:
-            return set(self.meta.index)
+            return list(self.meta.index)
 
     def iter_activities(self, new_to_old=True, dropna=False) -> Iterator[ActivityMeta]:
         direction = -1 if new_to_old else 1

geo_activity_playground/core/config.py

@@ -33,6 +33,7 @@ class Config:
     privacy_zones: dict[str, list[list[float]]] = dataclasses.field(
         default_factory=dict
     )
+    sharepic_suppressed_fields: list[str] = dataclasses.field(default_factory=list)
     strava_client_id: int = 131693
     strava_client_secret: str = "0ccc0100a2c218512a7ef0cea3b0e322fb4b4365"
     strava_client_code: Optional[str] = None

geo_activity_playground/core/tasks.py

@@ -59,8 +59,8 @@ class WorkTracker:
         else:
             self._done = set()
 
-    def filter(self, ids: Iterable) -> set:
-        return set(ids) - self._done
+    def filter(self, ids: Iterable) -> list:
+        return [elem for elem in ids if elem not in self._done]
 
     def mark_done(self, id: int) -> None:
         self._done.add(id)

geo_activity_playground/explorer/tile_visits.py

@@ -25,139 +25,159 @@ from geo_activity_playground.core.tiles import interpolate_missing_tile
 logger = logging.getLogger(__name__)
 
 
+class TileInfo(TypedDict):
+    activity_ids: set[int]
+    first_time: datetime.datetime
+    first_id: int
+    last_time: datetime.datetime
+    last_id: int
+
+
 class TileHistoryRow(TypedDict):
+    activity_id: int
     time: datetime.datetime
     tile_x: int
     tile_y: int
 
 
+class TileEvolutionState:
+    def __init__(self) -> None:
+        self.num_neighbors: dict[tuple[int, int], int] = {}
+        self.memberships: dict[tuple[int, int], tuple[int, int]] = {}
+        self.clusters: dict[tuple[int, int], list[tuple[int, int]]] = {}
+        self.cluster_evolution = pd.DataFrame()
+        self.square_start = 0
+        self.cluster_start = 0
+        self.max_square_size = 0
+        self.visited_tiles: set[tuple[int, int]] = set()
+        self.square_evolution = pd.DataFrame()
+        self.square_x: Optional[int] = None
+        self.square_y: Optional[int] = None
+
+
+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]]
+    processed_activities: set[int]
+    evolution_state: dict[int, TileEvolutionState]
+    version: int
+
+
+TILE_STATE_VERSION = 2
+
+
 class TileVisitAccessor:
-    TILE_EVOLUTION_STATES_PATH = pathlib.Path("Cache/tile-evolution-state.pickle")
-    TILE_HISTORIES_PATH = pathlib.Path(f"Cache/tile-history.pickle")
-    TILE_VISITS_PATH = pathlib.Path(f"Cache/tile-visits.pickle")
-    ACTIVITIES_PER_TILE_PATH = pathlib.Path(f"Cache/activities-per-tile.pickle")
+    PATH = pathlib.Path("Cache/tile-state-2.pickle")
 
     def __init__(self) -> None:
-        self.visits: dict[int, dict[tuple[int, int], dict[str, Any]]] = try_load_pickle(
-            self.TILE_VISITS_PATH
-        ) or collections.defaultdict(dict)
-        "zoom → (tile_x, tile_y) → tile_info"
-
-        self.histories: dict[int, pd.DataFrame] = try_load_pickle(
-            self.TILE_HISTORIES_PATH
-        ) or collections.defaultdict(pd.DataFrame)
-
-        self.states = try_load_pickle(
-            self.TILE_EVOLUTION_STATES_PATH
-        ) or collections.defaultdict(TileEvolutionState)
-
-        self.activities_per_tile: dict[
-            int, dict[tuple[int, int], set[int]]
-        ] = try_load_pickle(self.ACTIVITIES_PER_TILE_PATH) or collections.defaultdict(
-            dict
-        )
+        self.tile_state: TileState = try_load_pickle(self.PATH)
+        if (
+            self.tile_state is None
+            or self.tile_state.get("version", None) != TILE_STATE_VERSION
+        ):
+            self.tile_state = make_tile_state()
+            # TODO: Reset work tracker
 
     def save(self) -> None:
-        with open(self.TILE_VISITS_PATH, "wb") as f:
-            pickle.dump(self.visits, f)
+        tmp_path = self.PATH.with_suffix(".tmp")
+        with open(tmp_path, "wb") as f:
+            pickle.dump(self.tile_state, f)
+        tmp_path.rename(self.PATH)
 
-        with open(self.TILE_HISTORIES_PATH, "wb") as f:
-            pickle.dump(self.histories, f)
 
-        with open(self.TILE_EVOLUTION_STATES_PATH, "wb") as f:
-            pickle.dump(self.states, f)
+def make_defaultdict_dict():
+    return collections.defaultdict(dict)
 
-        with open(self.ACTIVITIES_PER_TILE_PATH, "wb") as f:
-            pickle.dump(self.activities_per_tile, f)
 
+def make_defaultdict_set():
+    return collections.defaultdict(set)
+
+
+def make_tile_state() -> TileState:
+    tile_state: TileState = {
+        "tile_visits": collections.defaultdict(make_defaultdict_dict),
+        "tile_history": collections.defaultdict(pd.DataFrame),
+        "activities_per_tile": collections.defaultdict(make_defaultdict_set),
+        "processed_activities": set(),
+        "evolution_state": collections.defaultdict(TileEvolutionState),
+        "version": TILE_STATE_VERSION,
+    }
+    return tile_state
 
-def compute_tile_visits(
-    repository: ActivityRepository, tile_visits_accessor: TileVisitAccessor
-) -> None:
-    present_activity_ids = repository.get_activity_ids()
-    work_tracker = WorkTracker(work_tracker_path("tile-visits"))
-
-    changed_zoom_tile = collections.defaultdict(set)
-
-    # Delete visits from removed activities.
-    for zoom, activities_per_tile in tile_visits_accessor.activities_per_tile.items():
-        for tile, activity_ids in activities_per_tile.items():
-            deleted_ids = activity_ids - present_activity_ids
-            if deleted_ids:
-                logger.debug(
-                    f"Removing activities {deleted_ids} from tile {tile} at {zoom=}."
-                )
-                for activity_id in deleted_ids:
-                    activity_ids.remove(activity_id)
-                    work_tracker.discard(activity_id)
-                    changed_zoom_tile[zoom].add(tile)
 
-    # Add visits from new activities.
-    activity_ids_to_process = work_tracker.filter(repository.get_activity_ids())
+def compute_tile_visits_new(
+    repository: ActivityRepository, tile_visit_accessor: TileVisitAccessor
+) -> None:
+    work_tracker = WorkTracker(work_tracker_path("tile-state"))
     for activity_id in tqdm(
-        activity_ids_to_process, desc="Extract explorer tile visits"
+        work_tracker.filter(repository.get_activity_ids()), desc="Tile visits (new)"
     ):
-        for zoom in range(20):
-            for time, tile_x, tile_y in _tiles_from_points(
-                repository.get_time_series(activity_id), zoom
-            ):
-                tile = (tile_x, tile_y)
-                if tile not in tile_visits_accessor.activities_per_tile[zoom]:
-                    tile_visits_accessor.activities_per_tile[zoom][tile] = set()
-                tile_visits_accessor.activities_per_tile[zoom][tile].add(activity_id)
-                changed_zoom_tile[zoom].add(tile)
+        do_tile_stuff(repository, tile_visit_accessor.tile_state, activity_id)
         work_tracker.mark_done(activity_id)
-
-    # Update tile visits structure.
-    for zoom, changed_tiles in tqdm(
-        changed_zoom_tile.items(), desc="Incorporate changes in tiles"
-    ):
-        soa = {"activity_id": [], "time": [], "tile_x": [], "tile_y": []}
-
-        for tile in changed_tiles:
-            activity_ids = tile_visits_accessor.activities_per_tile[zoom][tile]
-            activities = [
-                repository.get_activity_by_id(activity_id)
-                for activity_id in activity_ids
-            ]
-            activities_to_consider = [
-                activity
-                for activity in activities
-                if activity["consider_for_achievements"]
-            ]
-            activities_to_consider.sort(key=lambda activity: activity["start"])
-
-            if activities_to_consider:
-                tile_visits_accessor.visits[zoom][tile] = {
-                    "first_time": activities_to_consider[0]["start"],
-                    "first_id": activities_to_consider[0]["id"],
-                    "last_time": activities_to_consider[-1]["start"],
-                    "last_id": activities_to_consider[-1]["id"],
-                    "activity_ids": {
-                        activity["id"] for activity in activities_to_consider
-                    },
-                }
-
-                soa["activity_id"].append(activities_to_consider[0]["id"])
-                soa["time"].append(activities_to_consider[0]["start"])
-                soa["tile_x"].append(tile[0])
-                soa["tile_y"].append(tile[1])
-            else:
-                if tile in tile_visits_accessor.visits[zoom]:
-                    del tile_visits_accessor.visits[zoom][tile]
-
-        df = pd.DataFrame(soa)
-        if len(df) > 0:
-            df = pd.concat([tile_visits_accessor.histories[zoom], df])
-            df.sort_values("time", inplace=True)
-            tile_visits_accessor.histories[zoom] = df.groupby(
-                ["tile_x", "tile_y"]
-            ).head(1)
-
-    tile_visits_accessor.save()
+    tile_visit_accessor.save()
     work_tracker.close()
 
 
+def do_tile_stuff(
+    repository: ActivityRepository, tile_state: TileState, activity_id: int
+) -> None:
+    activity = repository.get_activity_by_id(activity_id)
+    time_series = repository.get_time_series(activity_id)
+
+    activity_tiles = pd.DataFrame(
+        _tiles_from_points(time_series, 19), columns=["time", "tile_x", "tile_y"]
+    )
+    for zoom in reversed(range(20)):
+        activities_per_tile = tile_state["activities_per_tile"][zoom]
+
+        new_tile_history_soa = {
+            "activity_id": [],
+            "time": [],
+            "tile_x": [],
+            "tile_y": [],
+        }
+
+        activity_tiles = activity_tiles.groupby(["tile_x", "tile_y"]).head(1)
+
+        for time, tile in zip(
+            activity_tiles["time"],
+            zip(activity_tiles["tile_x"], activity_tiles["tile_y"]),
+        ):
+            if activity["consider_for_achievements"]:
+                if tile not in activities_per_tile:
+                    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])
+                    new_tile_history_soa["tile_y"].append(tile[1])
+
+                tile_visit = tile_state["tile_visits"][zoom][tile]
+                if not tile_visit:
+                    tile_visit["activity_ids"] = {activity_id}
+                else:
+                    tile_visit["activity_ids"].add(activity_id)
+
+                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
+
+            activities_per_tile[tile].add(activity_id)
+
+        if new_tile_history_soa["activity_id"]:
+            tile_state["tile_history"][zoom] = pd.concat(
+                [tile_state["tile_history"][zoom], pd.DataFrame(new_tile_history_soa)]
+            )
+
+        # Move up one layer in the quad-tree.
+        activity_tiles["tile_x"] //= 2
+        activity_tiles["tile_y"] //= 2
+
+
 def _tiles_from_points(
     time_series: pd.DataFrame, zoom: int
 ) -> Iterator[tuple[datetime.datetime, int, int]]:
@@ -181,38 +201,19 @@ def _tiles_from_points(
                 yield (t1,) + interpolated
 
 
-class TileEvolutionState:
-    def __init__(self) -> None:
-        self.num_neighbors: dict[tuple[int, int], int] = {}
-        self.memberships: dict[tuple[int, int], tuple[int, int]] = {}
-        self.clusters: dict[tuple[int, int], list[tuple[int, int]]] = {}
-        self.cluster_evolution = pd.DataFrame()
-        self.square_start = 0
-        self.cluster_start = 0
-        self.max_square_size = 0
-        self.visited_tiles: set[tuple[int, int]] = set()
-        self.square_evolution = pd.DataFrame()
-        self.square_x: Optional[int] = None
-        self.square_y: Optional[int] = None
-
-
-def compute_tile_evolution(
-    tile_visits_accessor: TileVisitAccessor, config: Config
-) -> None:
+def compute_tile_evolution(tile_state: TileState, config: Config) -> None:
     for zoom in config.explorer_zoom_levels:
         _compute_cluster_evolution(
-            tile_visits_accessor.histories[zoom],
-            tile_visits_accessor.states[zoom],
+            tile_state["tile_history"][zoom],
+            tile_state["evolution_state"][zoom],
             zoom,
         )
         _compute_square_history(
-            tile_visits_accessor.histories[zoom],
-            tile_visits_accessor.states[zoom],
+            tile_state["tile_history"][zoom],
+            tile_state["evolution_state"][zoom],
             zoom,
         )
 
-    tile_visits_accessor.save()
-
 
 def _compute_cluster_evolution(
     tiles: pd.DataFrame, s: TileEvolutionState, zoom: int

geo_activity_playground/webui/activity/controller.py

@@ -61,7 +61,9 @@ class ActivityController:
 
         new_tiles = {
             zoom: sum(
-                self._tile_visit_accessor.histories[zoom]["activity_id"]
+                self._tile_visit_accessor.tile_state["tile_history"][zoom][
+                    "activity_id"
+                ]
                 == activity["id"]
             )
             for zoom in [14, 17]
@@ -100,7 +102,9 @@ class ActivityController:
             time_series = privacy_zone.filter_time_series(time_series)
         if len(time_series) == 0:
             time_series = self._repository.get_time_series(id)
-        return make_sharepic(activity, time_series)
+        return make_sharepic(
+            activity, time_series, self._config.sharepic_suppressed_fields
+        )
 
     def render_day(self, year: int, month: int, day: int) -> dict:
         meta = self._repository.meta
@@ -411,7 +415,11 @@ def pixels_in_bounds(bounds: PixelBounds) -> int:
     return (bounds.x_max - bounds.x_min) * (bounds.y_max - bounds.y_min)
 
 
-def make_sharepic(activity: ActivityMeta, time_series: pd.DataFrame) -> bytes:
+def make_sharepic(
+    activity: ActivityMeta,
+    time_series: pd.DataFrame,
+    sharepic_suppressed_fields: list[str],
+) -> bytes:
     lat_lon_data = np.array([time_series["latitude"], time_series["longitude"]]).T
 
     geo_bounds = get_bounds(lat_lon_data)
@@ -448,19 +456,27 @@ def make_sharepic(activity: ActivityMeta, time_series: pd.DataFrame) -> bytes:
         draw.line(yx, fill="red", width=4)
 
     draw.rectangle([0, img.height - 70, img.width, img.height], fill=(0, 0, 0, 128))
-    facts = [
-        f"{activity['kind']}",
-        f"{activity['start'].date()}",
-        f"{activity['equipment']}",
-        f"\n{activity['distance_km']:.1f} km",
-        re.sub(r"^0 days ", "", f"{activity['elapsed_time']}"),
-    ]
+
+    facts = {
+        "kind": f"{activity['kind']}",
+        "start": f"{activity['start'].date()}",
+        "equipment": f"{activity['equipment']}",
+        "distance_km": f"\n{activity['distance_km']:.1f} km",
+        "elapsed_time": re.sub(r"^0 days ", "", f"{activity['elapsed_time']}"),
+    }
+
     if activity.get("calories", 0) and not pd.isna(activity["calories"]):
-        facts.append(f"{activity['calories']:.0f} kcal")
+        facts["calories"] = f"{activity['calories']:.0f} kcal"
     if activity.get("steps", 0) and not pd.isna(activity["steps"]):
-        facts.append(f"{activity['steps']:.0f} steps")
+        facts["steps"] = f"{activity['steps']:.0f} steps"
+
+    facts = {
+        key: value
+        for key, value in facts.items()
+        if not key in sharepic_suppressed_fields
+    }
 
-    draw.text((35, img.height - 70 + 10), "      ".join(facts), font_size=20)
+    draw.text((35, img.height - 70 + 10), "      ".join(facts.values()), font_size=20)
 
     # img_array = np.array(img) / 255
 

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

@@ -111,11 +111,7 @@
 </div>
 
 {% if heartrate_time_plot is defined %}
-<div class="row mb-3">
-    <div class="col">
-        <h2>Heart rate</h2>
-    </div>
-</div>
+<h2>Heart rate</h2>
 
 <div class="row mb-3">
     <div class="col-md-4">
@@ -133,13 +129,12 @@
 </div>
 {% endif %}
 
-<div class="row mb-3">
-    <div class="col">
-        <h2>Share picture</h2>
+<h2>Share picture</h2>
 
-        <img src="{{ url_for('.sharepic', id=activity.id) }}" />
-    </div>
-</div>
+<p><img src="{{ url_for('.sharepic', id=activity.id) }}" /></p>
+
+<p>Not happy with the displayed data? <a href="{{ url_for('settings.sharepic') }}">Change share picture
+        settings</a>.</p>
 
 {% if similar_activites|length > 0 %}
 <div class="row mb-3">

geo_activity_playground/webui/app.py

@@ -22,6 +22,8 @@ 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 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
 
 
@@ -71,9 +73,13 @@ def web_ui_main(
     app.config["UPLOAD_FOLDER"] = "Activities"
     app.secret_key = get_secret_key()
 
+    authenticator = Authenticator(config_accessor())
+
     route_search(app, repository)
     route_start(app, repository)
 
+    app.register_blueprint(make_auth_blueprint(authenticator), url_prefix="/auth")
+
     app.register_blueprint(
         make_activity_blueprint(
             repository,
@@ -97,7 +103,7 @@ def web_ui_main(
         make_heatmap_blueprint(repository, tile_visit_accessor), url_prefix="/heatmap"
     )
     app.register_blueprint(
-        make_settings_blueprint(config_accessor),
+        make_settings_blueprint(config_accessor, authenticator),
         url_prefix="/settings",
     )
     app.register_blueprint(
@@ -110,7 +116,9 @@ def web_ui_main(
     )
     app.register_blueprint(make_tile_blueprint(), url_prefix="/tile")
     app.register_blueprint(
-        make_upload_blueprint(repository, tile_visit_accessor, config_accessor()),
+        make_upload_blueprint(
+            repository, tile_visit_accessor, config_accessor(), authenticator
+        ),
         url_prefix="/upload",
     )
 

geo_activity_playground/webui/auth/blueprint.py

@@ -0,0 +1,27 @@
+from flask import Blueprint
+from flask import redirect
+from flask import render_template
+from flask import request
+from flask import url_for
+
+from geo_activity_playground.webui.authenticator import Authenticator
+
+
+def make_auth_blueprint(authenticator: Authenticator) -> Blueprint:
+    blueprint = Blueprint("auth", __name__, template_folder="templates")
+
+    @blueprint.route("/", methods=["GET", "POST"])
+    def index():
+        if request.method == "POST":
+            authenticator.authenticate(request.form["password"])
+        return render_template(
+            "auth/index.html.j2",
+            is_authenticated=authenticator.is_authenticated(),
+        )
+
+    @blueprint.route("/logout")
+    def logout():
+        authenticator.logout()
+        return redirect(url_for(".index"))
+
+    return blueprint

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

@@ -0,0 +1,21 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<h1>Authentication</h1>
+
+{% if is_authenticated %}
+<p>You are either logged in or don't have a password set. You can do everything.</p>
+
+<a class="btn btn-primary" href="{{ url_for('.logout') }}">Log Out</a>
+{% else %}
+<form method="POST">
+    <div class="mb-3">
+        <label for="password" class="form-label">Password</label>
+        <input type="password" class="form-control" id="password" name="password" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Log In</button>
+</form>
+{% endif %}
+
+{% endblock %}

geo_activity_playground/webui/authenticator.py

@@ -0,0 +1,49 @@
+import functools
+from typing import Callable
+
+from flask import flash
+from flask import redirect
+from flask import session
+from flask import url_for
+
+from geo_activity_playground.core.config import Config
+
+
+class Authenticator:
+    def __init__(self, config: Config) -> None:
+        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
+        )
+
+    def authenticate(self, password: str) -> None:
+        if password == self._config.upload_password:
+            session["is_authenticated"] = True
+            session.permanent = True
+            flash("Login successful.", category="success")
+        else:
+            flash("Incorrect password.", category="warning")
+
+    def logout(self) -> None:
+        session["is_authenticated"] = False
+        flash("Logout successful.", category="success")
+
+
+def needs_authentication(authenticator: Authenticator) -> Callable:
+    def decorator(route: Callable) -> Callable:
+        @functools.wraps(route)
+        def wrapped_route(*args, **kwargs):
+            if authenticator.is_authenticated():
+                return route(*args, **kwargs)
+            else:
+                flash("You need to be logged in to view that site.", category="Warning")
+                return redirect(url_for("auth.index"))
+
+        return wrapped_route
+
+    return decorator

geo_activity_playground/webui/equipment/controller.py

@@ -103,7 +103,8 @@ class EquipmentController:
             }
 
         for equipment, offset in self._config.equipment_offsets.items():
-            equipment_summary.loc[equipment, "total_distance_km"] += offset
+            if equipment in equipment_summary.index:
+                equipment_summary.loc[equipment, "total_distance_km"] += offset
 
         return {
             "equipment_variables": equipment_variables,

geo_activity_playground/webui/explorer/controller.py

@@ -54,9 +54,9 @@ class ExplorerController:
         if zoom not in self._config_accessor().explorer_zoom_levels:
             return {"zoom_level_not_generated": zoom}
 
-        tile_evolution_states = self._tile_visit_accessor.states
-        tile_visits = self._tile_visit_accessor.visits
-        tile_histories = self._tile_visit_accessor.histories
+        tile_evolution_states = self._tile_visit_accessor.tile_state["evolution_state"]
+        tile_visits = self._tile_visit_accessor.tile_state["tile_visits"]
+        tile_histories = self._tile_visit_accessor.tile_state["tile_history"]
 
         medians = tile_histories[zoom].median()
         median_lat, median_lon = get_tile_upper_left_lat_lon(

geo_activity_playground/webui/heatmap/heatmap_controller.py

@@ -34,10 +34,14 @@ class HeatmapController:
         self._repository = repository
         self._tile_visit_accessor = tile_visit_accessor
 
-        self.tile_histories = self._tile_visit_accessor.histories
-        self.tile_evolution_states = self._tile_visit_accessor.states
-        self.tile_visits = self._tile_visit_accessor.visits
-        self.activities_per_tile = self._tile_visit_accessor.activities_per_tile
+        self.tile_histories = self._tile_visit_accessor.tile_state["tile_history"]
+        self.tile_evolution_states = self._tile_visit_accessor.tile_state[
+            "evolution_state"
+        ]
+        self.tile_visits = self._tile_visit_accessor.tile_state["tile_visits"]
+        self.activities_per_tile = self._tile_visit_accessor.tile_state[
+            "activities_per_tile"
+        ]
 
     def render(self, kinds: list[str] = []) -> dict:
         zoom = 14
@@ -74,7 +78,14 @@ class HeatmapController:
         tile_pixels = (OSM_TILE_SIZE, OSM_TILE_SIZE)
         tile_count_cache_path = pathlib.Path(f"Cache/Heatmap/{kind}/{z}/{x}/{y}.npy")
         if tile_count_cache_path.exists():
-            tile_counts = np.load(tile_count_cache_path)
+            try:
+                tile_counts = np.load(tile_count_cache_path)
+            except ValueError:
+                logger.warning(
+                    f"Heatmap count file {tile_count_cache_path} is corrupted, deleting."
+                )
+                tile_count_cache_path.unlink()
+                tile_counts = np.zeros(tile_pixels, dtype=np.int32)
         else:
             tile_counts = np.zeros(tile_pixels, dtype=np.int32)
         tile_count_cache_path.parent.mkdir(parents=True, exist_ok=True)
@@ -110,7 +121,9 @@ class HeatmapController:
                         draw.line(pixels, fill=1, width=max(3, 6 * (z - 17)))
                         aim = np.array(im)
                         tile_counts += aim
-            np.save(tile_count_cache_path, tile_counts)
+            tmp_path = tile_count_cache_path.with_suffix(".tmp.npy")
+            np.save(tmp_path, tile_counts)
+            tmp_path.rename(tile_count_cache_path)
         return tile_counts
 
     def _render_tile_image(

geo_activity_playground/webui/settings/blueprint.py

@@ -8,6 +8,8 @@ from flask import request
 from flask import url_for
 
 from geo_activity_playground.core.config import ConfigAccessor
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 from geo_activity_playground.webui.settings.controller import SettingsController
 
 
@@ -19,15 +21,29 @@ def int_or_none(s: str) -> Optional[int]:
             flash(f"Cannot parse integer from {s}: {e}", category="danger")
 
 
-def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
+def make_settings_blueprint(
+    config_accessor: ConfigAccessor, authenticator: Authenticator
+) -> Blueprint:
     settings_controller = SettingsController(config_accessor)
     blueprint = Blueprint("settings", __name__, template_folder="templates")
 
     @blueprint.route("/")
+    @needs_authentication(authenticator)
     def index():
         return render_template("settings/index.html.j2")
 
+    @blueprint.route("/admin-password", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def admin_password():
+        if request.method == "POST":
+            settings_controller.save_admin_password(request.form["password"])
+        return render_template(
+            "settings/admin-password.html.j2",
+            **settings_controller.render_admin_password(),
+        )
+
     @blueprint.route("/equipment-offsets", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def equipment_offsets():
         if request.method == "POST":
             equipments = request.form.getlist("equipment")
@@ -39,6 +55,7 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
         )
 
     @blueprint.route("/heart-rate", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def heart_rate():
         if request.method == "POST":
             birth_year = int_or_none(request.form["birth_year"])
@@ -54,6 +71,7 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
         )
 
     @blueprint.route("/kinds-without-achievements", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def kinds_without_achievements():
         if request.method == "POST":
             kinds = request.form.getlist("kind")
@@ -64,6 +82,7 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
         )
 
     @blueprint.route("/metadata-extraction", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def metadata_extraction():
         if request.method == "POST":
             regexes = request.form.getlist("regex")
@@ -74,6 +93,7 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
         )
 
     @blueprint.route("/privacy-zones", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def privacy_zones():
         if request.method == "POST":
             zone_names = request.form.getlist("zone_name")
@@ -84,7 +104,19 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
             **settings_controller.render_privacy_zones(),
         )
 
+    @blueprint.route("/sharepic", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def sharepic():
+        if request.method == "POST":
+            names = request.form.getlist("name")
+            settings_controller.save_sharepic(names)
+        return render_template(
+            "settings/sharepic.html.j2",
+            **settings_controller.render_sharepic(),
+        )
+
     @blueprint.route("/strava", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
     def strava():
         if request.method == "POST":
             strava_client_id = request.form["strava_client_id"]
@@ -98,6 +130,7 @@ def make_settings_blueprint(config_accessor: ConfigAccessor) -> Blueprint:
         )
 
     @blueprint.route("/strava-callback")
+    @needs_authentication(authenticator)
     def strava_callback():
         code = request.args.get("code", type=str)
         settings_controller.save_strava_code(code)

geo_activity_playground/webui/settings/controller.py

@@ -10,10 +10,32 @@ from geo_activity_playground.core.config import ConfigAccessor
 from geo_activity_playground.core.heart_rate import HeartRateZoneComputer
 
 
+SHAREPIC_FIELDS = {
+    "calories": "Calories",
+    "distance_km": "Distance",
+    "elapsed_time": "Elapsed time",
+    "equipment": "Equipment",
+    "kind": "Kind",
+    "name": "Name",
+    "start": "Date",
+    "Steps": "Steps",
+}
+
+
 class SettingsController:
     def __init__(self, config_accessor: ConfigAccessor) -> None:
         self._config_accessor = config_accessor
 
+    def render_admin_password(self) -> dict:
+        return {
+            "password": self._config_accessor().upload_password,
+        }
+
+    def save_admin_password(self, password: str) -> None:
+        self._config_accessor().upload_password = password
+        self._config_accessor.save()
+        flash("Updated admin password.", category="success")
+
     def render_equipment_offsets(self) -> dict:
         return {
             "equipment_offsets": self._config_accessor().equipment_offsets,
@@ -184,6 +206,27 @@ class SettingsController:
         self._config_accessor.save()
         flash("Updated privacy zones.", category="success")
 
+    def render_sharepic(self) -> dict:
+
+        return {
+            "names": [
+                (
+                    name,
+                    label,
+                    name not in self._config_accessor().sharepic_suppressed_fields,
+                )
+                for name, label in SHAREPIC_FIELDS.items()
+            ]
+        }
+
+    def save_sharepic(self, names: list[str]) -> None:
+        self._config_accessor().sharepic_suppressed_fields = list(
+            set(SHAREPIC_FIELDS) - set(names)
+        )
+        self._config_accessor.save()
+        flash("Updated sharepic preferences.", category="success")
+        pass
+
     def render_strava(self) -> dict:
         return {
             "strava_client_id": self._config_accessor().strava_client_id,

geo_activity_playground/webui/settings/templates/settings/admin-password.html.j2

@@ -0,0 +1,19 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Admin Password</h1>
+
+<p>To protect the settings and the upload functionality, you may specify a password.</p>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="password" class="form-label">Password</label>
+        <input type="text" class="form-control" id="password" name="password" value="{{ password }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

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

@@ -11,6 +11,15 @@
 
 <div class="row mb-3">
     <div class="row row-cols-1 row-cols-md-3 g-3">
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Admin password</h5>
+                    <p class="card-text">Running a public instance and want to protect it?</p>
+                    <a href="{{ url_for('.admin_password') }}" class="btn btn-primary">Set up admin password</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">
@@ -60,6 +69,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Share picture</h5>
+                    <p class="card-text">Select which metadata shall be displayed on share pictures.</p>
+                    <a href="{{ url_for('.sharepic') }}" class="btn btn-primary">Set up share picture</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">

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

@@ -0,0 +1,22 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Share Picture</h1>
+
+<p>What data fields shall be displayed on the share picture?</p>
+
+<form method="POST">
+    {% for name, label, checked in names %}
+    <div class="form-check form-check-inline form-switch">
+        <input class="form-check-input" type="checkbox" role="switch" id="{{ name }}" name="name" value="{{ name }}"
+            {{ 'checked' if checked else '' }} />
+        <label class="form-check-label" for="{{ name }}">{{ label }}</label>
+    </div>
+    {% endfor %}
+    <div class="clearfix mb-3"></div>
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground/webui/square_planner/controller.py

@@ -18,7 +18,7 @@ class SquarePlannerController:
         self._repository = repository
         self._tile_visit_accessor = tile_visit_accessor
 
-        self._tile_visits = self._tile_visit_accessor.visits
+        self._tile_visits = self._tile_visit_accessor.tile_state["tile_visits"]
 
     def action_planner(
         self, zoom: int, square_x: int, square_y: int, square_size: int

geo_activity_playground/webui/templates/page.html.j2

@@ -52,7 +52,7 @@
     <div class="container">
         <nav class="navbar navbar-expand-lg bg-body-secondary mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" href="{{ url_for('index') }}">Geo Actvitity Playground</a>
+                <a class="navbar-brand" href="{{ url_for('index') }}">Geo Activity Playground</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
                     data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
                     aria-expanded="false" aria-label="Toggle navigation">

geo_activity_playground/webui/upload/blueprint.py

@@ -5,32 +5,39 @@ from ...core.activities import ActivityRepository
 from ...explorer.tile_visits import TileVisitAccessor
 from .controller import UploadController
 from geo_activity_playground.core.config import Config
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 
 
 def make_upload_blueprint(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    authenticator: Authenticator,
 ) -> Blueprint:
     blueprint = Blueprint("upload", __name__, template_folder="templates")
 
     upload_controller = UploadController(repository, tile_visit_accessor, config)
 
     @blueprint.route("/")
+    @needs_authentication(authenticator)
     def index():
         return render_template(
             "upload/index.html.j2", **upload_controller.render_form()
         )
 
     @blueprint.route("/receive", methods=["POST"])
+    @needs_authentication(authenticator)
     def receive():
         return upload_controller.receive()
 
     @blueprint.route("/refresh")
+    @needs_authentication(authenticator)
     def reload():
         return render_template("upload/reload.html.j2")
 
     @blueprint.route("/execute-reload")
+    @needs_authentication(authenticator)
     def execute_reload():
         return upload_controller.execute_reload()
 

geo_activity_playground/webui/upload/controller.py

@@ -14,7 +14,7 @@ from geo_activity_playground.core.activities import build_activity_meta
 from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.enrichment import enrich_activities
 from geo_activity_playground.explorer.tile_visits import compute_tile_evolution
-from geo_activity_playground.explorer.tile_visits import compute_tile_visits
+from geo_activity_playground.explorer.tile_visits import compute_tile_visits_new
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 from geo_activity_playground.importers.directory import get_file_hash
 from geo_activity_playground.importers.directory import import_from_directory
@@ -45,7 +45,6 @@ class UploadController:
         directories.sort()
         return {
             "directories": directories,
-            "has_upload": self._config.upload_password,
         }
 
     def receive(self) -> Response:
@@ -54,10 +53,6 @@ class UploadController:
             flash("No file could be found. Did you select a file?", "warning")
             return redirect("/upload")
 
-        if request.form["password"] != self._config.upload_password:
-            flash("Incorrect upload password!", "danger")
-            return redirect("/upload")
-
         file = request.files["file"]
         # If the user does not select a file, the browser submits an
         # empty file without a filename.
@@ -120,5 +115,6 @@ def scan_for_activities(
     repository.reload()
 
     if len(repository) > 0:
-        compute_tile_visits(repository, tile_visit_accessor)
-        compute_tile_evolution(tile_visit_accessor, config)
+        compute_tile_visits_new(repository, tile_visit_accessor)
+        compute_tile_evolution(tile_visit_accessor.tile_state, config)
+        tile_visit_accessor.save()

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

@@ -1,37 +1,21 @@
 {% extends "page.html.j2" %}
 
 {% block container %}
-<div class="row mb-1">
-    <div class="col">
-        <h1>Upload Activity</h1>
+<h1>Upload Activity</h1>
 
-        {% if has_upload %}
-        <form method="post" enctype="multipart/form-data" action="{{ url_for(".receive") }}">
-            <div class="mb-3">
-                <label for="file1" class="form-label">Activity file</label>
-                <input type="file" name="file" id="file1" class="form-control">
-            </div>
-            <div class="mb-3">
-                <label for="directory" class="form-label">Target directory</label>
-                <select name="directory" id="directory" class="form-select" aria-label="Default select example">
-                    {% for directory in directories %}
-                    <option>{{ directory }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-            <div class="mb-3">
-                <label for="password" class="form-label">Password</label>
-                <input type="password" name="password" id="password" class="form-control">
-            </div>
-            <button type="submit" class="btn btn-primary">Upload</button>
-        </form>
-        {% else %}
-        <p>You don't have an upload password set. In order to use this feature, add the following to your configuration
-            file:</p>
-        <code><pre>[upload]
-password = "your unique password here"</pre></code>
-        {% endif %}
+<form method="post" enctype="multipart/form-data" action="{{ url_for('.receive') }}">
+    <div class="mb-3">
+        <label for="file1" class="form-label">Activity file</label>
+        <input type="file" name="file" id="file1" class="form-control">
     </div>
-</div>
-
+    <div class="mb-3">
+        <label for="directory" class="form-label">Target directory</label>
+        <select name="directory" id="directory" class="form-select" aria-label="Default select example">
+            {% for directory in directories %}
+            <option>{{ directory }}</option>
+            {% endfor %}
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Upload</button>
+</form>
 {% endblock %}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.27.1
+Version: 0.28.0
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

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

@@ -1,8 +1,8 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=0feB3cw3-U9q0Dkrn5co76gTPpwGRWyfI5mfWNSZ_lU,4063
+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=Z81Itv3qrokxE1-YnPrDJ0QteyBZYjQYvTP-tHvR9j4,6606
-geo_activity_playground/core/config.py,sha256=Ogv_nPJD3ihlgBDZsCv5XsWAUXIKKhzWR6cu-KMNMWU,4414
+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/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
@@ -10,14 +10,14 @@ geo_activity_playground/core/heatmap.py,sha256=bRLQHzmTEsQbX8XWeg85x_lRGk272UoYR
 geo_activity_playground/core/paths.py,sha256=AiYUJv46my_FGYbHZmSs5ZrqeE65GNdWEMmXZgunZrk,2150
 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=k_DHzY--V5EHqMh-aNFh-VsLiQntvAsGbmK5zZJ0YPI,2909
+geo_activity_playground/core/tasks.py,sha256=f3C2gCJiiqMS1eRQ-Hp5hxRbkwl60rotrYfzKsWdpSU,2937
 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/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=p0MK0V4fHhroR-FN8S9m5nW0vT7uO39Euo-_mOw0Q8k,13586
+geo_activity_playground/explorer/tile_visits.py,sha256=IqkaGPq-xrmR81Ze31VL1v4NUxQ2YGQeQawvsjYe25s,12776
 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
@@ -31,12 +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=VJrbUD2oofESV2imNr7LBrx6jhSA8miuwnrERPsUuQc,17573
+geo_activity_playground/webui/activity/controller.py,sha256=YaWHXIfSYSeybEFY706s_m4uHbfJ9FHxqIYtqwR5sGQ,17955
 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=3g-Hab06uWBPJo6DmTk4lM2OlozE1EyrQK6RgTgTuwU,5521
-geo_activity_playground/webui/app.py,sha256=xKPP0WDyHMAbkpJsuEz53skIjOMRBMvueD6LpRdYJE0,4119
+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/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/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,29 +52,31 @@ geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256
 geo_activity_playground/webui/entry_controller.py,sha256=n9v4MriyL8kDR91LE9eeqc2tAvxyzFgoNMMXpr0qh4g,1906
 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=_iLkQeeu7UYMg7FGNemTrhm8e0pf409f9aUXnGfNsCI,4022
+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=M3FdPLrcP9GZiCjuRVY0ug1DtTqLvIbEDCzRHf6QuOE,11555
+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/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=i376qEqTJrhezGsdPyKR8VsRY2N0JdEra7_kY7NmwW8,6822
+geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=Bn7FO_ciMEXghSwz2tEQ8fJsbK8AXaHTPNgnGuQ7an8,7353
 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=1u16oRlauOSPVBGBzjf08Ja9jxbqEKnwcDISWl7CmJU,4113
-geo_activity_playground/webui/settings/controller.py,sha256=ixuYgpMGggg9kmcIVTgL2gzAPhYjMpqWEPxS7YXlmnA,7902
+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/settings/templates/settings/admin-password.html.j2,sha256=VYwddpObD1RpeTH5Dm4y7VtmT7kwURDCIjxyzJeq08c,495
 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=26VEC_MbdIyd7vbFokDFtJelcuK3YFb1_3WaFLGv_bk,3183
+geo_activity_playground/webui/settings/templates/settings/index.html.j2,sha256=rXKq2v42J0eW5OSWx7VU6EFT9jZkbzKTW600Y0OqBtY,4035
 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
+geo_activity_playground/webui/settings/templates/settings/sharepic.html.j2,sha256=qZkfEpd4CtKKMaSSVadqvNEgMRYLV-0X-pw5-nJvukk,678
 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=wYcNEviDgqyYxSrnwMD_5LnYXIazVH9plGX8RxG6oco,3464
+geo_activity_playground/webui/square_planner/controller.py,sha256=vV7Wd4Kt1YPOI-UVoqLtIqUb3nke9PJQwWynlA31Lto,3483
 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
@@ -90,18 +95,18 @@ geo_activity_playground/webui/summary/blueprint.py,sha256=kzQ6MDOycQKfDcVoEUmL7H
 geo_activity_playground/webui/summary/controller.py,sha256=ZOrwfrKjpc8hecUYImBvesKXZi06obfR1yhQkVTeWzw,8981
 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=sqerdJLOIcgMtQy533kHPD9uVIxF3v6ItLQSjuoCqlI,9589
+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/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
 geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/upload/blueprint.py,sha256=qU6ZKOrhB8DA8GSbOECVu2fPKd2VtBFp0mEFzjJAgIA,1083
-geo_activity_playground/webui/upload/controller.py,sha256=8Xv9JMeTyPe6mhYiDBW_nv9W_Hp7yz4Cgv_lXbM_JfY,4271
-geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=hfXkEXaz_MkM46rU56423D6V6WtK-EAXPszSY-_-Tx8,1471
+geo_activity_playground/webui/upload/blueprint.py,sha256=xX9scEmleN_dL03jfhWRh5yI1WsFyhxUFiS_Ul2HWy4,1428
+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.27.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.27.1.dist-info/METADATA,sha256=Wm7WbQhD76zAw6Vf127jOm7ZeYPy0hllY9DZTKeh8oE,1665
-geo_activity_playground-0.27.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.27.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.27.1.dist-info/RECORD,,
+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,,