geo-activity-playground 0.26.1__py3-none-any.whl → 0.26.3__py3-none-any.whl

geo_activity_playground/core/enrichment.py

@@ -47,7 +47,17 @@ def enrich_activities(kind_defaults: dict[dict[str, Any]]) -> None:
             or enriched_metadata_path.stat().st_mtime
             < extracted_metadata_path.stat().st_mtime
         ):
-            new_extracted_metadata_paths.append(extracted_metadata_path)
+            extracted_time_series_path = (
+                activity_extracted_time_series_dir()
+                / f"{extracted_metadata_path.stem}.parquet"
+            )
+            if extracted_time_series_path.exists():
+                new_extracted_metadata_paths.append(extracted_metadata_path)
+            else:
+                logger.error(
+                    f"Extracted activity metadata {extracted_metadata_path} is lacking the corresponding time series path {extracted_time_series_path}. Likely that is an activity without location data. Deleting this."
+                )
+                extracted_metadata_path.unlink()
 
     for extracted_metadata_path in tqdm(
         new_extracted_metadata_paths, desc="Enrich new activity data"

geo_activity_playground/importers/strava_checkout.py

@@ -190,11 +190,10 @@ def import_from_strava_checkout() -> None:
                 dateutil.parser.parse(row["Activity Date"], dayfirst=dayfirst)
             ),
         }
-        meta_path = activity_extracted_meta_dir() / f"{activity_id}.pickle"
-        with open(meta_path, "wb") as f:
-            pickle.dump(table_activity_meta, f)
 
-        time_series_path = activity_extracted_time_series_dir() / f"{activity_id}.parquet"
+        time_series_path = (
+            activity_extracted_time_series_dir() / f"{activity_id}.parquet"
+        )
         if time_series_path.exists():
             time_series = pd.read_parquet(time_series_path)
         else:
@@ -216,6 +215,9 @@ def import_from_strava_checkout() -> None:
         if "latitude" not in time_series.columns:
             continue
 
+        meta_path = activity_extracted_meta_dir() / f"{activity_id}.pickle"
+        with open(meta_path, "wb") as f:
+            pickle.dump(table_activity_meta, f)
         time_series.to_parquet(time_series_path)
     work_tracker.close()
 

geo_activity_playground/webui/app.py

@@ -1,9 +1,9 @@
+import importlib
 import json
 import pathlib
 import secrets
 
 from flask import Flask
-from flask import redirect
 from flask import render_template
 from flask import request
 
@@ -23,7 +23,6 @@ from .summary.blueprint import make_summary_blueprint
 from .tile.blueprint import make_tile_blueprint
 from .upload.blueprint import make_upload_blueprint
 from geo_activity_playground.core.privacy_zones import PrivacyZone
-from geo_activity_playground.webui.strava.controller import StravaController
 
 
 def route_search(app: Flask, repository: ActivityRepository) -> None:
@@ -47,7 +46,7 @@ def route_start(app: Flask, repository: ActivityRepository) -> None:
 
 
 def route_settings(app: Flask) -> None:
-    @app.route("/settings")
+    @app.route("/settings/")
     def settings():
         return render_template("settings.html.j2")
 
@@ -122,4 +121,11 @@ def webui_main(
         url_prefix="/upload",
     )
 
+    @app.context_processor
+    def inject_global_variables() -> dict:
+        return {
+            "version": importlib.metadata.version("geo-activity-playground"),
+            "num_activities": len(repository),
+        }
+
     app.run(host=host, port=port)

geo_activity_playground/webui/summary/controller.py

@@ -61,11 +61,11 @@ 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}")
 
-    if "calories" in subset.columns:
+    if "calories" in subset.columns and not pd.isna(subset["calories"]).all():
         i = subset["calories"].idxmax()
         nominations[i].append(f"Most calories burnt: {meta.loc[i].calories:.0f} kcal")
 
-    if "steps" in subset:
+    if "steps" in subset.columns and not pd.isna(subset["steps"]).all():
         i = subset["steps"].idxmax()
         nominations[i].append(f"Most steps: {meta.loc[i].steps:.0f}")
 
@@ -87,15 +87,16 @@ def nominate_activities(meta: pd.DataFrame) -> dict[int, list[str]]:
         ]:
             if key in group.columns:
                 series = group[key]
-                i = series.idxmax()
-                if not pd.isna(i):
-                    nominations[i].append(text(meta.loc[i]))
+                if not pd.isna(series).all():
+                    i = series.idxmax()
+                    if not pd.isna(i):
+                        nominations[i].append(text(meta.loc[i]))
 
     return nominations
 
 
 def embellished_activities(meta: pd.DataFrame) -> pd.DataFrame:
-    df = meta.copy()
+    df = meta.loc[~pd.isna(meta["start"])].copy()
     df["year"] = [start.year for start in df["start"]]
     df["month"] = [start.month for start in df["start"]]
     df["day"] = [start.day for start in df["start"]]

geo_activity_playground/webui/templates/page.html.j2

@@ -60,7 +60,7 @@
                 </button>
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-
+                        {% if num_activities > 0 %}
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('summary.index') }}">Summary</a>
                         </li>
@@ -86,6 +86,7 @@
                             <a class="nav-link" aria-current="page"
                                 href="{{ url_for('equipment.index') }}">Equipment</a>
                         </li>
+                        {% endif %}
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('upload.index') }}">Upload</a>
                         </li>
@@ -155,7 +156,10 @@
         {% endblock %}
 
         <div class="row border-top py-3 my-4">
-            <ul class="nav col-12 justify-content-end">
+            <ul class="nav col-4">
+                <li class="nav-item text-muted px-2 nav-link">Version {{ version }}</li>
+            </ul>
+            <ul class="nav col-8 justify-content-end">
                 <li class="nav-item"><a href="https://github.com/martin-ueding/geo-activity-playground"
                         class="nav-link px-2 text-muted" target="_blank">GitHub</a></li>
                 <li class="nav-item"><a href="https://martin-ueding.github.io/geo-activity-playground/"

{geo_activity_playground-0.26.1.dist-info → geo_activity_playground-0.26.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.26.1
+Version: 0.26.3
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding
@@ -24,7 +24,7 @@ Requires-Dist: gpxpy (>=1.5.0,<2.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: matplotlib (>=3.6.3,<4.0.0)
 Requires-Dist: numpy (>=1.22.4,<2.0.0)
-Requires-Dist: pandas (>=2.0,<3.0)
+Requires-Dist: pandas (>=2.2,<3.0)
 Requires-Dist: pyarrow (>=16.1.0,<17.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)

{geo_activity_playground-0.26.1.dist-info → geo_activity_playground-0.26.3.dist-info}/RECORD

@@ -4,7 +4,7 @@ geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 geo_activity_playground/core/activities.py,sha256=I1lsn1gO_P9eHbZCZlkCO6Lvi5sqXq_-c-1aDv6uKMs,8081
 geo_activity_playground/core/config.py,sha256=YjqCiEmIAa-GM1-JfBctMEsl8-I56pZyyDdTyPduOzw,477
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
-geo_activity_playground/core/enrichment.py,sha256=wRVhrUCsvs2CcVhN-BQwxk_W_0E0AFp1_hncGzWNNvo,6435
+geo_activity_playground/core/enrichment.py,sha256=CIkUS_wtLJ8ZLwtzxsZ8gRn8mkITLwIwq3AzTxZ-kzI,6994
 geo_activity_playground/core/heatmap.py,sha256=bRLQHzmTEsQbX8XWeg85x_lRGk272UoYRiCnoxZ5da0,4189
 geo_activity_playground/core/paths.py,sha256=ohJN_xNLh303uc0ATpL4iH01xANIE86pILRaQi4e-RQ,1893
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
@@ -22,7 +22,7 @@ geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 geo_activity_playground/importers/activity_parsers.py,sha256=m2SpvGlTZ8F3gG6YB24_ZFrlOAbtqbfWi-GIYspeUco,10593
 geo_activity_playground/importers/directory.py,sha256=YTYuroH-oYviL2a9B7No-6Fx4RrkhMqf60Yh-7dGats,5384
 geo_activity_playground/importers/strava_api.py,sha256=ihy_ezq_gYUy1V4jbtg41N6K0ilYVOEiPZE07lSiUHU,8444
-geo_activity_playground/importers/strava_checkout.py,sha256=6_t6AusNuPCOCfdG5KlfK0e4zMrVFM0sIRw7izQKOMg,8572
+geo_activity_playground/importers/strava_checkout.py,sha256=gOmqwDJE2kP6KFwxJ8_zGn5kcEcRqnfOqw8jJ4eHcaU,8596
 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
@@ -33,7 +33,7 @@ geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3q
 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
 geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=NOsMPUBy1UQM_YebtT6RQxLSgSGvCMetqi_mspJmUjQ,5229
-geo_activity_playground/webui/app.py,sha256=a6RcsPH-n1Ru6RybkAPCRENL9KnPvxfPBJI9IzsEB5U,3980
+geo_activity_playground/webui/app.py,sha256=h8yc6Ls7ozE7IblCM6TFs30t6J7FoTeWATLWwp_UVQc,4117
 geo_activity_playground/webui/calendar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/calendar/blueprint.py,sha256=rlnhgU2DWAcdLMRq7m77NzrM_aDyp4s3kuuQHuzjHhg,782
 geo_activity_playground/webui/calendar/controller.py,sha256=QpSAkR2s1sbLSu6P_fNNTccgGglOzEH2PIv1XwKxeVY,2778
@@ -80,10 +80,10 @@ geo_activity_playground/webui/strava/templates/strava/client-id.html.j2,sha256=m
 geo_activity_playground/webui/strava/templates/strava/connected.html.j2,sha256=TN6H8YPjG2zk8fodTaSaloTEJCXnpgTCIRX_uEVTiNI,274
 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=i6A9-S9j9Hm67FcZPzJpqMgxRVsXbDmJiVLGiRtZIqk,8805
+geo_activity_playground/webui/summary/controller.py,sha256=ZOrwfrKjpc8hecUYImBvesKXZi06obfR1yhQkVTeWzw,8981
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=rsII1eMY-xNugh8A9SecnEcDZqkEOWYIfiHAGroQYuM,4442
 geo_activity_playground/webui/templates/home.html.j2,sha256=fp48MjBuO4QJfQz6YPOWH56IzStgaclx9XbwEKmUFHQ,2403
-geo_activity_playground/webui/templates/page.html.j2,sha256=KwgUw7zOjWNVSZKM4BGWOaBbPhGZaaOXCvNV9pL-0R4,9160
+geo_activity_playground/webui/templates/page.html.j2,sha256=RyB-G2dhdhTUSwXAxquylk2ma3DXMZ490g6yrgsxA-I,9388
 geo_activity_playground/webui/templates/search.html.j2,sha256=FvNRoDfUlSzXjM_tqZY_fDhuhUDgbPaY73q56gdvF1A,1130
 geo_activity_playground/webui/templates/settings.html.j2,sha256=-q9GflrG2t6kSt-NerBN5NV1gRp12JT3KgGp_aPaKT8,674
 geo_activity_playground/webui/tile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -93,8 +93,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=BWcSlLy_fVAodDlnXkxE4eIotC_UHrjldACrToA-iAQ,3975
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=hfXkEXaz_MkM46rU56423D6V6WtK-EAXPszSY-_-Tx8,1471
-geo_activity_playground-0.26.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.26.1.dist-info/METADATA,sha256=jEJ07iHCszCGv_rGgRgCtdevF-2D10KeakN-5eNRARA,1665
-geo_activity_playground-0.26.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.26.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.26.1.dist-info/RECORD,,
+geo_activity_playground-0.26.3.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.26.3.dist-info/METADATA,sha256=9v9y9sR7bMNsUoFDrYQC9d-YQ0VL0UDVHhM6RY4I0iA,1665
+geo_activity_playground-0.26.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.26.3.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.26.3.dist-info/RECORD,,