geo-activity-playground 0.24.0__tar.gz → 0.24.1__tar.gz

{geo_activity_playground-0.24.0 → geo_activity_playground-0.24.1}/PKG-INFO

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

{geo_activity_playground-0.24.0 → geo_activity_playground-0.24.1}/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-0.24.0 → geo_activity_playground-0.24.1}/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-0.24.0 → geo_activity_playground-0.24.1}/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-0.24.0 → geo_activity_playground-0.24.1}/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-0.24.0 → geo_activity_playground-0.24.1}/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-0.24.0 → geo_activity_playground-0.24.1}/pyproject.toml

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