geo-activity-playground 1.9.3__tar.gz → 1.10.0__tar.gz

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/PKG-INFO

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

geo_activity_playground-1.10.0/geo_activity_playground/alembic/versions/10021d238ada_add_explorer_tile_bookmarks.py

@@ -0,0 +1,32 @@
+from typing import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "10021d238ada"
+down_revision: Union[str, None] = "85fe0348e8a2"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "explorer_tile_bookmarks",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("zoom", sa.Integer(), nullable=False),
+        sa.Column("tile_x", sa.Integer(), nullable=False),
+        sa.Column("tile_y", sa.Integer(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("explorer_tile_bookmarks")
+    # ### end Alembic commands ###

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/core/datamodel.py

@@ -497,3 +497,16 @@ class Photo(DB.Model):
     @property
     def path(self) -> pathlib.Path:
         return pathlib.Path(self.filename)
+
+
+class ExplorerTileBookmark(DB.Model):
+    __tablename__ = "explorer_tile_bookmarks"
+    id: Mapped[int] = mapped_column(primary_key=True)
+
+    name: Mapped[str] = mapped_column(sa.String, nullable=False)
+    zoom: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    tile_x: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+    tile_y: Mapped[int] = mapped_column(sa.Integer, nullable=False)
+
+    def __str__(self) -> str:
+        return f"{self.name} ({self.tile_x}, {self.tile_y}) @ {self.zoom}"

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/core/parametric_plot.py

@@ -66,8 +66,24 @@ GROUP_BY_VARIABLES = {
 VARIABLES_1 = {"": "", **DISCRETE_VARIABLES}
 VARIABLES_2 = {"": "", **DISCRETE_VARIABLES, **CONTINUOUS_VARIABLES}
 
+RENAMES = {
+    "year(start):O": "year(start_local):O",
+    "yearquarter(start)": "yearquarter(start_local)",
+    "yearquartermonth(start)": "yearquartermonth(start_local)",
+    "yearmonth(start)": "yearmonth(start_local)",
+    "quarter(start)": "quarter(start_local)",
+    "quartermonth(start)": "quartermonth(start_local)",
+    "month(start)": "month(start_local)",
+    "date(start)": "date(start_local)",
+    "weekday(start)": "weekday(start_local)",
+}
+
 
 def make_parametric_plot(df: pd.DataFrame, spec: PlotSpec) -> dict[str, str]:
+    # Update renamed fields.
+    for field in spec.FIELDS:
+        setattr(spec, field, RENAMES.get(getattr(spec, field), getattr(spec, field)))
+
     if spec.group_by:
         grouped = df.groupby(spec.group_by)
     else:

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/explorer/tile_visits.py

@@ -76,8 +76,13 @@ class TileHistoryRow(TypedDict):
 class TileEvolutionState:
     def __init__(self) -> None:
         self.num_neighbors: dict[tuple[int, int], int] = {}
+        "Mapping from tile to the number of its neighbors."
+
         self.memberships: dict[tuple[int, int], tuple[int, int]] = {}
+        "Mapping from tile to the representative tile."
         self.clusters: dict[tuple[int, int], list[tuple[int, int]]] = {}
+        "Mapping from representative tile to the list of all cluster members."
+
         self.cluster_evolution = pd.DataFrame()
         self.square_start = 0
         self.cluster_start = 0

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/importers/directory.py

@@ -1,3 +1,4 @@
+import hashlib
 import logging
 import pathlib
 import re
@@ -51,6 +52,17 @@ def import_from_directory(
         is None
     ]
 
+    for activity in DB.session.scalars(
+        sqlalchemy.select(Activity).filter(
+            Activity.upstream_id.is_(sqlalchemy.null()),
+            Activity.path.is_not(sqlalchemy.null()),
+        )
+    ):
+        assert activity.path is not None
+        if pathlib.Path(activity.path).exists():
+            activity.upstream_id = file_sha256(pathlib.Path(activity.path))
+    DB.session.commit()
+
     for i, activity_path in enumerate(
         tqdm(paths_to_import, desc="Importing activity files", delay=0)
     ):
@@ -58,10 +70,24 @@ def import_from_directory(
             activity = DB.session.scalar(
                 sqlalchemy.select(Activity).filter(Activity.path == str(activity_path))
             )
-            if activity is None:
-                import_from_file(
-                    activity_path, repository, tile_visit_accessor, config, i
+            if activity is not None:
+                continue
+
+            with_same_hash = DB.session.scalars(
+                sqlalchemy.select(Activity).filter(
+                    Activity.upstream_id == file_sha256(activity_path)
                 )
+            ).all()
+            if with_same_hash:
+                if len(with_same_hash) == 1:
+                    continue
+                else:
+                    logger.warning(
+                        "The following activities are duplicates: "
+                        + ", ".join(str(activity.id) for activity in with_same_hash)
+                    )
+
+            import_from_file(activity_path, repository, tile_visit_accessor, config, i)
 
 
 def import_from_file(
@@ -87,6 +113,7 @@ def import_from_file(
         return
 
     activity.path = str(path)
+    activity.upstream_id = file_sha256(path)
     if activity.name is None:
         activity.name = path.name.removesuffix("".join(path.suffixes))
 
@@ -120,3 +147,16 @@ def _get_metadata_from_path(
         if m := re.search(regex, str(path.relative_to(ACTIVITY_DIR))):
             return m.groupdict()
     return {}
+
+
+def file_sha256(filename: pathlib.Path) -> str:
+    """
+    Based on https://stackoverflow.com/a/44873382/653152.
+    """
+    h = hashlib.sha256(usedforsecurity=False)
+    b = bytearray(128 * 1024)
+    mv = memoryview(b)
+    with open(filename, "rb", buffering=0) as f:
+        while n := f.readinto(mv):
+            h.update(mv[:n])
+    return h.hexdigest()

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/importers/strava_checkout.py

@@ -19,8 +19,6 @@ from ..core.datamodel import get_or_make_equipment
 from ..core.datamodel import get_or_make_kind
 from ..core.enrichment import update_and_commit
 from ..core.paths import activity_extracted_meta_dir
-from ..core.tasks import get_state
-from ..core.tasks import set_state
 from ..core.tasks import work_tracker_path
 from ..core.tasks import WorkTracker
 from .activity_parsers import ActivityParseError
@@ -132,6 +130,11 @@ EXPECTED_COLUMNS = [
     "Average Grade Adjusted Pace",
     "Timer Time",
     "Total Cycles",
+    "Regeneration",
+    "Mit Haustier",
+    "Wettbewerb",
+    "Langer Lauf",
+    "Für einen guten Zweck",
     "Media",
 ]
 
@@ -161,7 +164,12 @@ def import_from_strava_checkout(config: Config) -> None:
     if header[0] == EXPECTED_COLUMNS[0]:
         dayfirst = False
     elif header[0] == "Aktivitäts-ID":
-        header = EXPECTED_COLUMNS
+        new_header = list(EXPECTED_COLUMNS)
+        if len(new_header) > len(header):
+            new_header = new_header[: len(header)]
+        elif len(new_header) < len(header):
+            new_header += [f"Ignored_{i}" for i in range(len(header) - len(new_header))]
+        header = new_header
         dayfirst = True
     else:
         logger.error(

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/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 Any
 from typing import Optional
 from typing import Union
 
@@ -13,6 +14,7 @@ import matplotlib
 import matplotlib.pyplot as pl
 import numpy as np
 import pandas as pd
+import sqlalchemy
 from flask import Blueprint
 from flask import flash
 from flask import redirect
@@ -26,6 +28,7 @@ from ...core.config import ConfigAccessor
 from ...core.coordinates import Bounds
 from ...core.datamodel import Activity
 from ...core.datamodel import DB
+from ...core.datamodel import ExplorerTileBookmark
 from ...core.raster_map import ImageTransform
 from ...core.raster_map import OSM_TILE_SIZE
 from ...core.raster_map import TileGetter
@@ -237,6 +240,27 @@ def make_explorer_blueprint(
             medians["tile_x"], medians["tile_y"], zoom
         )
 
+        bookmarks: list[dict[str, Any]] = []
+        for bookmark in DB.session.scalars(
+            sqlalchemy.select(ExplorerTileBookmark).where(
+                ExplorerTileBookmark.zoom == zoom
+            )
+        ).all():
+            tile = (bookmark.tile_x, bookmark.tile_y)
+            representative = tile_evolution_state.memberships.get(tile, None)
+            if not representative:
+                continue
+            cluster = tile_evolution_state.clusters.get(representative, None)
+            if not cluster:
+                continue
+            bookmarks.append(
+                {
+                    "name": bookmark.name,
+                    "bbox": geojson_bounding_box_for_tile_collection(cluster, zoom),
+                    "size": len(cluster),
+                }
+            )
+
         context = {
             "center": {
                 "latitude": median_lat,
@@ -263,6 +287,7 @@ def make_explorer_blueprint(
             "square_y": tile_evolution_state.square_y,
             "square_size": tile_evolution_state.max_square_size,
             "max_cluster_size": max(map(len, tile_evolution_state.clusters.values())),
+            "bookmarks": bookmarks,
         }
         return render_template("explorer/server-side.html.j2", **context)
 
@@ -450,6 +475,12 @@ def make_explorer_blueprint(
                         evolution_state.memberships.get(tile_xy, None), []
                     )
                 ),
+                "new_bookmark_url": url_for(
+                    "settings.cluster_bookmark_new",
+                    zoom=zoom,
+                    tile_x=tile_xy[0],
+                    tile_y=tile_xy[1],
+                ),
             }
         else:
             result = {}
@@ -462,10 +493,16 @@ def bounding_box_for_biggest_cluster(
     clusters: Iterable[list[tuple[int, int]]], zoom: int
 ) -> str:
     biggest_cluster = max(clusters, key=lambda members: len(members))
-    min_x = min(x for x, y in biggest_cluster)
-    max_x = max(x for x, y in biggest_cluster)
-    min_y = min(y for x, y in biggest_cluster)
-    max_y = max(y for x, y in biggest_cluster)
+    return geojson_bounding_box_for_tile_collection(biggest_cluster, zoom)
+
+
+def geojson_bounding_box_for_tile_collection(
+    tiles: list[tuple[int, int]], zoom: int
+) -> str:
+    min_x = min(x for x, y in tiles)
+    max_x = max(x for x, y in tiles)
+    min_y = min(y for x, y in tiles)
+    max_y = max(y for x, y in tiles)
     lat_max, lon_min = get_tile_upper_left_lat_lon(min_x, min_y, zoom)
     lat_min, lon_max = get_tile_upper_left_lat_lon(max_x, max_y, zoom)
     return geojson.dumps(

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -18,6 +18,7 @@ from ...core.config import ConfigAccessor
 from ...core.datamodel import Activity
 from ...core.datamodel import DB
 from ...core.datamodel import Equipment
+from ...core.datamodel import ExplorerTileBookmark
 from ...core.datamodel import Kind
 from ...core.datamodel import Tag
 from ...core.enrichment import update_and_commit
@@ -110,6 +111,29 @@ def make_settings_blueprint(
             )
         )
 
+    @blueprint.route("/cluster-bookmarks/new", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def cluster_bookmark_new():
+        if request.method == "POST":
+            bm = ExplorerTileBookmark(
+                name=request.form["name"],
+                zoom=int(request.form["zoom"]),
+                tile_x=int(request.form["tile_x"]),
+                tile_y=int(request.form["tile_y"]),
+            )
+            DB.session.add(bm)
+            DB.session.commit()
+            return redirect(
+                url_for("explorer.server_side", zoom=int(request.form["zoom"]))
+            )
+        else:
+            return render_template(
+                "settings/cluster-bookmarks-new.html.j2",
+                zoom=request.args["zoom"],
+                tile_x=request.args["tile_x"],
+                tile_y=request.args["tile_y"],
+            )
+
     @blueprint.route("/color-schemes", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def color_schemes():

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/webui/static/server-side-explorer.js

@@ -84,6 +84,7 @@ 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>`)
             }
 
             L.popup()
@@ -97,4 +98,8 @@ map.on('click', e => {
 function downloadAs(suffix) {
     bounds = map.getBounds();
     window.location.href = `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
-}
+}
+
+function centerOn(bbox) {
+    map.fitBounds(L.geoJSON(bbox).getBounds())
+}

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/geo_activity_playground/webui/templates/explorer/server-side.html.j2

@@ -24,6 +24,17 @@
     </div>
 </div>
 
+{% 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 ({{
+        max_cluster_size }})</button>
+    {% for bookmark in bookmarks %}
+    <button type="button" class="btn btn-primary" onclick='centerOn({{ bookmark.bbox | safe }})'>{{ bookmark.name }} ({{
+        bookmark.size }})</button>
+    {% endfor %}
+</div>
+{% endif %}
+
 <div class="row mb-3">
     <div class="col">
         <div id="explorer-map" class="mb-1" style="height: 800px;"></div>

geo_activity_playground-1.10.0/geo_activity_playground/webui/templates/settings/cluster-bookmarks-new.html.j2

@@ -0,0 +1,29 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Create Explorer Tile Cluster Bookmark</h1>
+
+<form method="POST">
+    <div class="mb-3">
+        <label for="name" class="form-label">Name</label>
+        <input type="text" class="form-control" id="name" name="name" />
+    </div>
+    <div class="mb-3">
+        <label for="zoom" class="form-label">Zoom</label>
+        <input type="number" class="form-control" id="zoom" name="zoom" value="{{ zoom }}" />
+    </div>
+    <div class="mb-3">
+        <label for="tile_x" class="form-label">Tile X</label>
+        <input type="number" class="form-control" id="tile_x" name="tile_x" value="{{ tile_x }}" />
+    </div>
+    <div class="mb-3">
+        <label for="tile_y" class="form-label">Tile Y</label>
+        <input type="number" class="form-control" id="tile_y" name="tile_y" value="{{ tile_y }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Create</button>
+</form>
+
+
+{% endblock %}

{geo_activity_playground-1.9.3 → geo_activity_playground-1.10.0}/pyproject.toml

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