geo-activity-playground 0.23.0__py3-none-any.whl → 0.24.1__py3-none-any.whl

geo_activity_playground/webui/activity/blueprint.py

@@ -0,0 +1,58 @@
+import urllib.parse
+from collections.abc import Collection
+
+from flask import Blueprint
+from flask import render_template
+from flask import Response
+
+from ...core.activities import ActivityRepository
+from ...explorer.tile_visits import TileVisitAccessor
+from .controller import ActivityController
+from geo_activity_playground.core.privacy_zones import PrivacyZone
+
+
+def make_activity_blueprint(
+    repository: ActivityRepository,
+    tile_visit_accessor: TileVisitAccessor,
+    privacy_zones: Collection[PrivacyZone],
+) -> Blueprint:
+    blueprint = Blueprint("activity", __name__, template_folder="templates")
+
+    activity_controller = ActivityController(
+        repository, tile_visit_accessor, privacy_zones
+    )
+
+    @blueprint.route("/all")
+    def all():
+        return render_template(
+            "activity/lines.html.j2", **activity_controller.render_all()
+        )
+
+    @blueprint.route("/<id>")
+    def show(id: str):
+        return render_template(
+            "activity/show.html.j2", **activity_controller.render_activity(int(id))
+        )
+
+    @blueprint.route("/<id>/sharepic.png")
+    def sharepic(id: str):
+        return Response(
+            activity_controller.render_sharepic(int(id)),
+            mimetype="image/png",
+        )
+
+    @blueprint.route("/day/<year>/<month>/<day>")
+    def day(year: str, month: str, day: str):
+        return render_template(
+            "activity/day.html.j2",
+            **activity_controller.render_day(int(year), int(month), int(day))
+        )
+
+    @blueprint.route("/name/<name>")
+    def name(name: str):
+        return render_template(
+            "activity/name.html.j2",
+            **activity_controller.render_name(urllib.parse.unquote(name))
+        )
+
+    return blueprint

geo_activity_playground/webui/{activity_controller.py → activity/controller.py}

@@ -2,7 +2,8 @@ import datetime
 import functools
 import io
 import logging
-import pickle
+import re
+from collections.abc import Collection
 
 import altair as alt
 import geojson
@@ -12,7 +13,9 @@ import numpy as np
 import pandas as pd
 from PIL import Image
 from PIL import ImageDraw
+from PIL import ImageFont
 
+from geo_activity_playground.core.activities import ActivityMeta
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import extract_heart_rate_zones
 from geo_activity_playground.core.activities import make_geojson_color_line
@@ -20,18 +23,29 @@ from geo_activity_playground.core.activities import make_geojson_from_time_serie
 from geo_activity_playground.core.activities import make_speed_color_bar
 from geo_activity_playground.core.heatmap import add_margin_to_geo_bounds
 from geo_activity_playground.core.heatmap import build_map_from_tiles
-from geo_activity_playground.core.heatmap import crop_image_to_bounds
+from geo_activity_playground.core.heatmap import GeoBounds
 from geo_activity_playground.core.heatmap import get_bounds
 from geo_activity_playground.core.heatmap import get_sensible_zoom_level
 from geo_activity_playground.core.heatmap import OSM_TILE_SIZE
+from geo_activity_playground.core.heatmap import PixelBounds
+from geo_activity_playground.core.heatmap import TileBounds
+from geo_activity_playground.core.privacy_zones import PrivacyZone
 from geo_activity_playground.core.tiles import compute_tile_float
+from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 
 logger = logging.getLogger(__name__)
 
 
 class ActivityController:
-    def __init__(self, repository: ActivityRepository) -> None:
+    def __init__(
+        self,
+        repository: ActivityRepository,
+        tile_visit_accessor: TileVisitAccessor,
+        privacy_zones: Collection[PrivacyZone],
+    ) -> None:
         self._repository = repository
+        self._tile_visit_accessor = tile_visit_accessor
+        self._privacy_zones = privacy_zones
 
     @functools.lru_cache()
     def render_activity(self, id: int) -> dict:
@@ -47,6 +61,14 @@ class ActivityController:
         similar_activities = [row for _, row in similar_activities.iterrows()]
         similar_activities.reverse()
 
+        new_tiles = {
+            zoom: sum(
+                self._tile_visit_accessor.histories[zoom]["activity_id"]
+                == activity["id"]
+            )
+            for zoom in [14, 17]
+        }
+
         result = {
             "activity": activity,
             "line_json": line_json,
@@ -56,8 +78,9 @@ class ActivityController:
             "speed_distribution_plot": speed_distribution_plot(time_series),
             "similar_activites": similar_activities,
             "speed_color_bar": make_speed_color_bar(time_series),
-            "date": activity.start.date(),
-            "time": activity.start.time(),
+            "date": activity["start"].date(),
+            "time": activity["start"].time(),
+            "new_tiles": new_tiles,
         }
         if (heart_zones := extract_heart_rate_zones(time_series)) is not None:
             result["heart_zones_plot"] = heartrate_zone_plot(heart_zones)
@@ -68,8 +91,13 @@ class ActivityController:
         return result
 
     def render_sharepic(self, id: int) -> bytes:
+        activity = self._repository.get_activity_by_id(id)
         time_series = self._repository.get_time_series(id)
-        return make_sharepic(time_series)
+        for privacy_zone in self._privacy_zones:
+            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)
 
     def render_day(self, year: int, month: int, day: int) -> dict:
         meta = self._repository.meta
@@ -110,6 +138,8 @@ class ActivityController:
             "activities": activities_list,
             "geojson": geojson.dumps(fc),
             "date": datetime.date(year, month, day).isoformat(),
+            "total_distance": activities_that_day["distance_km"].sum(),
+            "total_elapsed_time": activities_that_day["elapsed_time"].sum(),
         }
 
     def render_all(self) -> dict:
@@ -322,17 +352,83 @@ def name_minutes_plot(meta: pd.DataFrame) -> str:
     )
 
 
-def make_sharepic(time_series: pd.DataFrame) -> bytes:
+def make_pixel_bounds_square(bounds: PixelBounds) -> PixelBounds:
+    x_radius = (bounds.x_max - bounds.x_min) // 2
+    y_radius = (bounds.y_max - bounds.y_min) // 2
+    x_center = (bounds.x_max + bounds.x_min) // 2
+    y_center = (bounds.y_max + bounds.y_min) // 2
+
+    radius = max(x_radius, y_radius)
+
+    return PixelBounds(
+        x_min=x_center - radius,
+        y_min=y_center - radius,
+        x_max=x_center + radius,
+        y_max=y_center + radius,
+    )
+
+
+def make_tile_bounds_square(bounds: TileBounds) -> TileBounds:
+    x_radius = (bounds.x_tile_max - bounds.x_tile_min) / 2
+    y_radius = (bounds.y_tile_max - bounds.y_tile_min) / 2
+    x_center = (bounds.x_tile_max + bounds.x_tile_min) / 2
+    y_center = (bounds.y_tile_max + bounds.y_tile_min) / 2
+
+    radius = max(x_radius, y_radius)
+
+    return TileBounds(
+        zoom=bounds.zoom,
+        x_tile_min=int(x_center - radius),
+        y_tile_min=int(y_center - radius),
+        x_tile_max=int(np.ceil(x_center + radius)),
+        y_tile_max=int(np.ceil(y_center + radius)),
+    )
+
+
+def get_crop_mask(geo_bounds: GeoBounds, tile_bounds: TileBounds) -> PixelBounds:
+    min_x, min_y = compute_tile_float(
+        geo_bounds.lat_max, geo_bounds.lon_min, tile_bounds.zoom
+    )
+    max_x, max_y = compute_tile_float(
+        geo_bounds.lat_min, geo_bounds.lon_max, tile_bounds.zoom
+    )
+
+    crop_mask = PixelBounds(
+        int((min_x - tile_bounds.x_tile_min) * OSM_TILE_SIZE),
+        int((max_x - tile_bounds.x_tile_min) * OSM_TILE_SIZE),
+        int((min_y - tile_bounds.y_tile_min) * OSM_TILE_SIZE),
+        int((max_y - tile_bounds.y_tile_min) * OSM_TILE_SIZE),
+    )
+    crop_mask = make_pixel_bounds_square(crop_mask)
+
+    return crop_mask
+
+
+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:
     lat_lon_data = np.array([time_series["latitude"], time_series["longitude"]]).T
 
     geo_bounds = get_bounds(lat_lon_data)
     geo_bounds = add_margin_to_geo_bounds(geo_bounds)
     tile_bounds = get_sensible_zoom_level(geo_bounds, (1500, 1500))
+    tile_bounds = make_tile_bounds_square(tile_bounds)
     background = build_map_from_tiles(tile_bounds)
     # background = convert_to_grayscale(background)
 
-    img = Image.new("RGB", tile_bounds.shape[::-1])
-    draw = ImageDraw.Draw(img)
+    crop_mask = get_crop_mask(geo_bounds, tile_bounds)
+    assert pixels_in_bounds(crop_mask) <= 10_000_000, crop_mask
+
+    background = background[
+        crop_mask.y_min : crop_mask.y_max,
+        crop_mask.x_min : crop_mask.x_max,
+        :,
+    ]
+
+    img = Image.fromarray((background * 255).astype("uint8"), "RGB")
+    draw = ImageDraw.Draw(img, mode="RGBA")
 
     for _, group in time_series.groupby("segment_id"):
         xs, ys = compute_tile_float(
@@ -340,24 +436,38 @@ def make_sharepic(time_series: pd.DataFrame) -> bytes:
         )
         yx = list(
             (
-                int((x - tile_bounds.x_tile_min) * OSM_TILE_SIZE),
-                int((y - tile_bounds.y_tile_min) * OSM_TILE_SIZE),
+                int((x - tile_bounds.x_tile_min) * OSM_TILE_SIZE - crop_mask.x_min),
+                int((y - tile_bounds.y_tile_min) * OSM_TILE_SIZE - crop_mask.y_min),
             )
             for x, y in zip(xs, ys)
         )
 
         draw.line(yx, fill="red", width=4)
 
-    aimg = np.array(img) / 255
+    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']}"),
+    ]
+    if activity["calories"] and not pd.isna(activity["calories"]):
+        facts.append(f"{activity['calories']:.0f} kcal")
+    if activity["steps"] and not pd.isna(activity["steps"]):
+        facts.append(f"{activity['steps']:.0f} steps")
+
+    draw.text((35, img.height - 70 + 10), "      ".join(facts), font_size=20)
 
-    weight = np.dstack([aimg[:, :, 0]] * 3)
+    # img_array = np.array(img) / 255
 
-    background = (1 - weight) * background + aimg
-    background[background > 1.0] = 1.0
-    background[background < 0.0] = 0.0
+    # weight = np.dstack([img_array[:, :, 0]] * 3)
 
-    background = crop_image_to_bounds(background, geo_bounds, tile_bounds)
+    # background = (1 - weight) * background + img_array
+    # background[background > 1.0] = 1.0
+    # background[background < 0.0] = 0.0
 
     f = io.BytesIO()
-    pl.imsave(f, background, format="png")
+    img.save(f, format="png")
+    # pl.imsave(f, background, format="png")
     return bytes(f.getbuffer())

geo_activity_playground/webui/{templates/activity-day.html.j2 → activity/templates/activity/day.html.j2}

@@ -29,7 +29,8 @@
     <div class="col-md-3">
         <ol>
             {% for activity in activities %}
-            <li><span style="color: {{ activity['color'] }};">█</span> <a href="/activity/{{ activity.id }}">{{
+            <li><span style="color: {{ activity['color'] }};">█</span> <a
+                    href="{{ url_for('activity.show', id=activity.id) }}">{{
                     activity.name }}</a></li>
             {% endfor %}
         </ol>
@@ -54,7 +55,8 @@
             <tbody>
                 {% for activity in activities %}
                 <tr>
-                    <td><span style="color: {{ activity['color'] }};">█</span> <a href="/activity/{{ activity.id }}">{{
+                    <td><span style="color: {{ activity['color'] }};">█</span> <a
+                            href="{{ url_for('activity.show', id=activity.id) }}">{{
                             activity.name }}</a></td>
                     <td>{{ activity.start }}</td>
                     <td>{{ activity.distance_km | round(1) }}</td>
@@ -63,6 +65,16 @@
                     <td>{{ activity["kind"] }}</td>
                 </tr>
                 {% endfor %}
+                {% if activities|length > 1 %}
+                <tr>
+                    <td><b>Total</b></td>
+                    <td></td>
+                    <td><b>{{ total_distance | round(1) }}</b></td>
+                    <td><b>{{ total_elapsed_time }}</b></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                {% endif %}
             </tbody>
         </table>
     </div>

geo_activity_playground/webui/{templates/activity-name.html.j2 → activity/templates/activity/name.html.j2}

@@ -64,7 +64,7 @@
             <tbody>
                 {% for activity in activities %}
                 <tr>
-                    <td><span style="color: {{ activity['color'] }};">█</span> <a href="/activity/{{ activity.id }}">{{
+                    <td><span style="color: {{ activity['color'] }};">█</span> <a href="{{ url_for('activity.show', id=activity.id) }}">{{
                             activity.name }}</a></td>
                     <td>{{ activity.start }}</td>
                     <td>{{ activity.distance_km | round(1) }}</td>

geo_activity_playground/webui/{templates/activity.html.j2 → activity/templates/activity/show.html.j2}

@@ -21,7 +21,8 @@
             <dt>Elapsed time</dt>
             <dd>{{ activity.elapsed_time }}</dd>
             <dt>Start time</dt>
-            <dd><a href="/activity/day/{{ date.year }}/{{ date.month }}/{{ date.day }}">{{ date }}</a> {{ time }}
+            <dd><a href="{{ url_for('activity.day', year=date.year, month=date.month, day=date.day) }}">{{ date }}</a>
+                {{ time }}
             </dd>
             <dt>Calories</dt>
             <dd>{{ activity.calories }}</dd>
@@ -29,6 +30,10 @@
             <dd>{{ activity.steps }}</dd>
             <dt>Equipment</dt>
             <dd>{{ activity.equipment }}</dd>
+            <dt>New Explorer Tiles</dt>
+            <dd>{{ new_tiles[14] }}</dd>
+            <dt>New Squadratinhos</dt>
+            <dd>{{ new_tiles[17] }}</dd>
             <dt>ID</dt>
             <dd>{{ activity.id }}</dd>
             <dt>Source path</dt>
@@ -126,7 +131,7 @@
     <div class="col">
         <h2>Share picture</h2>
 
-        <img src="/activity/{{ activity.id }}/sharepic.png" />
+        <img src="{{ url_for('.sharepic', id=activity.id) }}" />
     </div>
 </div>
 
@@ -135,7 +140,7 @@
     <div class="col">
         <h2>Activities with the same name</h2>
 
-        <p><a href="/activity/name/{{ activity['name']|urlencode() }}">Overview over these activities</a></p>
+        <p><a href="{{ url_for('.name', name=activity['name']) }}">Overview over these activities</a></p>
 
         <table class="table">
             <thead>
@@ -150,7 +155,7 @@
             <tbody>
                 {% for other_activity in similar_activites %}
                 <tr>
-                    <td><a href="/activity/{{ other_activity.id }}">{{ other_activity.start
+                    <td><a href="{{ url_for('.show', id=other_activity.id) }}">{{ other_activity.start
                             }}</a></td>
                     <td>{{ other_activity.distance_km | round(1) }}</td>
                     <td>{{ other_activity.elapsed_time }}</td>