geo-activity-playground 0.40.1__py3-none-any.whl → 0.41.0__py3-none-any.whl

geo_activity_playground/webui/blueprints/summary_blueprint.py

@@ -15,6 +15,9 @@ 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 ..plot_util import make_kind_scale
 from ..search_util import search_query_from_form
 from ..search_util import SearchQueryHistory
@@ -36,25 +39,38 @@ def make_summary_blueprint(
         kind_scale = make_kind_scale(repository.meta, config)
         df = activities
 
-        year_kind_total = (
-            df[["year", "kind", "distance_km", "hours"]]
-            .groupby(["year", "kind"])
-            .sum()
-            .reset_index()
-        )
-
         nominations = nominate_activities(df)
 
         return render_template(
             "summary/index.html.j2",
-            plot_distance_heatmaps=plot_distance_heatmaps(df, config),
-            plot_monthly_distance=plot_monthly_distance(df, kind_scale),
-            plot_yearly_distance=plot_yearly_distance(year_kind_total, kind_scale),
-            plot_year_cumulative=plot_year_cumulative(df),
-            tabulate_year_kind_mean=tabulate_year_kind_mean(df)
+            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"),
-            plot_weekly_distance=plot_weekly_distance(df, kind_scale),
+            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),
@@ -109,11 +125,13 @@ def _nominate_activities_inner(
             nominations[i].append(f"{title}{title_suffix}: {format_applied}")
 
 
-def plot_distance_heatmaps(meta: pd.DataFrame, config: Config) -> dict[int, str]:
+def plot_heatmaps(
+    meta: pd.DataFrame, column: ColumnDescription, config: Config
+) -> dict[int, str]:
     return {
         year: alt.Chart(
             meta.loc[(meta["year"] == year)],
-            title="Daily Distance Heatmap",
+            title=f"Daily {column.display_name} Heatmap",
         )
         .mark_rect()
         .encode(
@@ -124,15 +142,17 @@ def plot_distance_heatmaps(meta: pd.DataFrame, config: Config) -> dict[int, str]
                 title="Year and month",
             ),
             alt.Color(
-                "sum(distance_km)",
+                f"sum({column.name})",
                 scale=alt.Scale(scheme=config.color_scheme_for_counts),
             ),
             [
                 alt.Tooltip("yearmonthdate(start)", title="Date"),
                 alt.Tooltip(
-                    "sum(distance_km)", format=".1f", title="Total distance / km"
+                    f"sum({column.name})",
+                    format=column.format,
+                    title=f"Total {column.display_name} / {column.unit}",
                 ),
-                alt.Tooltip("count(distance_km)", title="Number of activities"),
+                alt.Tooltip(f"count({column.name})", title="Number of activities"),
             ],
         )
         .to_json(format="vega")
@@ -140,7 +160,9 @@ def plot_distance_heatmaps(meta: pd.DataFrame, config: Config) -> dict[int, str]
     }
 
 
-def plot_monthly_distance(meta: pd.DataFrame, kind_scale: alt.Scale) -> str:
+def plot_monthly_sums(
+    meta: pd.DataFrame, column: ColumnDescription, kind_scale: alt.Scale
+) -> str:
     return (
         alt.Chart(
             meta.loc[
@@ -151,20 +173,26 @@ def plot_monthly_distance(meta: pd.DataFrame, kind_scale: alt.Scale) -> str:
                     )
                 )
             ],
-            title="Monthly Distance",
+            title=f"Monthly {column.display_name}",
         )
         .mark_bar()
         .encode(
             alt.X("month(start)", title="Month"),
-            alt.Y("sum(distance_km)", title="Distance / km"),
+            alt.Y(
+                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.Tooltip("yearmonthdate(start)", title="Date"),
+                alt.Tooltip("yearmonth(start)", title="Year and Month"),
+                alt.Tooltip("kind", title="Kind"),
                 alt.Tooltip(
-                    "sum(distance_km)", format=".1f", title="Total distance / km"
+                    f"sum({column.name})",
+                    format=column.format,
+                    title=f"Total {column.display_name} / {column.unit}",
                 ),
-                alt.Tooltip("count(distance_km)", title="Number of activities"),
+                alt.Tooltip(f"count({column.name})", title="Number of activities"),
             ],
         )
         .resolve_axis(x="independent")
@@ -172,31 +200,47 @@ def plot_monthly_distance(meta: pd.DataFrame, kind_scale: alt.Scale) -> str:
     )
 
 
-def plot_yearly_distance(year_kind_total: pd.DataFrame, kind_scale: alt.Scale) -> str:
+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="Total Distance per Year")
+        alt.Chart(year_kind_total, title=f"Total {column.display_name} per Year")
         .mark_bar()
         .encode(
             alt.X("year:O", title="Year"),
-            alt.Y("distance_km", title="Distance / km"),
+            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("distance_km", title="Distance / km", format=".1f"),
+                alt.Tooltip(
+                    column.name,
+                    title=f"{column.display_name} / {column.unit}",
+                    format=column.format,
+                ),
             ],
         )
         .to_json(format="vega")
     )
 
 
-def plot_year_cumulative(df: pd.DataFrame) -> str:
+def plot_year_cumulative(df: pd.DataFrame, column: ColumnDescription) -> str:
     year_cumulative = (
-        df[["iso_year", "week", "distance_km"]]
+        df[["iso_year", "week", column.name]]
         .groupby("iso_year")
         .apply(
             lambda group: pd.DataFrame(
-                {"week": group["week"], "distance_km": group["distance_km"].cumsum()}
+                {
+                    "week": group["week"],
+                    column.name: group[column.name].cumsum(),
+                }
             ),
             include_groups=False,
         )
@@ -204,16 +248,24 @@ def plot_year_cumulative(df: pd.DataFrame) -> str:
     )
 
     return (
-        alt.Chart(year_cumulative, width=500, title="Cumultative Distance per Year")
+        alt.Chart(
+            year_cumulative,
+            width=500,
+            title=f"Cumulative {column.display_name} per Year",
+        )
         .mark_line()
         .encode(
             alt.X("week", title="Week"),
-            alt.Y("distance_km", title="Distance / km"),
+            alt.Y(column.name, title=f"{column.display_name} / {column.unit}"),
             alt.Color("iso_year:N", title="Year"),
             [
                 alt.Tooltip("week", title="Week"),
                 alt.Tooltip("iso_year:N", title="Year"),
-                alt.Tooltip("distance_km", title="Distance / km", format=".1f"),
+                alt.Tooltip(
+                    column.name,
+                    title=f"{column.display_name} / {column.unit}",
+                    format=column.format,
+                ),
             ],
         )
         .interactive()
@@ -221,24 +273,28 @@ def plot_year_cumulative(df: pd.DataFrame) -> str:
     )
 
 
-def tabulate_year_kind_mean(df: pd.DataFrame) -> pd.DataFrame:
+def tabulate_year_kind_mean(
+    df: pd.DataFrame, column: ColumnDescription
+) -> pd.DataFrame:
     year_kind_mean = (
-        df[["year", "kind", "distance_km", "hours"]]
+        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="distance_km"
+        index="year", columns="kind", values=column.name
     )
 
     return year_kind_mean_distance
 
 
-def plot_weekly_distance(df: pd.DataFrame, kind_scale: alt.Scale) -> str:
+def plot_weekly_sums(
+    df: pd.DataFrame, column: ColumnDescription, kind_scale: alt.Scale
+) -> str:
     week_kind_total_distance = (
-        df[["iso_year", "week", "kind", "distance_km"]]
+        df[["iso_year", "week", "kind", column.name]]
         .groupby(["iso_year", "week", "kind"])
         .sum()
         .reset_index()
@@ -260,17 +316,21 @@ def plot_weekly_distance(df: pd.DataFrame, kind_scale: alt.Scale) -> str:
                 | (week_kind_total_distance["iso_year"] == last_year - 1)
                 & (week_kind_total_distance["week"] >= last_week)
             ],
-            title="Weekly Distance",
+            title=f"Weekly {column.display_name}",
         )
         .mark_bar()
         .encode(
             alt.X("year_week", title="Year and Week"),
-            alt.Y("distance_km", title="Distance / km"),
+            alt.Y(column.name, title=f"{column.display_name} / {column.unit}"),
             alt.Color("kind", scale=kind_scale, title="Kind"),
             [
                 alt.Tooltip("year_week", title="Year and Week"),
                 alt.Tooltip("kind", title="Kind"),
-                alt.Tooltip("distance_km", title="Distance / km", format=".1f"),
+                alt.Tooltip(
+                    column.name,
+                    title=f"{column.display_name} / {column.unit}",
+                    format=column.format,
+                ),
             ],
         )
         .to_json(format="vega")

geo_activity_playground/webui/columns.py

@@ -0,0 +1,37 @@
+import dataclasses
+
+
+@dataclasses.dataclass
+class ColumnDescription:
+    name: str
+    display_name: str
+    unit: str
+    format: str
+
+
+column_distance = ColumnDescription(
+    name="distance_km",
+    display_name="Distance",
+    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_speed = ColumnDescription(
+    name="speed",
+    display_name="Speed",
+    unit="km/h",
+    format=".1f",
+)

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

@@ -49,7 +49,7 @@
 
             {% if activity.elevation_gain %}
             <dt>Elevation gain</dt>
-            <dd>{{ activity.elevation_gain|round(0) }} m</dd>
+            <dd>{{ activity.elevation_gain|round(0)|int }} m</dd>
             {% endif %}
 
             {% if activity.equipment %}
@@ -105,10 +105,21 @@
         </style>
 
         <div>
-            {% for speed, color in speed_color_bar.colors %}
-            <span class="colorbar" style="width: 15px; background-color: {{ color }}">{{ speed }}</span>
+            {% for value, color in line_color_bar.colors %}
+            <span class="colorbar" style="width: 15px; background-color: {{ color }}">{{ value }}</span>
             {% endfor %}
-            km/h
+            {{ line_color_columns_avail[line_color_column].unit }}
+        </div>
+
+        <div class="mb-3" style="padding-top: 10px;">
+            <form method="GET">
+                <label class="form-label">Line Color by</label>
+                <select class="form-select" aria-label="Line Color by" name="line_color_column" onchange="this.form.submit()">
+                    {% for name, column in line_color_columns_avail.items() %}
+                    <option {% if name == line_color_column %} selected {% endif %} value="{{ name }}">{{ column.display_name }}</option>
+                    {% endfor %}
+                </select>
+            </form>
         </div>
     </div>
 </div>

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

@@ -1,17 +1,33 @@
-<!-- filepath: /home/michael/Nextcloud/Python/Geoactivity-Fork/geo-activity-playground/geo_activity_playground/webui/templates/bubble_chart/index.html.j2 -->
 {% extends "page.html.j2" %}
 
 {% block container %}
+
+<div class="row mb-3">
+    <div class="col">
+        <h1>Bubble Chart: Distance</h1>
+        <div id="bubble-chart-distance"></div>
+        <script>
+            const chartSpecDistance = {{ bubble_chart_distance | safe }};
+            vegaEmbed('#bubble-chart-distance', chartSpecDistance).then((result) => {
+                // Add a click event listener to the chart
+                result.view.addEventListener('click', (event, item) => {
+                    if (item && item.datum && item.datum.activity_url) {
+                        // Redirect to the activity URL
+                        window.location.href = item.datum.activity_url;
+                    }
+                });
+            }).catch(console.error);
+        </script>
+    </div>
+</div>
+
 <div class="row mb-3">
     <div class="col">
-        <h1>Bubble Chart</h1>
-        <div id="bubble-chart"></div>
-        <script src="https://cdn.jsdelivr.net/npm/vega@5"></script>
-        <script src="https://cdn.jsdelivr.net/npm/vega-lite@5"></script>
-        <script src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
+        <h1>Bubble Chart: Elevation Gain</h1>
+        <div id="bubble-chart-elevation-gain"></div>
         <script>
-            const chartSpec = {{ bubble_chart | safe }};
-            vegaEmbed('#bubble-chart', chartSpec).then((result) => {
+            const chartSpecElevationGain = {{ bubble_chart_elevation_gain | safe }};
+            vegaEmbed('#bubble-chart-elevation-gain', chartSpecElevationGain).then((result) => {
                 // Add a click event listener to the chart
                 result.view.addEventListener('click', (event, item) => {
                     if (item && item.datum && item.datum.activity_url) {

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

@@ -0,0 +1,150 @@
+{% extends "page.html.j2" %}
+{% from "search_form.html.j2" import search_form %}
+
+{% block container %}
+<h1 class="mb-3">Eddington Number for Elevation Gain</h1>
+
+<div class="mb-3">
+    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+</div>
+
+<div class="row mb-3">
+    <div class="col-md-4">
+        <form method="GET">
+            <div class="mb-3">
+                <label class="form-label">Divisor</label>
+                <select class="form-select" aria-label="Divisor" name="eddington_divisor" onchange="this.form.submit()">
+                    {% for dv in divisor_values_avail %}
+                    <option {% if dv==eddington_divisor %} selected {% endif %}>{{ dv }}</option>
+                    {% endfor %}
+                    {% for key, value in query.items() %}
+                        {% if value and key != "active" %}
+                            {% if value is string %}
+                                <input type="hidden" name="{{ key }}" value="{{ value }}"/>
+                            {% else %}
+                                {% for v in value %}
+                                <input type="hidden" name="{{ key }}" value="{{ v }}"/>
+                                {% endfor %}
+                            {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </select>
+            </div>
+        </form>
+
+        <h2>Definition</h2>
+
+        <p>Your Eddington number with divisor {{ eddington_divisor }} is <b>{{ eddington_number }}</b>.</p>
+
+        <p>That means that on {{ (eddington_number / eddington_divisor) | int }} separate days you
+            have recorded activities with an elevation gain of more than {{ eddington_number }} m. Going high is one thing, going often is
+            another. But going high often is hard. Also if you increment the Eddington number, all days with less
+            elevation gain will not count any more. It becomes increasingly hard to increment the Eddington number because you
+            don't only need to achieve a higher count, but all flatter activities don't count towards the bigger number.
+        </p>
+    </div>
+
+    <div class="col-md-8">
+        <h2>Missing days</h2>
+
+        <p>How many more days do you need to increment your Eddington number?</p>
+
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Elevation Gain</th>
+                    <th>Count</th>
+                    <th>Missing days</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in eddington_table %}
+                <tr>
+                    <td>{{ row['elevation_gain'] }}</td>
+                    <td>{{ row['total'] }}</td>
+                    <td>{{ row['missing'] }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<div class="row mb-1">
+    <div class="col">
+        <h2>Plot</h2>
+
+        <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) }}
+    </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>Elevation Gain</th>
+                    <th>Count</th>
+                    <th>Missing weeks</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for row in eddington_table_weeks %}
+                <tr>
+                    <td>{{ row['elevation_gain'] }}</td>
+                    <td>{{ row['total'] }}</td>
+                    <td>{{ row['missing'] }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<div class="row mb-1">
+
+</div>
+
+
+{% endblock %}