geo-activity-playground 1.0.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

geo_activity_playground/webui/blueprints/summary_blueprint.py

@@ -1,4 +1,3 @@
-import collections
 import datetime
 
 import altair as alt
@@ -9,224 +8,41 @@ from flask import render_template
 from flask import request
 
 from ...core.activities import ActivityRepository
-from ...core.activities import make_geojson_from_time_series
 from ...core.config import Config
 from ...core.datamodel import DB
 from ...core.datamodel import PlotSpec
 from ...core.meta_search import apply_search_query
 from ...core.parametric_plot import make_parametric_plot
-from ..columns import column_distance
-from ..columns import column_elevation_gain
 from ..columns import ColumnDescription
+from ..columns import META_COLUMNS
 from ..plot_util import make_kind_scale
 from ..search_util import search_query_from_form
 from ..search_util import SearchQueryHistory
 
 
-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)
-        df = activities
-
-        nominations = nominate_activities(df)
-
-        return render_template(
-            "summary/index.html.j2",
-            plot_distance_heatmaps=plot_heatmaps(df, column_distance, config),
-            plot_elevation_gain_heatmaps=plot_heatmaps(
-                df, column_elevation_gain, config
-            ),
-            plot_monthly_distance=plot_monthly_sums(df, column_distance, kind_scale),
-            plot_monthly_elevation_gain=plot_monthly_sums(
-                df, column_elevation_gain, kind_scale
-            ),
-            plot_yearly_distance=plot_yearly_sums(df, column_distance, kind_scale),
-            plot_yearly_elevation_gain=plot_yearly_sums(
-                df, column_elevation_gain, kind_scale
-            ),
-            plot_year_cumulative=plot_year_cumulative(df, column_distance),
-            plot_year_elevation_gain_cumulative=plot_year_cumulative(
-                df, column_elevation_gain
-            ),
-            tabulate_year_kind_mean=tabulate_year_kind_mean(df, column_distance)
-            .reset_index()
-            .to_dict(orient="split"),
-            tabulate_year_kind_mean_elevation_gain=tabulate_year_kind_mean(
-                df, column_elevation_gain
-            )
-            .reset_index()
-            .to_dict(orient="split"),
-            plot_weekly_distance=plot_weekly_sums(df, column_distance, kind_scale),
-            plot_weekly_elevation_gain=plot_weekly_sums(
-                df, column_elevation_gain, kind_scale
-            ),
-            nominations=[
-                (
-                    repository.get_activity_by_id(activity_id),
-                    reasons,
-                    make_geojson_from_time_series(
-                        repository.get_time_series(activity_id)
-                    ),
-                )
-                for activity_id, reasons in nominations.items()
-            ],
-            query=query.to_jinja(),
-            custom_plots=[
-                (spec, make_parametric_plot(repository.meta, spec))
-                for spec in DB.session.scalars(sqlalchemy.select(PlotSpec)).all()
-            ],
-        )
-
-    return blueprint
-
-
-def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
-    nominations: dict[int, list[str]] = collections.defaultdict(list)
-
-    _nominate_activities_inner(meta, "", nominations)
-
-    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)
-
-    return nominations
-
-
-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"),
-    ]
-
-    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 plot_heatmaps(
-    meta: pd.DataFrame, column: ColumnDescription, config: Config
-) -> dict[int, str]:
-    return {
-        year: alt.Chart(
-            meta.loc[(meta["year"] == year)],
-            title=f"Daily {column.display_name} Heatmap",
-        )
-        .mark_rect()
-        .encode(
-            alt.X("date(start):O", title="Day of month"),
-            alt.Y(
-                "yearmonth(start):O",
-                # scale=alt.Scale(reverse=True),
-                title="Year and month",
-            ),
-            alt.Color(
-                f"sum({column.name})",
-                scale=alt.Scale(scheme=config.color_scheme_for_counts),
-            ),
-            [
-                alt.Tooltip("yearmonthdate(start)", title="Date"),
-                alt.Tooltip(
-                    f"sum({column.name})",
-                    format=column.format,
-                    title=f"Total {column.display_name} / {column.unit}",
-                ),
-                alt.Tooltip(f"count({column.name})", title="Number of activities"),
-            ],
-        )
-        .to_json(format="vega")
-        for year in sorted(meta["year"].unique())
-    }
-
-
-def plot_monthly_sums(
-    meta: pd.DataFrame, column: ColumnDescription, kind_scale: alt.Scale
-) -> str:
+def plot_per_year_per_kind(df: pd.DataFrame, column: ColumnDescription) -> str:
     return (
         alt.Chart(
-            meta.loc[
-                (
-                    meta["start"]
-                    >= pd.to_datetime(
-                        datetime.datetime.now() - datetime.timedelta(days=2 * 365)
-                    )
-                )
-            ],
-            title=f"Monthly {column.display_name}",
+            df,
+            title=f"{column.display_name} per Year",
         )
         .mark_bar()
         .encode(
-            alt.X("month(start)", title="Month"),
+            alt.X("year:O", title="Year"),
             alt.Y(
-                f"sum({column.name})",
-                title=f"{column.display_name} / {column.unit}",
+                f"sum({column.name})", title=f"{column.display_name} / {column.unit}"
             ),
-            alt.Color("kind", scale=kind_scale, title="Kind"),
-            alt.Column("year(start):O", title="Year"),
+            alt.Color("kind", title="Kind"),
             [
-                alt.Tooltip("yearmonth(start)", title="Year and Month"),
+                alt.Tooltip("year", title="Year"),
                 alt.Tooltip("kind", title="Kind"),
                 alt.Tooltip(
                     f"sum({column.name})",
-                    format=column.format,
-                    title=f"Total {column.display_name} / {column.unit}",
-                ),
-                alt.Tooltip(f"count({column.name})", title="Number of activities"),
-            ],
-        )
-        .resolve_axis(x="independent")
-        .to_json(format="vega")
-    )
-
-
-def plot_yearly_sums(
-    df: pd.DataFrame, column: ColumnDescription, kind_scale: alt.Scale
-) -> str:
-    year_kind_total = (
-        df[["year", "kind", column.name, "hours"]]
-        .groupby(["year", "kind"])
-        .sum()
-        .reset_index()
-    )
-
-    return (
-        alt.Chart(year_kind_total, title=f"Total {column.display_name} per Year")
-        .mark_bar()
-        .encode(
-            alt.X("year:O", title="Year"),
-            alt.Y(column.name, title=f"{column.display_name} / {column.unit}"),
-            alt.Color("kind", scale=kind_scale, title="Kind"),
-            [
-                alt.Tooltip("year:O", title="Year"),
-                alt.Tooltip("kind", title="Kind"),
-                alt.Tooltip(
-                    column.name,
                     title=f"{column.display_name} / {column.unit}",
-                    format=column.format,
                 ),
             ],
         )
+        .interactive()
         .to_json(format="vega")
     )
 
@@ -250,7 +66,6 @@ def plot_year_cumulative(df: pd.DataFrame, column: ColumnDescription) -> str:
     return (
         alt.Chart(
             year_cumulative,
-            width=500,
             title=f"Cumulative {column.display_name} per Year",
         )
         .mark_line()
@@ -273,65 +88,124 @@ def plot_year_cumulative(df: pd.DataFrame, column: ColumnDescription) -> str:
     )
 
 
-def tabulate_year_kind_mean(
-    df: pd.DataFrame, column: ColumnDescription
-) -> pd.DataFrame:
-    year_kind_mean = (
-        df[["year", "kind", column.name, "hours"]]
-        .groupby(["year", "kind"])
-        .mean()
-        .reset_index()
-    )
-
-    year_kind_mean_distance = year_kind_mean.pivot(
-        index="year", columns="kind", values=column.name
-    )
-
-    return year_kind_mean_distance
-
-
-def plot_weekly_sums(
-    df: pd.DataFrame, column: ColumnDescription, kind_scale: alt.Scale
-) -> str:
-    week_kind_total_distance = (
-        df[["iso_year", "week", "kind", column.name]]
-        .groupby(["iso_year", "week", "kind"])
-        .sum()
-        .reset_index()
-    )
-    week_kind_total_distance["year_week"] = [
-        f"{year}-{week:02d}"
-        for year, week in zip(
-            week_kind_total_distance["iso_year"], week_kind_total_distance["week"]
+def plot_per_iso_week(df: pd.DataFrame, column: ColumnDescription) -> str:
+    return (
+        alt.Chart(
+            df,
+            title=f"{column.display_name} per Week",
         )
-    ]
+        .mark_circle()
+        .encode(
+            alt.X("week:O", title="ISO Week"),
+            alt.Y("iso_year:O", title="ISO Year"),
+            alt.Size(
+                f"sum({column.name})", title=f"{column.display_name} / {column.unit}"
+            ),
+            [
+                alt.Tooltip("iso_year", title="ISO Year"),
+                alt.Tooltip("week", title="ISO Week"),
+                alt.Tooltip(
+                    f"sum({column.name})",
+                    title=f"{column.display_name} / {column.unit}",
+                    format=column.format,
+                ),
+            ],
+        )
+        .interactive()
+        .to_json(format="vega")
+    )
 
-    last_year = week_kind_total_distance["iso_year"].iloc[-1]
-    last_week = week_kind_total_distance["week"].iloc[-1]
 
+def heatmap_per_day(df: pd.DataFrame, column: ColumnDescription) -> str:
     return (
         alt.Chart(
-            week_kind_total_distance.loc[
-                (week_kind_total_distance["iso_year"] == last_year)
-                | (week_kind_total_distance["iso_year"] == last_year - 1)
-                & (week_kind_total_distance["week"] >= last_week)
-            ],
-            title=f"Weekly {column.display_name}",
+            _filter_past_year(df),
+            title=f"{column.display_name} per day",
         )
-        .mark_bar()
+        .mark_rect()
         .encode(
-            alt.X("year_week", title="Year and Week"),
-            alt.Y(column.name, title=f"{column.display_name} / {column.unit}"),
-            alt.Color("kind", scale=kind_scale, title="Kind"),
+            alt.X("iso_year_week:O", title="ISO Year and Week"),
+            alt.Y(
+                "iso_day:O",
+                # scale=alt.Scale(
+                #     domain=list(range(1, 8)),
+                #     range=[
+                #         "Monday",
+                #         "Tuesday",
+                #         "Wednesday",
+                #         "Thursday",
+                #         "Friday",
+                #         "Saturday",
+                #         "Sunday",
+                #     ],
+                # ),
+                title="ISO Weekday",
+            ),
+            alt.Color(
+                f"sum({column.name})",
+                scale=alt.Scale(scheme="viridis"),
+                title=f"{column.display_name} / {column.unit}",
+            ),
             [
-                alt.Tooltip("year_week", title="Year and Week"),
-                alt.Tooltip("kind", title="Kind"),
+                alt.Tooltip("iso_year_week", title="ISO Year and Week"),
+                alt.Tooltip("iso_day", title="ISO Day"),
                 alt.Tooltip(
-                    column.name,
+                    f"sum({column.name})",
                     title=f"{column.display_name} / {column.unit}",
                     format=column.format,
                 ),
             ],
         )
+        .interactive()
         .to_json(format="vega")
     )
+
+
+def _filter_past_year(df: pd.DataFrame) -> pd.DataFrame:
+    now = datetime.datetime.combine(datetime.date.today(), datetime.time.min)
+    start = now - datetime.timedelta(days=365)
+    return df.loc[df["start"] >= start]
+
+
+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)
+        df = activities
+
+        return render_template(
+            "summary/index.html.j2",
+            query=query.to_jinja(),
+            custom_plots=[
+                (spec, make_parametric_plot(repository.meta, spec))
+                for spec in DB.session.scalars(sqlalchemy.select(PlotSpec)).all()
+            ],
+            plot_per_year_per_kind={
+                column.display_name: plot_per_year_per_kind(df, column)
+                for column in META_COLUMNS
+            },
+            plot_per_year_cumulative={
+                column.display_name: plot_year_cumulative(df, column)
+                for column in META_COLUMNS
+            },
+            plot_per_iso_week={
+                column.display_name: plot_per_iso_week(df, column)
+                for column in META_COLUMNS
+            },
+            heatmap_per_day={
+                column.display_name: heatmap_per_day(df, column)
+                for column in META_COLUMNS
+            },
+        )
+
+    return blueprint

geo_activity_playground/webui/columns.py

@@ -15,19 +15,44 @@ column_distance = ColumnDescription(
     unit="km",
     format=".1f",
 )
-
-column_elevation = ColumnDescription(
-    name="elevation",
-    display_name="Elevation",
-    unit="m",
-    format=".0f",
-)
 column_elevation_gain = ColumnDescription(
     name="elevation_gain",
     display_name="Elevation Gain",
     unit="m",
     format=".0f",
 )
+column_hours = ColumnDescription(
+    name="hours",
+    display_name="Elapsed time",
+    unit="h",
+    format=".1f",
+)
+column_hours_moving = ColumnDescription(
+    name="hours_moving",
+    display_name="Moving time",
+    unit="h",
+    format=".1f",
+)
+column_calories = ColumnDescription(
+    name="calories",
+    display_name="Energy",
+    unit="kcal",
+    format=".1f",
+)
+column_steps = ColumnDescription(
+    name="steps",
+    display_name="Steps",
+    unit="1",
+    format=".1f",
+)
+META_COLUMNS = [
+    column_distance,
+    column_elevation_gain,
+    column_hours,
+    column_hours_moving,
+    column_calories,
+    column_steps,
+]
 
 column_speed = ColumnDescription(
     name="speed",
@@ -35,3 +60,11 @@ column_speed = ColumnDescription(
     unit="km/h",
     format=".1f",
 )
+column_elevation = ColumnDescription(
+    name="elevation",
+    display_name="Elevation",
+    unit="m",
+    format=".0f",
+)
+
+TIME_SERIES_COLUMNS = [column_speed, column_elevation]

geo_activity_playground/webui/static/{browserconfig.xml → favicons/browserconfig.xml}

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/static/mstile-150x150.png"/>
+            <square150x150logo src="/static/favicons/mstile-150x150.png"/>
             <TileColor>#da532c</TileColor>
         </tile>
     </msapplication>

geo_activity_playground/webui/static/{site.webmanifest → favicons/site.webmanifest}

@@ -3,13 +3,13 @@
   "short_name": "MySite",
   "icons": [
     {
-      "src": "/static/web-app-manifest-192x192.png",
+      "src": "/static/favicons/web-app-manifest-192x192.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/static/web-app-manifest-512x512.png",
+      "src": "/static/favicons/web-app-manifest-512x512.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"

geo_activity_playground/webui/static/server-side-explorer.js

@@ -17,7 +17,7 @@ let map = L.map('explorer-map', {
     zoom: 12
 });
 
-changeColor('cluster')
+changeColor('default')
 
 if (bbox) {
     map.fitBounds(L.geoJSON(bbox).getBounds())
@@ -52,4 +52,9 @@ map.on('click', e => {
                 .openOn(map);
         }
         );
-});
+});
+
+function downloadAs(suffix) {
+    bounds = map.getBounds();
+    window.location.href = `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
+}

geo_activity_playground/webui/templates/activity/name.html.j2

@@ -30,19 +30,19 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("tick_plot", tick_plot) }}
+        {{ vega_direct(tick_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("equipment_plot", equipment_plot) }}
+        {{ vega_direct(equipment_plot) }}
     </div>
 </div>
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("distance_plot", distance_plot) }}
+        {{ vega_direct(distance_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("minutes_plot", minutes_plot) }}
+        {{ vega_direct(minutes_plot) }}
     </div>
 </div>
 

geo_activity_playground/webui/templates/activity/show.html.j2

@@ -182,13 +182,13 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("distance_time_plot", distance_time_plot) }}
+        {{ vega_direct(distance_time_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("speed_time_plot", speed_time_plot) }}
+        {{ vega_direct(speed_time_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("speed_distribution_plot", speed_distribution_plot) }}
+        {{ vega_direct(speed_distribution_plot) }}
     </div>
 </div>
 
@@ -201,11 +201,11 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("elevation_time_plot", elevation_time_plot) }}
+        {{ vega_direct(elevation_time_plot) }}
     </div>
     {% if elevation_gain_cum_plot is defined %}
     <div class="col-md-4">
-        {{ vega_direct("elevation_gain_cum_plot", elevation_gain_cum_plot) }}
+        {{ vega_direct(elevation_gain_cum_plot) }}
     </div>
     {% endif %}
 </div>
@@ -216,11 +216,11 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("heartrate_time_plot", heartrate_time_plot) }}
+        {{ vega_direct(heartrate_time_plot) }}
     </div>
     <div class="col-md-4">
         {% if heart_zones_plot is defined %}
-        {{ vega_direct("heart_zones_plot", heart_zones_plot) }}
+        {{ vega_direct(heart_zones_plot) }}
         {% else %}
         <p>Your activity has heart data, but this program doesn't know your maximum heart rate (or birth year) and
             therefore cannot compute the heart rate zones. Go to the <a
@@ -235,7 +235,7 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("cadence_time_plot", cadence_time_plot) }}
+        {{ vega_direct(cadence_time_plot) }}
     </div>
 </div>
 {% endif %}

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

@@ -54,7 +54,7 @@
         <p>In a graphical representation, the Eddington number is the distance where the red line intersects with the
             blue area.</p>
 
-        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -63,7 +63,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -94,7 +94,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">

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

@@ -76,7 +76,7 @@
         <p>In a graphical representation, the Eddington number is the elevation gain where the red line intersects with the
             blue area.</p>
 
-        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -85,7 +85,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -116,7 +116,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">

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

@@ -80,7 +80,7 @@
             the
             blue area.</p>
 
-        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -89,7 +89,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -120,7 +120,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">