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

geo_activity_playground/webui/equipment/controller.py

@@ -10,64 +10,105 @@ class EquipmentController:
         self._repository = repository
 
     def render(self) -> dict:
-        total_distances = (
-            self._repository.meta.groupby("equipment")
-            .apply(
-                lambda group: pd.DataFrame(
-                    {
-                        "time": group["start"],
-                        "total_distance_km": group["distance_km"].cumsum(),
-                    }
-                ),
-                include_groups=False,
-            )
-            .reset_index()
-        )
-
-        plot = (
-            alt.Chart(
-                total_distances,
-                height=250,
-                width=250,
-                title="Equipment Usage over Time",
-            )
-            .mark_line(interpolate="step-after")
-            .encode(
-                alt.X("time", title="Date"),
-                alt.Y("total_distance_km", title="Cumulative distance / km"),
-            )
-            .facet("equipment", columns=4, title="Equipment")
-            .resolve_scale(y="independent")
-            .resolve_axis(x="independent")
-            .interactive()
-            .to_json(format="vega")
+        kind_per_equipment = self._repository.meta.groupby("equipment").apply(
+            lambda group: group.groupby("kind")
+            .apply(lambda group2: sum(group2["distance_km"]), include_groups=False)
+            .idxmax(),
+            include_groups=False,
         )
 
         equipment_summary = (
             self._repository.meta.groupby("equipment")
             .apply(
-                lambda group: pd.DataFrame(
+                lambda group: pd.Series(
                     {
                         "total_distance_km": group["distance_km"].sum(),
                         "first_use": group["start"].iloc[0],
                         "last_use": group["start"].iloc[-1],
                     },
-                    index=[0],
                 ),
                 include_groups=False,
             )
-            .reset_index()
             .sort_values("last_use", ascending=False)
         )
 
+        equipment_summary["primarily_used_for"] = None
+        for equipment, kind in kind_per_equipment.items():
+            equipment_summary.loc[equipment, "primarily_used_for"] = kind
+
+        equipment_variables = {}
+        for equipment in equipment_summary.index:
+            selection = self._repository.meta.loc[
+                self._repository.meta["equipment"] == equipment
+            ]
+            total_distances = pd.DataFrame(
+                {
+                    "time": selection["start"],
+                    "total_distance_km": selection["distance_km"].cumsum(),
+                }
+            )
+
+            total_distances_plot = (
+                alt.Chart(
+                    total_distances,
+                    height=300,
+                    width=300,
+                    title="Usage over Time",
+                )
+                .mark_line(interpolate="step-after")
+                .encode(
+                    alt.X("time", title="Date"),
+                    alt.Y("total_distance_km", title="Cumulative distance / km"),
+                )
+                .interactive()
+                .to_json(format="vega")
+            )
+
+            yearly_distance_plot = (
+                alt.Chart(
+                    selection,
+                    height=300,
+                    title="Yearly distance",
+                )
+                .mark_bar()
+                .encode(
+                    alt.X("year(start):O", title="Year"),
+                    alt.Y("sum(distance_km)", title="Distance / km"),
+                )
+                .to_json(format="vega")
+            )
+
+            usages_plot = (
+                alt.Chart(
+                    selection,
+                    height=300,
+                    title="Kinds",
+                )
+                .mark_bar()
+                .encode(
+                    alt.X("kind", title="Year"),
+                    alt.Y("sum(distance_km)", title="Distance / km"),
+                )
+                .to_json(format="vega")
+            )
+
+            equipment_variables[equipment] = {
+                "total_distances_plot": total_distances_plot,
+                "total_distances_plot_id": f"total_distances_plot_{hash(equipment)}",
+                "yearly_distance_plot": yearly_distance_plot,
+                "yearly_distance_plot_id": f"yearly_distance_plot_{hash(equipment)}",
+                "usages_plot": usages_plot,
+                "usages_plot_id": f"usages_plot_{hash(equipment)}",
+            }
+
         config = get_config()
         if "offsets" in config:
             for equipment, offset in config["offsets"].items():
-                equipment_summary.loc[
-                    equipment_summary["equipment"] == equipment, "total_distance_km"
-                ] += offset
+                equipment_summary.loc[equipment, "total_distance_km"] += offset
 
         return {
-            "total_distances_plot": plot,
-            "equipment_summary": equipment_summary.to_dict(orient="records"),
+            "equipment_variables": equipment_variables,
+            "equipment_summary": equipment_summary.reset_index().to_dict(
+                orient="records"
+            ),
         }

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

@@ -13,6 +13,7 @@
             <thead>
                 <tr>
                     <th>Equipment</th>
+                    <th>Primarily used for</th>
                     <th style="text-align: right;">Distance / km</th>
                     <th style="text-align: right;">First use</th>
                     <th style="text-align: right;">Last use</th>
@@ -22,6 +23,7 @@
                 {% for equipment in equipment_summary %}
                 <tr>
                     <td>{{ equipment.equipment }}</td>
+                    <td>{{ equipment.primarily_used_for }}</td>
                     <td style="text-align: right;">{{ equipment.total_distance_km|int }}</td>
                     <td style="text-align: right;">{{ equipment.first_use.date() }}</td>
                     <td style="text-align: right;">{{ equipment.last_use.date() }}</td>
@@ -34,13 +36,22 @@
 
 <div class="row mb-3">
     <div class="col">
-        <h2>Usage over time</h2>
+        <h2>Details for each equipment</h2>
     </div>
 </div>
 
+{% for equipment, data in equipment_variables.items() %}
+<h3>{{ equipment }}</h3>
 <div class="row mb-3">
-    <div class="col">
-        {{ vega_direct("total_distances_plot", total_distances_plot) }}
+    <div class="col-md-4">
+        {{ vega_direct(data.total_distances_plot_id, data.total_distances_plot) }}
+    </div>
+    <div class="col-md-4">
+        {{ vega_direct(data.yearly_distance_plot_id, data.yearly_distance_plot) }}
+    </div>
+    <div class="col-md-4">
+        {{ vega_direct(data.usages_plot_id, data.usages_plot) }}
     </div>
 </div>
+{% endfor %}
 {% endblock %}

geo_activity_playground/webui/summary/controller.py

@@ -61,11 +61,13 @@ def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
     i = subset["elapsed_time"].idxmax()
     nominations[i].append(f"Longest elapsed time: {meta.loc[i].elapsed_time}")
 
-    i = subset["calories"].idxmax()
-    nominations[i].append(f"Most calories burnt: {meta.loc[i].calories:.0f} kcal")
+    if "calories" in subset.columns:
+        i = subset["calories"].idxmax()
+        nominations[i].append(f"Most calories burnt: {meta.loc[i].calories:.0f} kcal")
 
-    i = subset["steps"].idxmax()
-    nominations[i].append(f"Most steps: {meta.loc[i].steps:.0f}")
+    if "steps" in subset:
+        i = subset["steps"].idxmax()
+        nominations[i].append(f"Most steps: {meta.loc[i].steps:.0f}")
 
     for kind, group in meta.groupby("kind"):
         for key, text in [
@@ -83,10 +85,11 @@ def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
             ),
             ("steps", lambda row: f"Most steps for {row.kind}: {row.steps:.0f}"),
         ]:
-            series = group[key]
-            i = series.idxmax()
-            if not pd.isna(i):
-                nominations[i].append(text(meta.loc[i]))
+            if key in group.columns:
+                series = group[key]
+                i = series.idxmax()
+                if not pd.isna(i):
+                    nominations[i].append(text(meta.loc[i]))
 
     return nominations
 

{geo_activity_playground-0.24.1.dist-info → geo_activity_playground-0.24.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.24.1
+Version: 0.24.2
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

{geo_activity_playground-0.24.1.dist-info → geo_activity_playground-0.24.2.dist-info}/RECORD

@@ -46,8 +46,8 @@ geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256
 geo_activity_playground/webui/entry_controller.py,sha256=v8twD3LJ0SoVtvzJoDKnU8dTtMZAKvhNU2AEH2Z87OA,1886
 geo_activity_playground/webui/equipment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/equipment/blueprint.py,sha256=YbOAsjk05BMeUlD6wGfxE1amvlLsFjG4HMJn5SBrVRU,551
-geo_activity_playground/webui/equipment/controller.py,sha256=ST8MEgk5UxTiIM0sQUpKr1TJ2uPRm55V6DI3brPokUo,2390
-geo_activity_playground/webui/equipment/templates/equipment/index.html.j2,sha256=dNuezVKJNJZbQ0y2-AYlXNHpncTbtOSDNLqNswRTxaI,1320
+geo_activity_playground/webui/equipment/controller.py,sha256=m1LNaGCNJnW97TlKT6x9NfQcMp6RKcZ8Q0I1FTUAvss,4037
+geo_activity_playground/webui/equipment/templates/equipment/index.html.j2,sha256=FEfxB4XwVYELAOdjVlSlprjJH_kLmE-pNWEEXdPqc6I,1778
 geo_activity_playground/webui/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/explorer/blueprint.py,sha256=jHE6bb4H2GmYaix9P452Cyrn_30z_Nm705AZ0WNm4HQ,1950
 geo_activity_playground/webui/explorer/controller.py,sha256=8d0FFrG55ZlPQ5seQC2DegxIkPGIW7pvw8Jm4eJt3fg,10634
@@ -75,7 +75,7 @@ geo_activity_playground/webui/static/site.webmanifest,sha256=4vYxdPMpwTdB8EmOvHk
 geo_activity_playground/webui/strava_controller.py,sha256=-DZ1Ae-0cWx5tia2dJpGfsBBoIya0QO7IC2qa1-7Q_U,779
 geo_activity_playground/webui/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/summary/blueprint.py,sha256=kzQ6MDOycQKfDcVoEUmL7HYHJA_gu8DlzVHwO37-_jA,514
-geo_activity_playground/webui/summary/controller.py,sha256=zwJq9HIppk_3kBeRvl2ZF2kJfqvCaSSSWrqFHOrSPWc,8673
+geo_activity_playground/webui/summary/controller.py,sha256=i6A9-S9j9Hm67FcZPzJpqMgxRVsXbDmJiVLGiRtZIqk,8805
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=rsII1eMY-xNugh8A9SecnEcDZqkEOWYIfiHAGroQYuM,4442
 geo_activity_playground/webui/templates/home.html.j2,sha256=23MLQJ1k447NMLcgOGgTSNiPXFvdC2bQvACkDZbGo5k,2182
 geo_activity_playground/webui/templates/page.html.j2,sha256=aeTYem0CpOOPvWa5KzVKH1BiPJlF0LHqChL1IhpAUO0,7292
@@ -88,8 +88,8 @@ geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 geo_activity_playground/webui/upload/blueprint.py,sha256=2l5q1LYtjgLF_3CAyPvCLx-wMebp14OJvgZBzGILdmQ,801
 geo_activity_playground/webui/upload/controller.py,sha256=QrHfqRxroLuzBBNNSheUx-qJ9ww1sXT1oPdpS7Jx_ro,4092
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=hfXkEXaz_MkM46rU56423D6V6WtK-EAXPszSY-_-Tx8,1471
-geo_activity_playground-0.24.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.24.1.dist-info/METADATA,sha256=59LmZVNZAf8R-8Lbab3__MuB4tWbW_KuApJsIcDzJxo,1665
-geo_activity_playground-0.24.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.24.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.24.1.dist-info/RECORD,,
+geo_activity_playground-0.24.2.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.24.2.dist-info/METADATA,sha256=Rele9lf2wXKFJkEXlZYiRY8AMzjTwwN9RBvYY9ieAkc,1665
+geo_activity_playground-0.24.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.24.2.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.24.2.dist-info/RECORD,,