geo-activity-playground 0.35.0__py3-none-any.whl → 0.36.0__py3-none-any.whl

geo_activity_playground/webui/activity/controller.py

@@ -12,8 +12,6 @@ import pandas as pd
 from PIL import Image
 from PIL import ImageDraw
 
-from ...explorer.grid_file import make_grid_file_geojson
-from ...explorer.grid_file import make_grid_points
 from geo_activity_playground.core.activities import ActivityMeta
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import make_geojson_color_line
@@ -21,14 +19,13 @@ 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.config import Config
 from geo_activity_playground.core.heart_rate import HeartRateZoneComputer
-from geo_activity_playground.core.heatmap import build_map_from_tiles_around_center
-from geo_activity_playground.core.heatmap import GeoBounds
-from geo_activity_playground.core.heatmap import OSM_MAX_ZOOM
-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.core.raster_map import map_image_from_tile_bounds
+from geo_activity_playground.core.raster_map import OSM_MAX_ZOOM
+from geo_activity_playground.core.raster_map import OSM_TILE_SIZE
+from geo_activity_playground.core.raster_map import tile_bounds_around_center
+from geo_activity_playground.explorer.grid_file import make_grid_file_geojson
+from geo_activity_playground.explorer.grid_file import make_grid_points
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 
 logger = logging.getLogger(__name__)
@@ -412,62 +409,6 @@ def name_minutes_plot(meta: pd.DataFrame) -> str:
     )
 
 
-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_base(time_series_list: list[pd.DataFrame], config: Config):
     all_time_series = pd.concat(time_series_list)
     tile_x = all_time_series["x"]
@@ -496,13 +437,11 @@ def make_sharepic_base(time_series_list: list[pd.DataFrame], config: Config):
         (tile_yz.max() + tile_yz.min()) / 2,
     )
 
-    background = build_map_from_tiles_around_center(
-        tile_xz_center,
-        zoom,
-        (target_width, target_height),
-        (target_width, target_map_height),
-        config,
+    tile_bounds = tile_bounds_around_center(
+        tile_xz_center, (target_width, target_height - footer_height), zoom
     )
+    tile_bounds.y2 += footer_height / OSM_TILE_SIZE
+    background = map_image_from_tile_bounds(tile_bounds, config)
 
     img = Image.fromarray((background * 255).astype("uint8"), "RGB")
     draw = ImageDraw.Draw(img, mode="RGBA")

geo_activity_playground/webui/app.py

@@ -10,24 +10,28 @@ from flask import Flask
 from flask import render_template
 
 from ..core.activities import ActivityRepository
+from ..core.config import Config
+from ..core.config import ConfigAccessor
 from ..explorer.tile_visits import TileVisitAccessor
 from .activity.blueprint import make_activity_blueprint
+from .activity.controller import ActivityController
+from .auth_blueprint import make_auth_blueprint
+from .authenticator import Authenticator
 from .calendar.blueprint import make_calendar_blueprint
-from .eddington.blueprint import make_eddington_blueprint
+from .calendar.controller import CalendarController
+from .eddington_blueprint import make_eddington_blueprint
 from .entry_controller import EntryController
 from .equipment.blueprint import make_equipment_blueprint
+from .equipment.controller import EquipmentController
 from .explorer.blueprint import make_explorer_blueprint
+from .explorer.controller import ExplorerController
 from .heatmap.blueprint import make_heatmap_blueprint
-from .search.blueprint import make_search_blueprint
-from .square_planner.blueprint import make_square_planner_blueprint
-from .summary.blueprint import make_summary_blueprint
-from .tile.blueprint import make_tile_blueprint
+from .search_blueprint import make_search_blueprint
+from .settings.blueprint import make_settings_blueprint
+from .square_planner_blueprint import make_square_planner_blueprint
+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 Config
-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
 
 
 def route_start(app: Flask, repository: ActivityRepository, config: Config) -> None:
@@ -77,26 +81,32 @@ def web_ui_main(
 
     authenticator = Authenticator(config_accessor())
 
+    config = config_accessor()
+    activity_controller = ActivityController(repository, tile_visit_accessor, config)
+    calendar_controller = CalendarController(repository)
+    equipment_controller = EquipmentController(repository, config)
+    explorer_controller = ExplorerController(
+        repository, tile_visit_accessor, config_accessor
+    )
+
     route_start(app, repository, config_accessor())
 
     app.register_blueprint(make_auth_blueprint(authenticator), url_prefix="/auth")
-
     app.register_blueprint(
-        make_activity_blueprint(
-            repository, tile_visit_accessor, config_accessor(), authenticator
-        ),
+        make_activity_blueprint(activity_controller, repository, authenticator),
         url_prefix="/activity",
     )
-    app.register_blueprint(make_calendar_blueprint(repository), url_prefix="/calendar")
+    app.register_blueprint(
+        make_calendar_blueprint(calendar_controller), url_prefix="/calendar"
+    )
     app.register_blueprint(
         make_eddington_blueprint(repository), url_prefix="/eddington"
     )
     app.register_blueprint(
-        make_equipment_blueprint(repository, config_accessor()), url_prefix="/equipment"
+        make_equipment_blueprint(equipment_controller), url_prefix="/equipment"
     )
     app.register_blueprint(
-        make_explorer_blueprint(repository, tile_visit_accessor, config_accessor),
-        url_prefix="/explorer",
+        make_explorer_blueprint(explorer_controller), url_prefix="/explorer"
     )
     app.register_blueprint(
         make_heatmap_blueprint(repository, tile_visit_accessor, config_accessor()),
@@ -107,7 +117,7 @@ def web_ui_main(
         url_prefix="/settings",
     )
     app.register_blueprint(
-        make_square_planner_blueprint(repository, tile_visit_accessor),
+        make_square_planner_blueprint(tile_visit_accessor),
         url_prefix="/square-planner",
     )
     app.register_blueprint(
@@ -115,10 +125,10 @@ def web_ui_main(
         url_prefix="/search",
     )
     app.register_blueprint(
-        make_summary_blueprint(repository, config_accessor()),
-        url_prefix="/summary",
+        make_summary_blueprint(repository, config), url_prefix="/summary"
     )
-    app.register_blueprint(make_tile_blueprint(config_accessor()), url_prefix="/tile")
+
+    app.register_blueprint(make_tile_blueprint(config), url_prefix="/tile")
     app.register_blueprint(
         make_upload_blueprint(
             repository, tile_visit_accessor, config_accessor(), authenticator

geo_activity_playground/webui/{auth/blueprint.py → auth_blueprint.py}

@@ -4,7 +4,7 @@ from flask import render_template
 from flask import request
 from flask import url_for
 
-from geo_activity_playground.webui.authenticator import Authenticator
+from .authenticator import Authenticator
 
 
 def make_auth_blueprint(authenticator: Authenticator) -> Blueprint:

geo_activity_playground/webui/calendar/blueprint.py

@@ -1,15 +1,12 @@
 from flask import Blueprint
 from flask import render_template
 
-from ...core.activities import ActivityRepository
-from .controller import CalendarController
+from geo_activity_playground.webui.calendar.controller import CalendarController
 
 
-def make_calendar_blueprint(repository: ActivityRepository) -> Blueprint:
+def make_calendar_blueprint(calendar_controller: CalendarController) -> Blueprint:
     blueprint = Blueprint("calendar", __name__, template_folder="templates")
 
-    calendar_controller = CalendarController(repository)
-
     @blueprint.route("/")
     def index():
         return render_template(

geo_activity_playground/webui/{eddington/controller.py → eddington_blueprint.py}

@@ -1,17 +1,19 @@
 import altair as alt
 import numpy as np
 import pandas as pd
+from flask import Blueprint
+from flask import render_template
 
-from ...core.activities import ActivityRepository
+from geo_activity_playground.core.activities import ActivityRepository
 
 
-class EddingtonController:
-    def __init__(self, repository: ActivityRepository) -> None:
-        self._repository = repository
+def make_eddington_blueprint(repository: ActivityRepository) -> Blueprint:
+    blueprint = Blueprint("eddington", __name__, template_folder="templates")
 
-    def render(self) -> dict:
-        activities = self._repository.meta.loc[
-            self._repository.meta["consider_for_achievements"]
+    @blueprint.route("/")
+    def index():
+        activities = repository.meta.loc[
+            repository.meta["consider_for_achievements"]
         ].copy()
         activities["day"] = [start.date() for start in activities["start"]]
 
@@ -67,11 +69,13 @@ class EddingtonController:
             .interactive()
             .to_json(format="vega")
         )
-
-        return {
-            "eddington_number": en,
-            "logarithmic_plot": logarithmic_plot,
-            "eddington_table": eddington.loc[
+        return render_template(
+            "eddington/index.html.j2",
+            eddington_number=en,
+            logarithmic_plot=logarithmic_plot,
+            eddington_table=eddington.loc[
                 (eddington["distance_km"] > en) & (eddington["distance_km"] <= en + 10)
             ].to_dict(orient="records"),
-        }
+        )
+
+    return blueprint

geo_activity_playground/webui/equipment/blueprint.py

@@ -1,18 +1,12 @@
 from flask import Blueprint
 from flask import render_template
 
-from ...core.activities import ActivityRepository
-from .controller import EquipmentController
-from geo_activity_playground.core.config import Config
+from geo_activity_playground.webui.equipment.controller import EquipmentController
 
 
-def make_equipment_blueprint(
-    repository: ActivityRepository, config: Config
-) -> Blueprint:
+def make_equipment_blueprint(equipment_controller: EquipmentController) -> Blueprint:
     blueprint = Blueprint("equipment", __name__, template_folder="templates")
 
-    equipment_controller = EquipmentController(repository, config)
-
     @blueprint.route("/")
     def index():
         return render_template(

geo_activity_playground/webui/explorer/blueprint.py

@@ -4,20 +4,12 @@ from flask import render_template
 from flask import Response
 from flask import url_for
 
-from ...core.activities import ActivityRepository
-from ...explorer.tile_visits import TileVisitAccessor
-from .controller import ExplorerController
-from geo_activity_playground.core.config import ConfigAccessor
+from geo_activity_playground.webui.explorer.controller import ExplorerController
 
 
 def make_explorer_blueprint(
-    repository: ActivityRepository,
-    tile_visit_accessor: TileVisitAccessor,
-    config_accessor: ConfigAccessor,
+    explorer_controller: ExplorerController,
 ) -> Blueprint:
-    explorer_controller = ExplorerController(
-        repository, tile_visit_accessor, config_accessor
-    )
     blueprint = Blueprint("explorer", __name__, template_folder="templates")
 
     @blueprint.route("/<zoom>")

geo_activity_playground/webui/heatmap/blueprint.py

@@ -1,12 +1,13 @@
+import dateutil.parser
 from flask import Blueprint
 from flask import render_template
 from flask import request
 from flask import Response
 
-from ...core.activities import ActivityRepository
-from ...explorer.tile_visits import TileVisitAccessor
-from .heatmap_controller import HeatmapController
+from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.config import Config
+from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
+from geo_activity_playground.webui.heatmap.heatmap_controller import HeatmapController
 
 
 def make_heatmap_blueprint(
@@ -21,21 +22,46 @@ def make_heatmap_blueprint(
     def index():
         return render_template(
             "heatmap/index.html.j2",
-            **heatmap_controller.render(request.args.getlist("kind"))
+            **heatmap_controller.render(
+                [int(k) for k in request.args.getlist("kind")],
+                request.args.get(
+                    "date-start", type=dateutil.parser.parse, default=None
+                ),
+                request.args.get("date-end", type=dateutil.parser.parse, default=None),
+            )
         )
 
-    @blueprint.route("/tile/<z>/<x>/<y>/<kinds>.png")
-    def tile(x: str, y: str, z: str, kinds: str):
+    @blueprint.route("/tile/<int:z>/<int:x>/<int:y>.png")
+    def tile(x: int, y: int, z: int):
         return Response(
-            heatmap_controller.render_tile(int(x), int(y), int(z), kinds.split(";")),
+            heatmap_controller.render_tile(
+                x,
+                y,
+                z,
+                [int(k) for k in request.args.getlist("kind")],
+                request.args.get(
+                    "date-start", type=dateutil.parser.parse, default=None
+                ),
+                request.args.get("date-end", type=dateutil.parser.parse, default=None),
+            ),
             mimetype="image/png",
         )
 
-    @blueprint.route("/download/<north>/<east>/<south>/<west>/<kinds>")
-    def download(north: str, east: str, south: str, west: str, kinds: str):
+    @blueprint.route(
+        "/download/<float:north>/<float:east>/<float:south>/<float:west>/heatmap.png"
+    )
+    def download(north: float, east: float, south: float, west: float):
         return Response(
             heatmap_controller.download_heatmap(
-                float(north), float(east), float(south), float(west), kinds.split(";")
+                north,
+                east,
+                south,
+                west,
+                [int(k) for k in request.args.getlist("kind")],
+                request.args.get(
+                    "date-start", type=dateutil.parser.parse, default=None
+                ),
+                request.args.get("date-end", type=dateutil.parser.parse, default=None),
             ),
             mimetype="image/png",
             headers={"Content-disposition": 'attachment; filename="heatmap.png"'},