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

geo_activity_playground/core/datamodel.py

@@ -112,12 +112,12 @@ class Activity(DB.Model):
 
     @property
     def average_speed_moving_kmh(self) -> Optional[float]:
-        if self.moving_time is not None:
+        if self.moving_time:
             return self.distance_km / (self.moving_time.total_seconds() / 3_600)
 
     @property
     def average_speed_elapsed_kmh(self) -> Optional[float]:
-        if self.elapsed_time is not None:
+        if self.elapsed_time:
             return self.distance_km / (self.elapsed_time.total_seconds() / 3_600)
 
     @property

geo_activity_playground/core/test_datamodel.py

@@ -1,7 +1,20 @@
+import datetime
+
 from .datamodel import Activity
 
 
-def test_zero_duration() -> None:
+def test_no_duration() -> None:
     activity = Activity(name="Test", distance_km=10.0)
     assert activity.average_speed_elapsed_kmh is None
     assert activity.average_speed_moving_kmh is None
+
+
+def test_zero_duration() -> None:
+    activity = Activity(
+        name="Test",
+        distance_km=10.0,
+        elapsed_time=datetime.timedelta(seconds=0),
+        moving_time=datetime.timedelta(seconds=0),
+    )
+    assert activity.average_speed_elapsed_kmh is None
+    assert activity.average_speed_moving_kmh is None

geo_activity_playground/importers/strava_checkout.py

@@ -271,9 +271,8 @@ def convert_strava_checkout(
             continue
 
         activity_date = dateutil.parser.parse(row["Activity Date"])
-        activity_name = row["Activity Name"]
+        activity_name: str = row["Activity Name"]
         activity_kind = row["Activity Type"]
-        is_commute = row["Commute"] == "true" or row["Commute"] == True
         equipment = (
             nan_as_none(row["Activity Gear"])
             or nan_as_none(row["Bike"])
@@ -285,8 +284,6 @@ def convert_strava_checkout(
         activity_target = playground_path / "Activities" / str(activity_kind)
         if equipment:
             activity_target /= str(equipment)
-        if is_commute:
-            activity_target /= "Commute"
 
         activity_target /= "".join(
             [
@@ -294,7 +291,7 @@ def convert_strava_checkout(
                 "-",
                 f"{activity_date.hour:02d}-{activity_date.minute:02d}-{activity_date.second:02d}",
                 " ",
-                activity_name,
+                activity_name.replace("/", "_"),
             ]
             + activity_file.suffixes
         )

{geo_activity_playground-0.40.0.dist-info → geo_activity_playground-0.40.1.dist-info}/METADATA

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

{geo_activity_playground-0.40.0.dist-info → geo_activity_playground-0.40.1.dist-info}/RECORD

@@ -14,7 +14,7 @@ geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 geo_activity_playground/core/activities.py,sha256=R3RDvOkHyWL2Wr-Bgqjgr5wDjVqaJ3WSECL2fbMyiu8,5485
 geo_activity_playground/core/config.py,sha256=eGWWbNfHa6H64AHCnFYTsAJ7-pWi-PhyxL4hjZ4u03U,5256
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
-geo_activity_playground/core/datamodel.py,sha256=v5tLkPO53ilVIE78_gLz7igi6qh0ffdDPJmF7P2lkgE,10303
+geo_activity_playground/core/datamodel.py,sha256=EHfZEYL4Dc881R5fL7eiJ24867NYgAbdXtRYI_I-sPI,10279
 geo_activity_playground/core/enrichment.py,sha256=kc9747ocSs2_3R7oW9Rjs3_lKP37gdvBUbyWpILaqHc,7346
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=naErjAC7ZCFhOF6d492kbegZxCdzbpGcJvjQLJTE4xE,5016
@@ -25,7 +25,7 @@ geo_activity_playground/core/raster_map.py,sha256=Cq8dNLdxVQg3Agzn2bmXVu0-8kZf56
 geo_activity_playground/core/similarity.py,sha256=L2de3DPRdDeDY5AxZwLDcH7FjHWRWklr41VNU06q9kQ,3117
 geo_activity_playground/core/summary_stats.py,sha256=v5FtWnE1imDF5axI6asVN55wCrlD73oZ6lvqzxsTN2c,1006
 geo_activity_playground/core/tasks.py,sha256=-_9cxekoHSWzCW4XblNeqrwi2tTqr5AE7_-p8fdqhwc,2886
-geo_activity_playground/core/test_datamodel.py,sha256=noNgiGzs2BOZvdi2FosLvW8YTinE6Gl7_JrEs7D8GBI,230
+geo_activity_playground/core/test_datamodel.py,sha256=-VrGHgx5Z3MSQPqHGmmm7atRJYbg5y_ukvRHKxk22PI,569
 geo_activity_playground/core/test_meta_search.py,sha256=zhuD343Xce-4Fkznw81DHQ7pK5eyX5UbcyCHuYRKsr8,3091
 geo_activity_playground/core/test_summary_stats.py,sha256=qH_45mPRFD2H-Rr0Ku-RYc67vhC7qKxbPr7J2F36uV8,3081
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
@@ -42,7 +42,7 @@ geo_activity_playground/importers/activity_parsers.py,sha256=yD7L5eDOpiLWf6RHSQf
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
 geo_activity_playground/importers/directory.py,sha256=4Q7UAFa7ztkgqf4FvPbH2LlrO-7a8Fu7tkYPHOpHm1g,5210
 geo_activity_playground/importers/strava_api.py,sha256=J0-VXNrLq22fhTcWkQPE5AVrzy5aegC7SBi-UXFtAy4,7576
-geo_activity_playground/importers/strava_checkout.py,sha256=uNcmA-ADURNpW5zJdRkG07eHjj1MVoIKsv0EWdc5iRw,10090
+geo_activity_playground/importers/strava_checkout.py,sha256=3AEFlNr811MdVz_Ww1zz_alptr_3mDvGr188bM3qU7U,9977
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
 geo_activity_playground/importers/test_strava_api.py,sha256=7b8bl5Rh2BctCmvTPEhCadxtUOq3mfzuadD6F5XxRio,398
@@ -138,8 +138,8 @@ geo_activity_playground/webui/templates/square_planner/index.html.j2,sha256=-OnY
 geo_activity_playground/webui/templates/summary/index.html.j2,sha256=T8YUGMXaZYeVl7Q5-H1YhdnGo3bx_LtExPQ60qj_Zhs,5638
 geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-0.40.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.40.0.dist-info/METADATA,sha256=lhX789KVp1udKHGEsa3XojbAwFYRHs2X1E0DlTr9veo,1758
-geo_activity_playground-0.40.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-geo_activity_playground-0.40.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.40.0.dist-info/RECORD,,
+geo_activity_playground-0.40.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.40.1.dist-info/METADATA,sha256=A-lrCQSSUmsBauIvH6dFq3Gbn7nlKQmstaPaN78TInw,1758
+geo_activity_playground-0.40.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+geo_activity_playground-0.40.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.40.1.dist-info/RECORD,,