geo-activity-playground 0.37.0__py3-none-any.whl → 0.38.1__py3-none-any.whl

geo_activity_playground/webui/equipment_blueprint.py

@@ -6,6 +6,7 @@ from flask import render_template
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.summary_stats import get_equipment_use_table
+from geo_activity_playground.webui.plot_util import make_kind_scale
 
 
 def make_equipment_blueprint(
@@ -20,7 +21,7 @@ def make_equipment_blueprint(
         )
 
         equipment_variables = {}
-        for equipment in repository.meta["equipment"].unique():
+        for equipment in equipment_summary["equipment"]:
             selection = repository.meta.loc[repository.meta["equipment"] == equipment]
             total_distances = pd.DataFrame(
                 {
@@ -55,6 +56,11 @@ def make_equipment_blueprint(
                 .encode(
                     alt.X("year(start):O", title="Year"),
                     alt.Y("sum(distance_km)", title="Distance / km"),
+                    alt.Color(
+                        "kind",
+                        scale=make_kind_scale(repository.meta, config),
+                        title="Kind",
+                    ),
                 )
                 .to_json(format="vega")
             )
@@ -67,7 +73,10 @@ def make_equipment_blueprint(
                 )
                 .mark_bar()
                 .encode(
-                    alt.X("kind", title="Kind"),
+                    alt.X(
+                        "kind",
+                        title="Kind",
+                    ),
                     alt.Y("sum(distance_km)", title="Distance / km"),
                 )
                 .to_json(format="vega")
@@ -84,7 +93,7 @@ def make_equipment_blueprint(
 
         variables = {
             "equipment_variables": equipment_variables,
-            "equipment_summary": equipment_summary,
+            "equipment_summary": equipment_summary.to_dict(orient="records"),
         }
 
         return render_template("equipment/index.html.j2", **variables)

geo_activity_playground/webui/explorer/blueprint.py

@@ -4,11 +4,14 @@ from flask import render_template
 from flask import Response
 from flask import url_for
 
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 from geo_activity_playground.webui.explorer.controller import ExplorerController
 
 
 def make_explorer_blueprint(
     explorer_controller: ExplorerController,
+    authenticator: Authenticator,
 ) -> Blueprint:
     blueprint = Blueprint("explorer", __name__, template_folder="templates")
 
@@ -19,6 +22,7 @@ def make_explorer_blueprint(
         )
 
     @blueprint.route("/enable-zoom-level/<zoom>")
+    @needs_authentication(authenticator)
     def enable_zoom_level(zoom: str):
         explorer_controller.enable_zoom_level(int(zoom))
         return redirect(url_for(".map", zoom=zoom))

geo_activity_playground/webui/heatmap/blueprint.py

@@ -9,12 +9,14 @@ 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
 from geo_activity_playground.webui.search_util import search_query_from_form
+from geo_activity_playground.webui.search_util import SearchQueryHistory
 
 
 def make_heatmap_blueprint(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
     config: Config,
+    search_query_history: SearchQueryHistory,
 ) -> Blueprint:
     heatmap_controller = HeatmapController(repository, tile_visit_accessor, config)
     blueprint = Blueprint("heatmap", __name__, template_folder="templates")
@@ -22,6 +24,7 @@ def make_heatmap_blueprint(
     @blueprint.route("/")
     def index():
         query = search_query_from_form(request.args)
+        search_query_history.register_query(query)
         return render_template(
             "heatmap/index.html.j2", **heatmap_controller.render(query)
         )

geo_activity_playground/webui/heatmap/templates/heatmap/index.html.j2

@@ -5,7 +5,7 @@
 <h1 class="mb-3">Heatmap</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail) }}
+    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
 </div>
 
 <div class="row mb-3">

geo_activity_playground/webui/search_blueprint.py

@@ -1,16 +1,22 @@
+import urllib.parse
 from functools import reduce
 
 import dateutil.parser
 from flask import Blueprint
 from flask import flash
+from flask import redirect
 from flask import render_template
 from flask import request
 from flask import Response
 
 from ..core.activities import ActivityRepository
+from geo_activity_playground.core.config import ConfigAccessor
 from geo_activity_playground.core.meta_search import apply_search_query
 from geo_activity_playground.core.meta_search import SearchQuery
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 from geo_activity_playground.webui.search_util import search_query_from_form
+from geo_activity_playground.webui.search_util import SearchQueryHistory
 
 
 def reduce_or(selections):
@@ -21,18 +27,44 @@ def reduce_and(selections):
     return reduce(lambda a, b: a & b, selections)
 
 
-def make_search_blueprint(repository: ActivityRepository) -> Blueprint:
+def make_search_blueprint(
+    repository: ActivityRepository,
+    search_query_history: SearchQueryHistory,
+    authenticator: Authenticator,
+    config_accessor: ConfigAccessor,
+) -> Blueprint:
     blueprint = Blueprint("search", __name__, template_folder="templates")
 
     @blueprint.route("/")
     def index():
         query = search_query_from_form(request.args)
+        search_query_history.register_query(query)
         activities = apply_search_query(repository.meta, query)
 
         return render_template(
             "search/index.html.j2",
-            activities=list(activities.iterrows()),
+            activities=reversed(list(activities.iterrows())),
             query=query.to_jinja(),
         )
 
+    @blueprint.route("/save-search-query")
+    @needs_authentication(authenticator)
+    def save_search_query():
+        query = search_query_from_form(request.args)
+        primitives = query.to_primitives()
+        if primitives not in config_accessor().search_queries_favorites:
+            config_accessor().search_queries_favorites.append(primitives)
+            config_accessor.save()
+        return redirect(urllib.parse.unquote_plus(request.args["redirect"]))
+
+    @blueprint.route("/delete-search-query")
+    @needs_authentication(authenticator)
+    def delete_search_query():
+        query = search_query_from_form(request.args)
+        primitives = query.to_primitives()
+        if primitives in config_accessor().search_queries_favorites:
+            config_accessor().search_queries_favorites.remove(primitives)
+            config_accessor.save()
+        return redirect(urllib.parse.unquote_plus(request.args["redirect"]))
+
     return blueprint

geo_activity_playground/webui/search_util.py

@@ -1,10 +1,11 @@
-import datetime
 from typing import Optional
 
-import dateutil.parser
 from werkzeug.datastructures import MultiDict
 
+from geo_activity_playground.core.config import ConfigAccessor
+from geo_activity_playground.core.meta_search import _parse_date_or_none
 from geo_activity_playground.core.meta_search import SearchQuery
+from geo_activity_playground.webui.authenticator import Authenticator
 
 
 def search_query_from_form(args: MultiDict) -> SearchQuery:
@@ -20,12 +21,44 @@ def search_query_from_form(args: MultiDict) -> SearchQuery:
     return query
 
 
-def _parse_date_or_none(s: Optional[str]) -> Optional[datetime.date]:
-    if not s:
-        return None
-    else:
-        return dateutil.parser.parse(s).date()
-
-
 def _parse_bool(s: str) -> bool:
     return s == "true"
+
+
+class SearchQueryHistory:
+    def __init__(
+        self, config_accessor: ConfigAccessor, authenticator: Authenticator
+    ) -> None:
+        self._config_accessor = config_accessor
+        self._authenticator = authenticator
+
+    def register_query(self, search_query: SearchQuery) -> None:
+        if not self._authenticator.is_authenticated():
+            return
+
+        if not search_query.active:
+            return
+
+        primitives = search_query.to_primitives()
+        while primitives in self._config_accessor().search_queries_last:
+            self._config_accessor().search_queries_last.remove(primitives)
+        self._config_accessor().search_queries_last.append(primitives)
+        while (
+            len(self._config_accessor().search_queries_last)
+            > self._config_accessor().search_queries_num_keep
+        ):
+            self._config_accessor().search_queries_last.pop(0)
+        self._config_accessor.save()
+
+    def prepare_favorites(self) -> list[dict]:
+        return self._prepare_list(self._config_accessor().search_queries_favorites)
+
+    def prepare_last(self) -> list[dict]:
+        return self._prepare_list(self._config_accessor().search_queries_last)
+
+    def _prepare_list(self, l: list[dict]) -> list[tuple[str, dict]]:
+        result = []
+        for elem in l:
+            search_query = SearchQuery.from_primitives(elem)
+            result.append((str(search_query), search_query.to_url_str()))
+        return result

geo_activity_playground/webui/summary_blueprint.py

@@ -13,14 +13,20 @@ from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.meta_search import apply_search_query
 from geo_activity_playground.webui.plot_util import make_kind_scale
 from geo_activity_playground.webui.search_util import search_query_from_form
+from geo_activity_playground.webui.search_util import SearchQueryHistory
 
 
-def make_summary_blueprint(repository: ActivityRepository, config: Config) -> Blueprint:
+def make_summary_blueprint(
+    repository: ActivityRepository,
+    config: Config,
+    search_query_history: SearchQueryHistory,
+) -> Blueprint:
     blueprint = Blueprint("summary", __name__, template_folder="templates")
 
     @blueprint.route("/")
     def index():
         query = search_query_from_form(request.args)
+        search_query_history.register_query(query)
         activities = apply_search_query(repository.meta, query)
 
         kind_scale = make_kind_scale(repository.meta, config)
@@ -63,44 +69,35 @@ def make_summary_blueprint(repository: ActivityRepository, config: Config) -> Bl
 def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
     nominations: dict[int, list[str]] = collections.defaultdict(list)
 
-    i = meta["distance_km"].idxmax()
-    nominations[i].append(f"Greatest distance: {meta.loc[i].distance_km:.1f} km")
+    _nominate_activities_inner(meta, "", nominations)
 
-    i = meta["elapsed_time"].idxmax()
-    nominations[i].append(f"Longest elapsed time: {meta.loc[i].elapsed_time}")
+    for kind, group in meta.groupby("kind"):
+        _nominate_activities_inner(group, f" for {kind}", nominations)
+    for equipment, group in meta.groupby("equipment"):
+        _nominate_activities_inner(group, f" with {equipment}", nominations)
 
-    if "calories" in meta.columns and not pd.isna(meta["calories"]).all():
-        i = meta["calories"].idxmax()
-        nominations[i].append(f"Most calories burnt: {meta.loc[i].calories:.0f} kcal")
+    return nominations
 
-    if "steps" in meta.columns and not pd.isna(meta["steps"]).all():
-        i = meta["steps"].idxmax()
-        nominations[i].append(f"Most steps: {meta.loc[i].steps:.0f}")
 
-    for kind, group in meta.groupby("kind"):
-        for key, text in [
-            (
-                "distance_km",
-                lambda row: f"Greatest distance for {row.kind}: {row.distance_km:.1f} km",
-            ),
-            (
-                "elapsed_time",
-                lambda row: f"Longest elapsed time for {row.kind}: {row.elapsed_time}",
-            ),
-            (
-                "calories",
-                lambda row: f"Most calories burnt for {row.kind}: {row.calories:.0f} kcal",
-            ),
-            ("steps", lambda row: f"Most steps for {row.kind}: {row.steps:.0f}"),
-        ]:
-            if key in group.columns:
-                series = group[key]
-                if not pd.isna(series).all():
-                    i = series.idxmax()
-                    if not pd.isna(i):
-                        nominations[i].append(text(meta.loc[i]))
+def _nominate_activities_inner(
+    meta: pd.DataFrame, title_suffix: str, nominations: dict[int, list[str]]
+) -> None:
+    ratings = [
+        ("distance_km", "Greatest distance", "{:.1f} km"),
+        ("elapsed_time", "Longest elapsed time", "{}"),
+        ("average_speed_moving_kmh", "Highest average moving speed", "{:.1f} km/h"),
+        ("average_speed_elapsed_kmh", "Highest average elapsed speed", "{:.1f} km/h"),
+        ("calories", "Most calories burnt", "{:.0f}"),
+        ("steps", "Most steps", "{:.0f}"),
+        ("elevation_gain", "Largest elevation gain", "{:.0f} m"),
+    ]
 
-    return nominations
+    for variable, title, format_str in ratings:
+        if variable in meta.columns and not pd.isna(meta[variable]).all():
+            i = meta[variable].idxmax()
+            value = meta.loc[i, variable]
+            format_applied = format_str.format(value)
+            nominations[i].append(f"{title}{title_suffix}: {format_applied}")
 
 
 def embellished_activities(meta: pd.DataFrame) -> pd.DataFrame:

geo_activity_playground/webui/templates/eddington/index.html.j2

@@ -5,7 +5,7 @@
 <h1 class="mb-3">Eddington Number</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail) }}
+    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
 </div>
 
 <div class="row mb-3">
@@ -55,7 +55,74 @@
         <p>In a graphical representation, the Eddington number is the distance where the red line intersects with the
             blue area.</p>
 
-        {{ vega_direct("eddington-log", logarithmic_plot) }}
+        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
     </div>
 </div>
+
+<div class="mb-3">
+    <h2 class="mb-3">Eddington number history</h2>
+
+    <p>How did the Eddington number evolve over time?</p>
+
+    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+</div>
+
+<div class="mb-3">
+    <h2 class="mb-3">Yearly Eddington number</h2>
+
+    <p>If we only consider the activities within one calendar year for the Eddington number, we get the following:</p>
+
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Year</th>
+                <th>Eddington number</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for year, eddington in yearly_eddington.items() %}
+            <tr>
+                <td>{{ year }}</td>
+                <td>{{ eddington }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+
+
+<h2 class="mb-3">Eddington number per Week</h2>
+
+<div class="row mb-3">
+    <div class="col-md-8">
+        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+    </div>
+
+    <div class="col-md-4">
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Distance / km</th>
+                    <th>Count</th>
+                    <th>Missing weeks</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in eddington_table_weeks %}
+                <tr>
+                    <td>{{ row['distance_km'] }}</td>
+                    <td>{{ row['total'] }}</td>
+                    <td>{{ row['missing'] }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<div class="row mb-1">
+
+</div>
+
+
 {% endblock %}

geo_activity_playground/webui/templates/search/index.html.j2

@@ -6,17 +6,19 @@
 <h1 class="row mb-3">Activities Overview & Search</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail) }}
+    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
 </div>
 
 <table class="table table-sort table-arrows">
     <thead>
         <tr>
             <th>Name</th>
-            <th>Start</th>
-            <th>Kind</th>
+            <th>Date</th>
             <th class="numeric-sort">Distance</th>
             <th>Elapsed time</th>
+            <th>Speed / km/h</th>
+            <th>Equipment</th>
+            <th>Kind</th>
         </tr>
     </thead>
     <tbody>
@@ -28,9 +30,11 @@
                 {{ activity['start']|dt }}
                 {% endif %}
             </td>
-            <td>{{ activity['kind'] }}</td>
             <td>{{ '%.1f' % activity["distance_km"] }} km</td>
             <td>{{ activity.elapsed_time|td }}</td>
+            <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>
+            <td>{{ activity["equipment"] }}</td>
+            <td>{{ activity['kind'] }}</td>
         </tr>
         {% endfor %}
     </tbody>

geo_activity_playground/webui/templates/search_form.html.j2

@@ -1,5 +1,4 @@
-{% macro search_form(query, equipments_avail, kinds_avail) %}
-
+{% macro search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) %}
 <div class="accordion" id="search_form_accordion">
     <div class="accordion-item">
         <h2 class="accordion-header">
@@ -12,71 +11,106 @@
         <div id="search_form" class="accordion-collapse collapse {{ 'show' if query.active else '' }}"
             data-bs-parent="#search_form_accordion">
             <div class="accordion-body">
-                <form>
-                    <div class="row g-3">
-                        <div class="col-8">
-                            <label for="name" class="form-label">Name</label>
-                            <input type="text" class="form-control" id="name" name="name" value="{{ query.name }}">
-                        </div>
-                        <div class="col-4">
-                            <div class="form-check">
-                                <input class="form-check-input" type="checkbox" name="name_case_sensitive" value="true"
-                                    id="name_case_sensitive" {% if query.name_case_sensitive %} checked {% endif %}>
-                                <label class="form-check-label" for="name_case_sensitive">
-                                    Case sensitive
-                                </label>
-                            </div>
-                        </div>
+                <div class="row">
+                    <div class="col-8">
+                        <form>
+                            <div class="row g-3">
+                                <div class="col-12">
+                                    <label for="name" class="form-label">Name</label>
+                                    <input type="text" class="form-control" id="name" name="name"
+                                        value="{{ query.name }}">
 
-                        <div class="col-6">
-                            <label for="start_begin" class="form-label">After</label>
-                            <input type="date" class="form-control" id="start_begin" name="start_begin"
-                                value="{{ query.start_begin }}">
-                        </div>
-                        <div class="col-6">
-                            <label for="start_end" class="form-label">Until</label>
-                            <input type="date" class="form-control" id="start_end" name="start_end"
-                                value="{{ query.start_end }}">
-                        </div>
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" name="name_case_sensitive"
+                                            value="true" id="name_case_sensitive" {% if query.name_case_sensitive %}
+                                            checked {% endif %}>
+                                        <label class="form-check-label" for="name_case_sensitive">
+                                            Case sensitive
+                                        </label>
+                                    </div>
+                                </div>
 
-                        <div class="col-12">
-                            <label for="" class="form-label">Kind</label>
-                            <div class="form-control">
-                                {% for kind in kinds_avail %}
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="checkbox" name="kind" value="{{ kind }}"
-                                        id="kind_{{ kind }}" {% if kind in query.kind %} checked {% endif %}>
-                                    <label class="form-check-label" for="kind_{{ kind }}">
-                                        {{ kind }}
-                                    </label>
+                                <div class="col-6">
+                                    <label for="start_begin" class="form-label">After</label>
+                                    <input type="date" class="form-control" id="start_begin" name="start_begin"
+                                        value="{{ query.start_begin }}">
+                                </div>
+                                <div class="col-6">
+                                    <label for="start_end" class="form-label">Until</label>
+                                    <input type="date" class="form-control" id="start_end" name="start_end"
+                                        value="{{ query.start_end }}">
+                                </div>
+
+                                <div class="col-12">
+                                    <label for="" class="form-label">Kind</label>
+                                    <div class="form-control">
+                                        {% for kind in kinds_avail %}
+                                        <div class="form-check form-check-inline">
+                                            <input class="form-check-input" type="checkbox" name="kind"
+                                                value="{{ kind }}" id="kind_{{ kind }}" {% if kind in query.kind %}
+                                                checked {% endif %}>
+                                            <label class="form-check-label" for="kind_{{ kind }}">
+                                                {{ kind }}
+                                            </label>
+                                        </div>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+
+                                <div class="col-12">
+                                    <label for="" class="form-label">Equipment</label>
+                                    <div class="form-control">
+                                        {% for equipment in equipments_avail %}
+                                        <div class="form-check form-check-inline">
+                                            <input class="form-check-input" type="checkbox" name="equipment"
+                                                value="{{ equipment }}" id="equipment_{{ equipment }}" {% if equipment
+                                                in query.equipment %} checked {% endif %}>
+                                            <label class="form-check-label" for="equipment_{{ equipment }}">
+                                                {{ equipment }}
+                                            </label>
+                                        </div>
+                                        {% endfor %}
+                                    </div>
                                 </div>
-                                {% endfor %}
-                            </div>
-                        </div>
 
-                        <div class="col-12">
-                            <label for="" class="form-label">Equipment</label>
-                            <div class="form-control">
-                                {% for equipment in equipments_avail %}
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="checkbox" name="equipment"
-                                        value="{{ equipment }}" id="equipment_{{ equipment }}" {% if equipment in
-                                        query.equipment %} checked {% endif %}>
-                                    <label class="form-check-label" for="equipment_{{ equipment }}">
-                                        {{ equipment }}
-                                    </label>
+                                <div class="col-6">
+                                    <button type="submit" class="btn btn-primary">Filter</button>
+                                </div>
+                                <div class="col-6">
+                                    <a class="btn btn-danger" href="?">Reset</a>
                                 </div>
-                                {% endfor %}
                             </div>
-                        </div>
+                        </form>
+                    </div>
+                    <div class="col-4">
+                        <h5 class="mb-3">Favorite queries</h5>
+                        <ul class="mb-3">
+                            {% for description, url_parameters in search_query_favorites %}
+                            {{ _show_search_query(description, url_parameters, True, request_url) }}
+                            {% endfor %}
+                        </ul>
 
-                        <div class="col-12">
-                            <button type="submit" class="btn btn-primary">Filter</button>
-                        </div>
+                        <h5 class="mb-3">Last queries</h5>
+                        <ol class="mb-3">
+                            {% for description, url_parameters in search_query_last %}
+                            {{ _show_search_query(description, url_parameters, False, request_url) }}
+                            {% endfor %}
+                        </ol>
                     </div>
-                </form>
+                </div>
             </div>
         </div>
     </div>
 </div>
+{% endmacro %}
+
+{% macro _show_search_query(description, url_parameters, is_favorite, request_url) %}
+<li>
+    <a href="?{{ url_parameters }}">{{ description }}</a>
+    {% if is_favorite %}
+    <a href="{{ url_for('search.delete_search_query') }}?{{ url_parameters }}&redirect={{ request_url }}">🗑️</a>
+    {% else %}
+    <a href="{{ url_for('search.save_search_query') }}?{{ url_parameters }}&redirect={{ request_url }}">💾</a>
+    {% endif %}
+</li>
 {% endmacro %}

geo_activity_playground/webui/templates/summary/index.html.j2

@@ -6,7 +6,7 @@
 <h1>Summary Statistics</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail) }}
+    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
 </div>
 
 <h2>Distances</h2>