geo-activity-playground 0.40.0__tar.gz → 0.40.1__tar.gz

{geo_activity_playground-0.40.0 → geo_activity_playground-0.40.1}/PKG-INFO

@@ -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 → geo_activity_playground-0.40.1}/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-0.40.1/geo_activity_playground/core/test_datamodel.py

@@ -0,0 +1,20 @@
+import datetime
+
+from .datamodel import Activity
+
+
+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-0.40.0 → geo_activity_playground-0.40.1}/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 → geo_activity_playground-0.40.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.40.0"
+version = "0.40.1"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"

geo_activity_playground-0.40.0/geo_activity_playground/core/test_datamodel.py

@@ -1,7 +0,0 @@
-from .datamodel import Activity
-
-
-def test_zero_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