geo-activity-playground 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

geo_activity_playground/alembic/versions/85fe0348e8a2_add_time_series_uuid_field.py

@@ -0,0 +1,28 @@
+from typing import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "85fe0348e8a2"
+down_revision: Union[str, None] = "f2f50843be2d"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("activities", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("time_series_uuid", sa.String(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("activities", schema=None) as batch_op:
+        batch_op.drop_column("time_series_uuid")
+
+    # ### end Alembic commands ###

geo_activity_playground/alembic/versions/f2f50843be2d_make_all_fields_in_activity_nullable.py

@@ -0,0 +1,34 @@
+from typing import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "f2f50843be2d"
+down_revision: Union[str, None] = "dc8073871da7"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("activities", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("iana_timezone", sa.String(), nullable=True))
+        batch_op.add_column(sa.Column("start_country", sa.String(), nullable=True))
+        batch_op.alter_column("name", existing_type=sa.VARCHAR(), nullable=True)
+        batch_op.alter_column("distance_km", existing_type=sa.FLOAT(), nullable=True)
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("activities", schema=None) as batch_op:
+        batch_op.alter_column("distance_km", existing_type=sa.FLOAT(), nullable=False)
+        batch_op.alter_column("name", existing_type=sa.VARCHAR(), nullable=False)
+        batch_op.drop_column("start_country")
+        batch_op.drop_column("iana_timezone")
+
+    # ### end Alembic commands ###

geo_activity_playground/core/coordinates.py

@@ -1,4 +1,7 @@
+import typing
+
 import numpy as np
+import pandas as pd
 
 
 class Bounds:
@@ -15,7 +18,15 @@ class Bounds:
         return (self.x_min < x < self.x_max) and (self.y_min < y < self.y_max)
 
 
-def get_distance(lat_1: float, lon_1: float, lat_2: float, lon_2: float) -> float:
+FloatOrSeries = typing.TypeVar("FloatOrSeries", float, np.ndarray, pd.Series)
+
+
+def get_distance(
+    lat_1: FloatOrSeries,
+    lon_1: FloatOrSeries,
+    lat_2: FloatOrSeries,
+    lon_2: FloatOrSeries,
+) -> FloatOrSeries:
     """
     https://en.wikipedia.org/wiki/Haversine_formula
     """

geo_activity_playground/core/copernicus_dem.py

@@ -0,0 +1,95 @@
+import functools
+import math
+import pathlib
+from typing import Optional
+
+import boto3
+import botocore.config
+import botocore.exceptions
+import geotiff
+import numpy as np
+from scipy.interpolate import RegularGridInterpolator
+
+from .paths import USER_CACHE_DIR
+
+
+def s3_path(lat: int, lon: int) -> pathlib.Path:
+    lat_str = f"N{(lat):02d}" if lat >= 0 else f"S{(-lat):02d}"
+    lon_str = f"E{(lon):03d}" if lon >= 0 else f"W{(-lon):03d}"
+    result = (
+        USER_CACHE_DIR
+        / "Copernicus DEM"
+        / f"Copernicus_DSM_COG_30_{lat_str}_00_{lon_str}_00_DEM.tif"
+    )
+
+    result.parent.mkdir(exist_ok=True)
+    return result
+
+
+def ensure_copernicus_file(p: pathlib.Path) -> None:
+    if p.exists():
+        return
+    s3 = boto3.client(
+        "s3", config=botocore.config.Config(signature_version=botocore.UNSIGNED)
+    )
+    try:
+        s3.download_file("copernicus-dem-90m", f"{p.stem}/{p.name}", p)
+    except botocore.exceptions.ClientError as e:
+        pass
+
+
+@functools.lru_cache(9)
+def get_elevation_arrays(p: pathlib.Path) -> Optional[np.ndarray]:
+    ensure_copernicus_file(p)
+    if not p.exists():
+        return None
+    gt = geotiff.GeoTiff(p)
+    a = np.array(gt.read())
+    lon_array, lat_array = gt.get_coord_arrays()
+    return np.stack([a, lat_array, lon_array], axis=0)
+
+
+@functools.lru_cache(1)
+def get_interpolator(lat: int, lon: int) -> Optional[RegularGridInterpolator]:
+    arrays = get_elevation_arrays(s3_path(lat, lon))
+    # If we don't have data for the current center, we cannot do anything.
+    if arrays is None:
+        return None
+
+    # # Take a look at the neighbors. If all 8 neighbor grid cells are present, we can
+    # neighbor_shapes = [
+    #     get_elevation_arrays(s3_path(lat + lat_offset, lon + lon_offset)).shape
+    #     for lon_offset in [-1, 0, 1]
+    #     for lat_offset in [-1, 0, 1]
+    #     if get_elevation_arrays(s3_path(lat + lat_offset, lon + lon_offset)) is not None
+    # ]
+    # if len(neighbor_shapes) == 9 and len(set(neighbor_shapes)) == 1:
+    #     arrays = np.concatenate(
+    #         [
+    #             np.concatenate(
+    #                 [
+    #                     get_elevation_arrays(
+    #                         s3_path(lat + lat_offset, lon + lon_offset)
+    #                     )
+    #                     for lon_offset in [-1, 0, 1]
+    #                 ],
+    #                 axis=2,
+    #             )
+    #             for lat_offset in [1, 0, -1]
+    #         ],
+    #         axis=1,
+    #     )
+    lat_labels = arrays[1, :, 0]
+    lon_labels = arrays[2, 0, :]
+
+    return RegularGridInterpolator(
+        (lat_labels, lon_labels), arrays[0], bounds_error=False, fill_value=None
+    )
+
+
+def get_elevation(lat: float, lon: float) -> float:
+    interpolator = get_interpolator(math.floor(lat), math.floor(lon))
+    if interpolator is not None:
+        return float(interpolator((lat, lon)))
+    else:
+        return 0.0

geo_activity_playground/core/datamodel.py

@@ -1,7 +1,11 @@
 import datetime
 import json
 import logging
+import os
 import pathlib
+import shutil
+import uuid
+import zoneinfo
 from typing import Any
 from typing import Optional
 from typing import TypedDict
@@ -49,6 +53,7 @@ class ActivityMeta(TypedDict):
     calories: float
     commute: bool
     consider_for_achievements: bool
+    copernicus_elevation_gain: float
     distance_km: float
     elapsed_time: datetime.timedelta
     elevation_gain: float
@@ -85,27 +90,36 @@ class Activity(DB.Model):
 
     # Housekeeping data:
     id: Mapped[int] = mapped_column(primary_key=True)
-    name: Mapped[str] = mapped_column(sa.String, nullable=False)
-    distance_km: Mapped[float] = mapped_column(sa.Float, nullable=False)
+    name: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
+    distance_km: Mapped[Optional[float]] = mapped_column(sa.Float, nullable=True)
+    time_series_uuid: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
 
     # Where it comes from:
-    path: Mapped[str] = mapped_column(sa.String, nullable=True)
-    upstream_id: Mapped[str] = mapped_column(sa.String, nullable=True)
+    path: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
+    upstream_id: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
 
     # Crop data:
     index_begin: Mapped[int] = mapped_column(sa.Integer, nullable=True)
     index_end: Mapped[int] = mapped_column(sa.Integer, nullable=True)
 
     # Temporal data:
-    start: Mapped[datetime.datetime] = mapped_column(sa.DateTime, nullable=True)
-    elapsed_time: Mapped[datetime.timedelta] = mapped_column(sa.Interval, nullable=True)
-    moving_time: Mapped[datetime.timedelta] = mapped_column(sa.Interval, nullable=True)
+    start: Mapped[Optional[datetime.datetime]] = mapped_column(
+        sa.DateTime, nullable=True
+    )
+    iana_timezone: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
+    elapsed_time: Mapped[Optional[datetime.timedelta]] = mapped_column(
+        sa.Interval, nullable=True
+    )
+    moving_time: Mapped[Optional[datetime.timedelta]] = mapped_column(
+        sa.Interval, nullable=True
+    )
 
     # Geographic data:
     start_latitude: Mapped[float] = mapped_column(sa.Float, nullable=True)
     start_longitude: Mapped[float] = mapped_column(sa.Float, nullable=True)
     end_latitude: Mapped[float] = mapped_column(sa.Float, nullable=True)
     end_longitude: Mapped[float] = mapped_column(sa.Float, nullable=True)
+    start_country: Mapped[Optional[str]] = mapped_column(sa.String, nullable=True)
 
     # Elevation data:
     elevation_gain: Mapped[float] = mapped_column(sa.Float, nullable=True)
@@ -143,30 +157,36 @@ class Activity(DB.Model):
 
     @property
     def average_speed_moving_kmh(self) -> Optional[float]:
-        if self.moving_time:
+        if self.distance_km and self.moving_time:
             return self.distance_km / (self.moving_time.total_seconds() / 3_600)
         else:
             return None
 
     @property
     def average_speed_elapsed_kmh(self) -> Optional[float]:
-        if self.elapsed_time:
+        if self.distance_km and self.elapsed_time:
             return self.distance_km / (self.elapsed_time.total_seconds() / 3_600)
         else:
             return None
 
+    @property
+    def time_series_path(self) -> pathlib.Path:
+        return TIME_SERIES_DIR() / f"{self.time_series_uuid}.parquet"
+
     @property
     def raw_time_series(self) -> pd.DataFrame:
-        path = TIME_SERIES_DIR() / f"{self.id}.parquet"
         try:
-            time_series = pd.read_parquet(path)
+            time_series = pd.read_parquet(self.time_series_path)
             if "altitude" in time_series.columns:
                 time_series.rename(columns={"altitude": "elevation"}, inplace=True)
             return time_series
         except OSError as e:
-            logger.error(f"Error while reading {path}.")
+            logger.error(f"Error while reading {self.time_series_path}.")
             raise
 
+    def replace_time_series(self, time_series: pd.DataFrame) -> None:
+        time_series.to_parquet(self.time_series_path)
+
     @property
     def time_series(self) -> pd.DataFrame:
         if self.index_begin or self.index_end:
@@ -201,6 +221,15 @@ class Activity(DB.Model):
         ]:
             path.unlink(missing_ok=True)
 
+    @property
+    def start_local_tz(self) -> Optional[datetime.datetime]:
+        if self.start and self.iana_timezone:
+            return self.start.replace(
+                microsecond=0, tzinfo=zoneinfo.ZoneInfo("UTC")
+            ).astimezone(zoneinfo.ZoneInfo(self.iana_timezone))
+        else:
+            return self.start
+
 
 class Tag(DB.Model):
     __tablename__ = "tags"
@@ -329,7 +358,6 @@ def get_or_make_equipment(name: str, config: Config) -> Equipment:
         equipment = Equipment(
             name=name, offset_km=config.equipment_offsets.get(name, 0)
         )
-        DB.session.add(equipment)
         return equipment
 
 
@@ -356,7 +384,7 @@ class Kind(DB.Model):
     __table_args__ = (sa.UniqueConstraint("name", name="kinds_name"),)
 
 
-def get_or_make_kind(name: str, config: Config) -> Kind:
+def get_or_make_kind(name: str) -> Kind:
     kinds = DB.session.scalars(sqlalchemy.select(Kind).where(Kind.name == name)).all()
     if kinds:
         assert len(kinds) == 1, f"There must be only one kind with name '{name}'."
@@ -364,9 +392,8 @@ def get_or_make_kind(name: str, config: Config) -> Kind:
     else:
         kind = Kind(
             name=name,
-            consider_for_achievements=name in config.kinds_without_achievements,
+            consider_for_achievements=True,
         )
-        DB.session.add(kind)
         return kind