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

geo_activity_playground/core/activities.py

@@ -48,6 +48,10 @@ class ActivityRepository:
             self.meta = pd.read_parquet(activities_path())
             self.meta.index = self.meta["id"]
             self.meta.index.name = "index"
+            if not pd.api.types.is_dtype_equal(
+                self.meta["start"].dtype, "datetime64[ns]"
+            ):
+                self.meta["start"] = convert_to_datetime_ns(self.meta["start"])
         else:
             self.meta = pd.DataFrame()
 
@@ -88,6 +92,7 @@ class ActivityRepository:
                 old_df = self.meta.loc[is_kept]
             else:
                 old_df = self.meta
+
             self.meta = pd.concat([old_df, new_df])
             assert pd.api.types.is_dtype_equal(
                 self.meta["start"].dtype, "datetime64[ns]"

geo_activity_playground/importers/strava_api.py

@@ -17,6 +17,7 @@ from tqdm import tqdm
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.config import get_config
 from geo_activity_playground.core.paths import cache_dir
+from geo_activity_playground.core.time_conversion import convert_to_datetime_ns
 
 
 logger = logging.getLogger(__name__)
@@ -165,7 +166,7 @@ def try_import_strava(repository: ActivityRepository) -> bool:
                         "distance_km": activity.distance.magnitude / 1000,
                         "name": activity.name,
                         "kind": str(activity.type),
-                        "start": activity.start_date,
+                        "start": convert_to_datetime_ns(activity.start_date),
                         "elapsed_time": activity.elapsed_time,
                         "equipment": gear_names[activity.gear_id],
                         "calories": detailed_activity.calories,

geo_activity_playground/webui/activity/blueprint.py

@@ -22,7 +22,7 @@ def make_activity_blueprint(
         repository, tile_visit_accessor, privacy_zones
     )
 
-    @blueprint.route("/activity/all")
+    @blueprint.route("/all")
     def all():
         return render_template(
             "activity/lines.html.j2", **activity_controller.render_all()

geo_activity_playground/webui/activity/controller.py

@@ -452,7 +452,7 @@ def make_sharepic(activity: ActivityMeta, time_series: pd.DataFrame) -> bytes:
         f"\n{activity['distance_km']:.1f} km",
         re.sub(r"^0 days ", "", f"{activity['elapsed_time']}"),
     ]
-    if activity["calories"]:
+    if activity["calories"] and not pd.isna(activity["calories"]):
         facts.append(f"{activity['calories']:.0f} kcal")
     if activity["steps"] and not pd.isna(activity["steps"]):
         facts.append(f"{activity['steps']:.0f} steps")

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/heatmap/heatmap_controller.py

@@ -11,6 +11,7 @@ from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.heatmap import convert_to_grayscale
 from geo_activity_playground.core.heatmap import GeoBounds
 from geo_activity_playground.core.heatmap import get_sensible_zoom_level
+from geo_activity_playground.core.heatmap import PixelBounds
 from geo_activity_playground.core.tasks import work_tracker
 from geo_activity_playground.core.tiles import get_tile
 from geo_activity_playground.core.tiles import get_tile_upper_left_lat_lon
@@ -140,8 +141,9 @@ class HeatmapController:
     ) -> bytes:
         geo_bounds = GeoBounds(south, west, north, east)
         tile_bounds = get_sensible_zoom_level(geo_bounds, (4000, 4000))
+        pixel_bounds = PixelBounds.from_tile_bounds(tile_bounds)
 
-        background = np.zeros((*tile_bounds.shape, 3))
+        background = np.zeros((*pixel_bounds.shape, 3))
         for x in range(tile_bounds.x_tile_min, tile_bounds.x_tile_max):
             for y in range(tile_bounds.y_tile_min, tile_bounds.y_tile_max):
                 tile = np.array(get_tile(tile_bounds.zoom, x, y)) / 255

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.0.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.0
+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.0.dist-info → geo_activity_playground-0.24.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/__main__.py,sha256=pAl5_cWjuNyGmE_zMoPtG7Gc7r7lNk3psn9CAxzP2fU,4131
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/core/activities.py,sha256=Cee7Md1izbINyiU-mOiQC2Bo6fHPeH3moSoCR4Yjm2A,11403
+geo_activity_playground/core/activities.py,sha256=giZYepqGK3NujGpcCrYvF0rYDyVMopIMdXrvWBvbRm4,11606
 geo_activity_playground/core/activity_parsers.py,sha256=pjYjnaAXsWfUNOoomYWOmmFZO5Qs076RWM-pqNdo7BA,10905
 geo_activity_playground/core/cache_migrations.py,sha256=tkGA0h69-m-0Ek7JjvfVOX45YXLXkh_ZvC2TKB_fvbA,4281
 geo_activity_playground/core/config.py,sha256=YjqCiEmIAa-GM1-JfBctMEsl8-I56pZyyDdTyPduOzw,477
@@ -21,14 +21,14 @@ geo_activity_playground/explorer/tile_visits.py,sha256=fkn2Pgk-pBmC0ywDa0g2T9f4L
 geo_activity_playground/explorer/video.py,sha256=ROAmV9shfJyqTgnXVD41KFORiwnRgVpEWenIq4hMCRM,4389
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/importers/directory.py,sha256=6KUxMMJELq1WWQSbqAWt6ZVlZh7Np3LMJNkt6jPN5eI,4506
-geo_activity_playground/importers/strava_api.py,sha256=o3GsRRqpt0RWSJ-H0upLWcXiFJ81YpvgZCrHI8Qlqng,7765
+geo_activity_playground/importers/strava_api.py,sha256=FJYamDBmHmB8uA9dNc0h0j7EgZPCofCspL2Wfq-PrTg,7869
 geo_activity_playground/importers/strava_checkout.py,sha256=nvZX7skevqMWdW9Gxzt4VhwCaI3wv2z5g-ODv6ZWxng,8078
 geo_activity_playground/importers/test_directory.py,sha256=ljXokx7q0OgtHvEdHftcQYEmZJUDVv3OOF5opklxdT4,724
 geo_activity_playground/importers/test_strava_api.py,sha256=4vX7wDr1a9aRh8myxNrIq6RwDBbP8ZeoXXPc10CAbW4,431
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/activity/blueprint.py,sha256=wtP3E_iJpOmUhqaq_SyZPkB92eM1giYsyJmqKUwIW0A,1758
-geo_activity_playground/webui/activity/controller.py,sha256=8RkVnD_uW09XBCKn_5m2sD81jG7ezshYLAbGvtDVB3M,16627
+geo_activity_playground/webui/activity/blueprint.py,sha256=gGMes5ycXi2rMixVYs4NQgzTU1Vttgu50prYAe3--Hs,1749
+geo_activity_playground/webui/activity/controller.py,sha256=CoNi9dJlGS-pZMEh14eZqWkbbLRHvQ01PEk8jRXpmgU,16665
 geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3qKl9uTzOko4R-ZzyYAZt1j61JSevYP4g0Yi06HHPg,2702
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=5gB1aDjRgi_RventenRfC10_FtMT4ch_VuWvA9AMlBY,1121
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=RDLEt6ip8_ngmdLgaC5jg92Dk-F2umGwKkd8cWmvVko,2400
@@ -46,15 +46,15 @@ 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
 geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=OxNt2_VwH-cmVXJrDNfeD-dNB9IrwBjdhhQEqkXxHj0,6529
 geo_activity_playground/webui/heatmap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/heatmap/blueprint.py,sha256=bjQu-HL3QN5UpJ6tHOifhcLGlPr_hIKvaRu78md4JqM,1470
-geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=f83Yyns2guS7Ck90OJZT41Ftw8SjAodAOEMlEML5Pa0,6350
+geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=fM92NfeJ_qhXkuAT01Btkzeb_SbAgExxql_OH1G31os,6477
 geo_activity_playground/webui/heatmap/templates/heatmap/index.html.j2,sha256=YLeu6P4djl8G4qAXR6DhetseqrbOodN7aN4coocknc4,1875
 geo_activity_playground/webui/search_controller.py,sha256=PzMf7b8tiJKZIZoPvQ9A2hOrzoKV9cS3jq05w2fK94c,532
 geo_activity_playground/webui/square_planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.24.0.dist-info/METADATA,sha256=UrduUtiMuNdNYDDjMnA-KMXzetNnr71JTAjs4O4PZjM,1665
-geo_activity_playground-0.24.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.24.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.24.0.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,,