geo-activity-playground 1.11.0__tar.gz → 1.12.0__tar.gz

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/PKG-INFO

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

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/core/config.py

@@ -25,6 +25,10 @@ class Config:
     color_scheme_for_counts: str = "teals"
     color_scheme_for_kind: str = "category10"
     color_scheme_for_heatmap: str = "hot"
+    color_strategy_max_cluster_color: str = "#377eb84d"
+    color_strategy_max_cluster_other_color: str = "#4daf4a4d"
+    color_strategy_visited_color: str = "#0000004d"
+    color_strategy_cmap_opacity: float = 0.5
     equipment_offsets: dict[str, float] = dataclasses.field(default_factory=dict)
     explorer_zoom_levels: list[int] = dataclasses.field(
         default_factory=lambda: [14, 17]

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/app.py

@@ -226,6 +226,7 @@ def web_ui_main(
             config_accessor,
             tile_getter,
             image_transforms,
+            config,
         ),
         "/export": make_export_blueprint(authenticator),
         "/hall-of-fame": make_hall_of_fame_blueprint(repository, search_query_history),

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/blueprints/explorer_blueprint.py

@@ -1,7 +1,9 @@
 import abc
 import datetime
+import functools
 import hashlib
 import io
+import itertools
 import logging
 from collections.abc import Iterable
 from typing import Any
@@ -24,6 +26,7 @@ from flask import Response
 from flask import url_for
 from flask.typing import ResponseReturnValue
 
+from ...core.config import Config
 from ...core.config import ConfigAccessor
 from ...core.coordinates import Bounds
 from ...core.datamodel import Activity
@@ -55,6 +58,15 @@ def blend_color(
     return (1 - opacity) * base + opacity * addition
 
 
+@functools.cache
+def hex_color_to_float(color: str) -> np.ndarray:
+    values = [int("".join(x), base=16) / 255 for x in itertools.batched(color[1:], 2)]
+    assert (
+        min(values) >= 0.0 and max(values) <= 1.0
+    ), f"All {values=} must be within 0.0 and 1.0."
+    return np.array([[values]])
+
+
 class ColorStrategy(abc.ABC):
     @abc.abstractmethod
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
@@ -62,27 +74,32 @@ class ColorStrategy(abc.ABC):
 
 
 class MaxClusterColorStrategy(ColorStrategy):
-    def __init__(self, evolution_state, tile_visits):
+    def __init__(self, evolution_state, tile_visits, config: Config):
         self.evolution_state = evolution_state
         self.tile_visits = tile_visits
         self.max_cluster_members = max(
             evolution_state.clusters.values(),
             key=len,
         )
+        self._config = config
 
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.max_cluster_members:
-            return np.array([[[55, 126, 184, 70]]]) / 255
+            return hex_color_to_float(self._config.color_strategy_max_cluster_color)
         elif tile_xy in self.evolution_state.memberships:
-            return np.array([[[77, 175, 74, 70]]]) / 255
+            return hex_color_to_float(
+                self._config.color_strategy_max_cluster_other_color
+            )
         elif tile_xy in self.tile_visits:
-            return np.array([[[0, 0, 0, 70]]]) / 255
+            return hex_color_to_float(self._config.color_strategy_visited_color)
         else:
             return None
 
 
 class ColorfulClusterColorStrategy(ColorStrategy):
-    def __init__(self, evolution_state: TileEvolutionState, tile_visits):
+    def __init__(
+        self, evolution_state: TileEvolutionState, tile_visits, config: Config
+    ):
         self.evolution_state = evolution_state
         self.tile_visits = tile_visits
         self.max_cluster_members = max(
@@ -90,6 +107,7 @@ class ColorfulClusterColorStrategy(ColorStrategy):
             key=len,
         )
         self._cmap = matplotlib.colormaps["hsv"]
+        self._config = config
 
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.evolution_state.memberships:
@@ -97,17 +115,20 @@ class ColorfulClusterColorStrategy(ColorStrategy):
             m = hashlib.sha256()
             m.update(str(cluster_id).encode())
             d = int(m.hexdigest(), base=16) / (256.0**m.digest_size)
-            return np.array([[self._cmap(d)[:3] + (0.5,)]])
+            return np.array(
+                [[self._cmap(d)[:3] + (self._config.color_strategy_cmap_opacity,)]]
+            )
         elif tile_xy in self.tile_visits:
-            return np.array([[[0, 0, 0, 70]]]) / 255
+            return hex_color_to_float(self._config.color_strategy_visited_color)
         else:
             return None
 
 
 class VisitTimeColorStrategy(ColorStrategy):
-    def __init__(self, tile_visits, use_first=True):
+    def __init__(self, tile_visits, config: Config, use_first=True):
         self.tile_visits = tile_visits
         self.use_first = use_first
+        self._config = config
 
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.tile_visits:
@@ -118,39 +139,43 @@ class VisitTimeColorStrategy(ColorStrategy):
                 tile_info["first_time"] if self.use_first else tile_info["last_time"]
             )
             if pd.isna(relevant_time):
-                color = np.array([[[0, 0, 0, 70]]]) / 255
+                color = hex_color_to_float(self._config.color_strategy_visited_color)
             else:
                 last_age_days = (today - relevant_time.date()).days
                 color = cmap(max(1 - last_age_days / (2 * 365), 0.0))
-                color = np.array([[color[:3] + (0.5,)]])
+                color = np.array(
+                    [[color[:3] + (self._config.color_strategy_cmap_opacity,)]]
+                )
             return color
         else:
             return None
 
 
 class NumVisitsColorStrategy(ColorStrategy):
-    def __init__(self, tile_visits):
+    def __init__(self, tile_visits, config: Config):
         self.tile_visits = tile_visits
+        self._config = config
 
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.tile_visits:
             cmap = matplotlib.colormaps["viridis"]
             tile_info = self.tile_visits[tile_xy]
             color = cmap(min(len(tile_info["activity_ids"]) / 50, 1.0))
-            return np.array([[color[:3] + (0.5,)]])
+            return np.array([[color[:3] + (self._config.color_strategy_cmap_opacity,)]])
         else:
             return None
 
 
 class MissingColorStrategy(ColorStrategy):
-    def __init__(self, tile_visits):
+    def __init__(self, tile_visits, config: Config):
         self.tile_visits = tile_visits
+        self._config = config
 
     def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.tile_visits:
             return None
         else:
-            return np.array([[[0, 0, 0, 70]]]) / 255
+            return hex_color_to_float(self._config.color_strategy_visited_color)
 
 
 def make_explorer_blueprint(
@@ -159,6 +184,7 @@ def make_explorer_blueprint(
     config_accessor: ConfigAccessor,
     tile_getter: TileGetter,
     image_transforms: dict[str, ImageTransform],
+    config: Config,
 ) -> Blueprint:
     blueprint = Blueprint("explorer", __name__, template_folder="templates")
 
@@ -255,6 +281,7 @@ def make_explorer_blueprint(
                 continue
             bookmarks.append(
                 {
+                    "id": bookmark.id,
                     "name": bookmark.name,
                     "bbox": geojson_bounding_box_for_tile_collection(cluster, zoom),
                     "size": len(cluster),
@@ -307,19 +334,25 @@ def make_explorer_blueprint(
             color_strategy_name = config_accessor().cluster_color_strategy
         match color_strategy_name:
             case "max_cluster":
-                color_strategy = MaxClusterColorStrategy(evolution_state, tile_visits)
+                color_strategy = MaxClusterColorStrategy(
+                    evolution_state, tile_visits, config
+                )
             case "colorful_cluster":
                 color_strategy = ColorfulClusterColorStrategy(
-                    evolution_state, tile_visits
+                    evolution_state, tile_visits, config
                 )
             case "first":
-                color_strategy = VisitTimeColorStrategy(tile_visits, use_first=True)
+                color_strategy = VisitTimeColorStrategy(
+                    tile_visits, config, use_first=True
+                )
             case "last":
-                color_strategy = VisitTimeColorStrategy(tile_visits, use_first=False)
+                color_strategy = VisitTimeColorStrategy(
+                    tile_visits, config, use_first=False
+                )
             case "visits":
-                color_strategy = NumVisitsColorStrategy(tile_visits)
+                color_strategy = NumVisitsColorStrategy(tile_visits, config)
             case "missing":
-                color_strategy = MissingColorStrategy(tile_visits)
+                color_strategy = MissingColorStrategy(tile_visits, config)
             case _:
                 raise ValueError("Unsupported color strategy.")
 

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -134,6 +134,15 @@ def make_settings_blueprint(
                 tile_y=request.args["tile_y"],
             )
 
+    @blueprint.route("/cluster-bookmarks/delete/<int:id>")
+    @needs_authentication(authenticator)
+    def cluster_bookmark_delete(id: int):
+        bookmark = DB.session.get_one(ExplorerTileBookmark, id)
+        flasher.flash_message(f"Bookmark {bookmark.name} deleted.", FlashTypes.SUCCESS)
+        DB.session.delete(bookmark)
+        DB.session.commit()
+        return redirect(request.referrer)
+
     @blueprint.route("/color-schemes", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def color_schemes():
@@ -175,6 +184,33 @@ def make_settings_blueprint(
             color_scheme_for_heatmap_avail=MATPLOTLIB_COLOR_SCHEMES_CONTINUOUS,
         )
 
+    @blueprint.route("/color-strategy", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def color_strategy():
+        if request.method == "POST":
+            config_accessor().color_strategy_max_cluster_color = request.form[
+                "color_strategy_max_cluster_color"
+            ]
+            config_accessor().color_strategy_max_cluster_other_color = request.form[
+                "color_strategy_max_cluster_other_color"
+            ]
+            config_accessor().color_strategy_visited_color = request.form[
+                "color_strategy_visited_color"
+            ]
+            config_accessor().color_strategy_cmap_opacity = float(
+                request.form["color_strategy_cmap_opacity"]
+            )
+            config_accessor.save()
+            flash("Updated color strategy values.", category="success")
+
+        return render_template(
+            "settings/color-strategy.html.j2",
+            color_strategy_max_cluster_color=config_accessor().color_strategy_max_cluster_color,
+            color_strategy_max_cluster_other_color=config_accessor().color_strategy_max_cluster_other_color,
+            color_strategy_visited_color=config_accessor().color_strategy_visited_color,
+            color_strategy_cmap_opacity=config_accessor().color_strategy_cmap_opacity,
+        )
+
     @blueprint.route("/manage-equipments", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def manage_equipments():

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/static/server-side-explorer.js

@@ -44,7 +44,7 @@ let overlay_maps = {
         maxZoom: 19,
         attribution: map_tile_attribution
     }),
-    "Mising": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=missing`, {
+    "Missing": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=missing`, {
         maxZoom: 19,
         attribution: map_tile_attribution
     }),
@@ -84,7 +84,12 @@ map.on('click', e => {
             ]
             if (data.this_cluster_size) {
                 lines.push(`<dt>This cluster size</dt><dd>${data.this_cluster_size}</dd>`)
-                lines.push(`<dt>Bookmark</dt><dd><a href="${data.new_bookmark_url}">Create cluster bookmark</a></dd>`)
+                if (data.new_bookmark_url === undefined) {
+                    console.error("Somehow we got a cluster that doesn't have a proper URL. This is the data that we got in response:")
+                    console.error(data)
+                } else {
+                    lines.push(`<dt>Bookmark</dt><dd><a href="${data.new_bookmark_url}">Create cluster bookmark</a></dd>`)
+                }
             }
 
             L.popup()

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/templates/explorer/server-side.html.j2

@@ -26,9 +26,9 @@
 
 {% if bookmarks %}
 <div class="btn-group mb-3" role="group" aria-label="Cluster bookmarks">
-    <button type="button" class="btn btn-primary" onclick='centerOn({{ center.bbox | safe }})'>Biggest</button>
+    <button type="button" class="btn" onclick='centerOn({{ center.bbox | safe }})'>Biggest</button>
     {% for bookmark in bookmarks %}
-    <button type="button" class="btn btn-primary" onclick='centerOn({{ bookmark.bbox | safe }})'>{{ bookmark.name
+    <button type="button" class="btn" onclick='centerOn({{ bookmark.bbox | safe }})'>{{ bookmark.name
         }}</button>
     {% endfor %}
 </div>
@@ -52,6 +52,7 @@
     </div>
 </div>
 
+<p><a href="{{ url_for('settings.color_strategy') }}">Modify color values</a>.</p>
 
 {% if bookmarks %}
 <h2 class="mb-3">Bookmarked cluster sizes</h2>
@@ -65,11 +66,20 @@
         </tr>
     </thead>
     <tbody>
+        <tr>
+            <td>Max Cluster</td>
+            <td>{{ max_cluster_size }}</td>
+            <td></td>
+            <td></td>
+        </tr>
         {% for bookmark in bookmarks %}
         <tr>
             <td>{{ bookmark.name }}</td>
             <td>{{ bookmark.size }}</td>
             <td>{{ '%.1f'|format(bookmark.size / max_cluster_size * 100) }} %</td>
+            <td><a class="btn btn-danger btn-sm"
+                    href="{{ url_for('settings.cluster_bookmark_delete', id=bookmark.id) }}"
+                    onclick="if(!confirm('Are you sure to Delete This?')){ event.preventDefault() }">Delete</a></td>
         </tr>
         {% endfor %}
     </tbody>

geo_activity_playground-1.12.0/geo_activity_playground/webui/templates/settings/color-strategy.html.j2

@@ -0,0 +1,38 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Color Strategy Values</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="color_strategy_max_cluster_color" class="form-label">Max cluster</label>
+        <input type="color" alpha class="form-control" id="color_strategy_max_cluster_color"
+            name="color_strategy_max_cluster_color" value="{{ color_strategy_max_cluster_color }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="color_strategy_max_cluster_other_color" class="form-label">Other clusters besides the maximum
+            one</label>
+        <input type="color" alpha class="form-control" id="color_strategy_max_cluster_other_color"
+            name="color_strategy_max_cluster_other_color" value="{{ color_strategy_max_cluster_other_color }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="color_strategy_visited_color" class="form-label">Visited tiles that are not part of a
+            cluster</label>
+        <input type="color" alpha class="form-control" id="color_strategy_visited_color"
+            name="color_strategy_visited_color" value="{{ color_strategy_visited_color }}" />
+    </div>
+
+    <div class="mb-3">
+        <label for="color_strategy_cmap_opacity" class="form-label">Color map opacity</label>
+        <input type="number" class="form-control" id="color_strategy_cmap_opacity" name="color_strategy_cmap_opacity"
+            value="{{ color_strategy_cmap_opacity }}" min="0.0" max="1.0" step="0.05" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/geo_activity_playground/webui/templates/settings/index.html.j2

@@ -24,11 +24,20 @@
             <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>
+                    <p class="card-text">Don't like the colors in the statistics 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">
+                    <h5 class="card-title">Color strategy</h5>
+                    <p class="card-text">Don't like the cluster colors in the explorer tile map?</p>
+                    <a href="{{ url_for('.color_strategy') }}" class="btn btn-primary">Modify color strategies</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">

{geo_activity_playground-1.11.0 → geo_activity_playground-1.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "1.11.0"
+version = "1.12.0"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"