geo-activity-playground 1.4.1__tar.gz → 1.5.1__tar.gz

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/PKG-INFO

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

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/core/datamodel.py

@@ -230,6 +230,13 @@ class Activity(DB.Model):
         else:
             return self.start
 
+    @property
+    def start_utc(self) -> Optional[datetime.datetime]:
+        if self.start:
+            return self.start.replace(microsecond=0, tzinfo=zoneinfo.ZoneInfo("UTC"))
+        else:
+            return None
+
 
 class Tag(DB.Model):
     __tablename__ = "tags"

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/importers/activity_parsers.py

@@ -8,7 +8,7 @@ from collections.abc import Iterator
 import charset_normalizer
 import dateutil.parser
 import fitdecode.exceptions
-import gpxpy
+import gpxpy.gpx
 import pandas as pd
 import tcxreader.tcxreader
 import xmltodict
@@ -40,7 +40,7 @@ def read_activity(path: pathlib.Path) -> tuple[Activity, pd.DataFrame]:
     if file_type == ".gpx":
         try:
             timeseries = read_gpx_activity(path, opener)
-        except gpxpy.gpx.GPXXMLSyntaxException as e:
+        except gpxpy.gpx.GPXException as e:
             raise ActivityParseError(f"Syntax error while parsing GPX file") from e
         except UnicodeDecodeError as e:
             raise ActivityParseError(f"Encoding issue") from e

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/app.py

@@ -256,6 +256,7 @@ def web_ui_main(
             # "search_query_favorites": search_query_history.prepare_favorites(),
             # "search_query_last": search_query_history.prepare_last(),
             "request_url": urllib.parse.quote_plus(request.url),
+            "host_url": request.host_url,
         }
         variables["equipments_avail"] = DB.session.scalars(
             sqlalchemy.select(Equipment).order_by(Equipment.name)

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/blueprints/explorer_blueprint.py

@@ -4,6 +4,7 @@ import hashlib
 import io
 import logging
 from collections.abc import Iterable
+from typing import Optional
 from typing import Union
 
 import altair as alt
@@ -53,9 +54,7 @@ def blend_color(
 
 class ColorStrategy(abc.ABC):
     @abc.abstractmethod
-    def color_image(
-        self, tile_xy: tuple[int, int], grayscale: np.ndarray
-    ) -> np.ndarray:
+    def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         pass
 
 
@@ -68,18 +67,15 @@ class MaxClusterColorStrategy(ColorStrategy):
             key=len,
         )
 
-    def color_image(
-        self, tile_xy: tuple[int, int], grayscale: np.ndarray
-    ) -> np.ndarray:
+    def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.max_cluster_members:
-            color = np.array([[[55, 126, 184, 70]]]) / 256
+            return np.array([[[55, 126, 184, 70]]]) / 255
         elif tile_xy in self.evolution_state.memberships:
-            color = np.array([[[77, 175, 74, 70]]]) / 256
+            return np.array([[[77, 175, 74, 70]]]) / 255
         elif tile_xy in self.tile_visits:
-            color = np.array([[[0, 0, 0, 70]]]) / 256
+            return np.array([[[0, 0, 0, 70]]]) / 255
         else:
-            color = np.array([[[0, 0, 0, 0]]]) / 256
-        return np.broadcast_to(color, grayscale.shape)
+            return None
 
 
 class ColorfulClusterColorStrategy(ColorStrategy):
@@ -92,20 +88,17 @@ class ColorfulClusterColorStrategy(ColorStrategy):
         )
         self._cmap = matplotlib.colormaps["hsv"]
 
-    def color_image(
-        self, tile_xy: tuple[int, int], grayscale: np.ndarray
-    ) -> np.ndarray:
+    def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.evolution_state.memberships:
             cluster_id = self.evolution_state.memberships[tile_xy]
             m = hashlib.sha256()
             m.update(str(cluster_id).encode())
             d = int(m.hexdigest(), base=16) / (256.0**m.digest_size)
-            color = np.array([[self._cmap(d)[:3] + (0.5,)]])
+            return np.array([[self._cmap(d)[:3] + (0.5,)]])
         elif tile_xy in self.tile_visits:
-            color = np.array([[[0, 0, 0, 70]]]) / 256
+            return np.array([[[0, 0, 0, 70]]]) / 255
         else:
-            color = np.array([[[0, 0, 0, 0]]]) / 256
-        return np.broadcast_to(color, grayscale.shape)
+            return None
 
 
 class VisitTimeColorStrategy(ColorStrategy):
@@ -113,9 +106,7 @@ class VisitTimeColorStrategy(ColorStrategy):
         self.tile_visits = tile_visits
         self.use_first = use_first
 
-    def color_image(
-        self, tile_xy: tuple[int, int], grayscale: np.ndarray
-    ) -> np.ndarray:
+    def _color(self, tile_xy: tuple[int, int]) -> Optional[np.ndarray]:
         if tile_xy in self.tile_visits:
             today = datetime.date.today()
             cmap = matplotlib.colormaps["plasma"]
@@ -124,31 +115,39 @@ 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]]]) / 256
+                color = np.array([[[0, 0, 0, 70]]]) / 255
             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,)]])
+            return color
         else:
-            color = np.array([[[0, 0, 0, 0]]]) / 256
-        return np.broadcast_to(color, grayscale.shape)
+            return None
 
 
 class NumVisitsColorStrategy(ColorStrategy):
     def __init__(self, tile_visits):
         self.tile_visits = tile_visits
 
-    def color_image(
-        self, tile_xy: tuple[int, int], grayscale: np.ndarray
-    ) -> np.ndarray:
+    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))
-            color = np.array([[color[:3] + (0.5,)]])
+            return np.array([[color[:3] + (0.5,)]])
         else:
-            color = np.array([[[0, 0, 0, 0]]]) / 256
-        return np.broadcast_to(color, grayscale.shape)
+            return None
+
+
+class MissingColorStrategy(ColorStrategy):
+    def __init__(self, tile_visits):
+        self.tile_visits = tile_visits
+
+    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
 
 
 def make_explorer_blueprint(
@@ -294,6 +293,8 @@ def make_explorer_blueprint(
                 color_strategy = VisitTimeColorStrategy(tile_visits, use_first=False)
             case "visits":
                 color_strategy = NumVisitsColorStrategy(tile_visits)
+            case "missing":
+                color_strategy = MissingColorStrategy(tile_visits)
             case _:
                 raise ValueError("Unsupported color strategy.")
 
@@ -302,7 +303,11 @@ def make_explorer_blueprint(
             tile_x = x // factor
             tile_y = y // factor
             tile_xy = (tile_x, tile_y)
-            result = color_strategy.color_image(tile_xy, grayscale).copy()
+            color = color_strategy._color(tile_xy)
+            if color is None:
+                result = grayscale
+            else:
+                result = np.broadcast_to(color, grayscale.shape)
 
             if x % factor == 0:
                 result[:, 0, :] = 0.5
@@ -356,73 +361,62 @@ def make_explorer_blueprint(
                     tile_x = x * factor + xo
                     tile_y = y * factor + yo
                     tile_xy = (tile_x, tile_y)
-                    if tile_xy in tile_visits:
+                    color = color_strategy._color(tile_xy)
+                    if color is not None:
                         result[
                             yo * width : (yo + 1) * width, xo * width : (xo + 1) * width
-                        ] = color_strategy.color_image(
-                            tile_xy,
-                            grayscale[
+                        ] = color
+
+                    if (
+                        evolution_state.square_x is not None
+                        and evolution_state.square_y is not None
+                    ):
+                        if (
+                            tile_x == evolution_state.square_x
+                            and evolution_state.square_y
+                            <= tile_y
+                            < evolution_state.square_y + evolution_state.max_square_size
+                        ):
+                            result[
                                 yo * width : (yo + 1) * width,
+                                xo * width : xo * width + square_line_width,
+                            ] = square_color
+                        if (
+                            tile_y == evolution_state.square_y
+                            and evolution_state.square_x
+                            <= tile_x
+                            < evolution_state.square_x + evolution_state.max_square_size
+                        ):
+                            result[
+                                yo * width : yo * width + square_line_width,
                                 xo * width : (xo + 1) * width,
-                            ],
-                        )
+                            ] = square_color
 
                         if (
-                            evolution_state.square_x is not None
-                            and evolution_state.square_y is not None
+                            tile_x + 1
+                            == evolution_state.square_x
+                            + evolution_state.max_square_size
+                            and evolution_state.square_y
+                            <= tile_y
+                            < evolution_state.square_y + evolution_state.max_square_size
                         ):
-                            if (
-                                tile_x == evolution_state.square_x
-                                and evolution_state.square_y
-                                <= tile_y
-                                < evolution_state.square_y
-                                + evolution_state.max_square_size
-                            ):
-                                result[
-                                    yo * width : (yo + 1) * width,
-                                    xo * width : xo * width + square_line_width,
-                                ] = square_color
-                            if (
-                                tile_y == evolution_state.square_y
-                                and evolution_state.square_x
-                                <= tile_x
-                                < evolution_state.square_x
-                                + evolution_state.max_square_size
-                            ):
-                                result[
-                                    yo * width : yo * width + square_line_width,
-                                    xo * width : (xo + 1) * width,
-                                ] = square_color
-
-                            if (
-                                tile_x + 1
-                                == evolution_state.square_x
-                                + evolution_state.max_square_size
-                                and evolution_state.square_y
-                                <= tile_y
-                                < evolution_state.square_y
-                                + evolution_state.max_square_size
-                            ):
-                                result[
-                                    yo * width : (yo + 1) * width,
-                                    (xo + 1) * width
-                                    - square_line_width : (xo + 1) * width,
-                                ] = square_color
-
-                            if (
-                                tile_y + 1
-                                == evolution_state.square_y
-                                + evolution_state.max_square_size
-                                and evolution_state.square_x
-                                <= tile_x
-                                < evolution_state.square_x
-                                + evolution_state.max_square_size
-                            ):
-                                result[
-                                    (yo + 1) * width
-                                    - square_line_width : (yo + 1) * width,
-                                    xo * width : (xo + 1) * width,
-                                ] = square_color
+                            result[
+                                yo * width : (yo + 1) * width,
+                                (xo + 1) * width - square_line_width : (xo + 1) * width,
+                            ] = square_color
+
+                        if (
+                            tile_y + 1
+                            == evolution_state.square_y
+                            + evolution_state.max_square_size
+                            and evolution_state.square_x
+                            <= tile_x
+                            < evolution_state.square_x + evolution_state.max_square_size
+                        ):
+                            result[
+                                (yo + 1) * width - square_line_width : (yo + 1) * width,
+                                xo * width : (xo + 1) * width,
+                            ] = square_color
                     if width >= 64:
                         result[yo * width, :, :] = 0.5
                         result[:, xo * width, :] = 0.5

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/blueprints/hall_of_fame_blueprint.py

@@ -79,11 +79,11 @@ def _nominate_activities_inner(
         if variable in meta.columns and not pd.isna(meta[variable]).all():
             try:
                 i = meta[variable].idxmax()
-            except ValueError as e:
+            except (KeyError, TypeError):
                 print(meta[variable].tolist())
                 print(f"{meta[variable].dtype=}")
                 logger.error(f"Trying to work with {variable=}.")
-                logger.error(f"We got a ValueError: {e}")
+                raise
             else:
                 value = meta.loc[i, variable]
                 format_applied = format_str.format(value)

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/blueprints/photo_blueprint.py

@@ -143,7 +143,10 @@ def make_photo_blueprint(
                     .order_by(Activity.start.desc())
                     .limit(1)
                 )
-                if activity is None or activity.start + activity.elapsed_time < time:
+                if (
+                    activity is None
+                    or activity.start_utc + activity.elapsed_time < time
+                ):
                     flasher.flash_message(
                         f"Your image '{file.filename}' is from {time} but no activity could be found. Please first upload an activity or fix the time in the photo.",
                         FlashTypes.DANGER,

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/static/server-side-explorer.js

@@ -44,6 +44,10 @@ let overlay_maps = {
         maxZoom: 19,
         attribution: map_tile_attribution
     }),
+    "Mising": L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=missing`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }),
     "Heatmap": L.tileLayer("/heatmap/tile/{z}/{x}/{y}.png", {
         maxZoom: 19,
         attribution: map_tile_attribution

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/geo_activity_playground/webui/templates/explorer/server-side.html.j2

@@ -42,7 +42,7 @@
     </div>
 </div>
 
-<div class=" row mb-3">
+<div class="row mb-3">
     <div class="col">
         <h2>Tile history</h2>
     </div>
@@ -66,5 +66,42 @@
     </div>
 </div>
 
+<h2 class="mb-3">Tile URLs</h2>
+
+<p>You can use the overlay tiles with other services like <a href="https://bikerouter.de/" target="_blank">Bike
+        Router</a>. See <a href="https://martin-ueding.github.io/geo-activity-playground/using-maps-as-overlays/"
+        target="_blank">the documentation for this feature</a>. For your server, use the following URLs:</p>
+
+<code><pre>
+{{ host_url }}tile/grayscale/{z}/{x}/{y}.png
+{{ host_url }}tile/pastel/{z}/{x}/{y}.png
+{{ host_url }}tile/color/{z}/{x}/{y}.png
+{{ host_url }}tile/inverse_grayscale/{z}/{x}/{y}.png
+</pre></code>
+
+<p>For the explorer tiles, you can use these:</p>
+
+<code><pre>
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=colorful_cluster
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=max_cluster
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=first
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=last
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=visits
+{{ host_url }}explorer/14/tile/{z}/{x}/{y}.png?color_strategy=missing
+
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=colorful_cluster
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=max_cluster
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=first
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=last
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=visits
+{{ host_url }}explorer/17/tile/{z}/{x}/{y}.png?color_strategy=missing
+</pre></code>
+
+<p>And for the heatmap, you can use this:</p>
+
+<code><pre>
+{{ host_url }}heatmap/tile/{z}/{x}/{y}.png
+</pre></code>
+
 {% endif %}
 {% endblock %}

{geo_activity_playground-1.4.1 → geo_activity_playground-1.5.1}/pyproject.toml

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