GH-89: Fix some bugs

martin-ueding · Feb 3, 2024 · 4cb1690 · 4cb1690
1 parent f9ab771
commit 4cb1690
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/geo_activity_playground/core/cache_migrations.py b/geo_activity_playground/core/cache_migrations.py
@@ -8,7 +8,7 @@
 
 from geo_activity_playground.core.paths import activities_path
 from geo_activity_playground.core.paths import activity_timeseries_dir
-from geo_activity_playground.core.paths import work_tracker_path
+from geo_activity_playground.core.tasks import work_tracker_path
 
 logger = logging.getLogger(__name__)
 

diff --git a/geo_activity_playground/core/paths.py b/geo_activity_playground/core/paths.py
@@ -16,20 +16,10 @@ def path_creator() -> pathlib.Path:
 
 
 cache_dir = make_path(pathlib.Path("Cache"))
-activity_timeseries_dir = make_path(cache_dir / "Activity Timeseries")
+activity_timeseries_dir = lambda: make_path(cache_dir() / "Activity Timeseries")
 
 activities_path = lambda: cache_dir() / "activities.parquet"
 
 
 def activity_timeseries_path(activity_id: int) -> pathlib.Path:
     return activity_timeseries_dir() / f"{activity_id}.parquet"
-
-
-def work_tracker_path(name: str) -> pathlib.Path:
-    return cache_dir() / f"work-tracker-{name}.pickle"
-
-
-def osm_tile_path(x: int, y: int, zoom: int) -> pathlib.Path:
-    path = pathlib.Path("Open Street Map Tiles") / f"{zoom}/{x}/{y}.png"
-    path.parent.mkdir(parents=True, exist_ok=True)
-    return path
diff --git a/geo_activity_playground/core/tasks.py b/geo_activity_playground/core/tasks.py
@@ -4,7 +4,11 @@
 import pickle
 from typing import Any
 
-from geo_activity_playground.core.paths import work_tracker_path
+from geo_activity_playground.core.paths import cache_dir
+
+
+def work_tracker_path(name: str) -> pathlib.Path:
+    return cache_dir() / f"work-tracker-{name}.pickle"
 
 
 @contextlib.contextmanager

diff --git a/geo_activity_playground/core/tiles.py b/geo_activity_playground/core/tiles.py
@@ -10,11 +10,15 @@
 import requests
 from PIL import Image
 
-from geo_activity_playground.core.paths import osm_tile_path
-
 logger = logging.getLogger(__name__)
 
 
+def osm_tile_path(x: int, y: int, zoom: int) -> pathlib.Path:
+    path = pathlib.Path("Open Street Map Tiles") / f"{zoom}/{x}/{y}.png"
+    path.parent.mkdir(parents=True, exist_ok=True)
+    return path
+
+
 def compute_tile(lat: float, lon: float, zoom: int) -> tuple[int, int]:
     x = np.radians(lon)
     y = np.arcsinh(np.tan(np.radians(lat)))