geo-activity-playground 0.33.4__tar.gz → 0.34.0__tar.gz

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/PKG-INFO

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

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/importers/strava_checkout.py

@@ -146,7 +146,7 @@ def float_with_comma_or_period(x: str) -> Optional[float]:
 
 def import_from_strava_checkout() -> None:
     checkout_path = pathlib.Path("Strava Export")
-    with open(checkout_path / "activities.csv") as f:
+    with open(checkout_path / "activities.csv", encoding="utf-8") as f:
         rows = parse_csv(f.read())
     header = rows[0]
 
@@ -159,9 +159,15 @@ def import_from_strava_checkout() -> None:
 
     if header[0] == EXPECTED_COLUMNS[0]:
         dayfirst = False
-    if header[0] == "Aktivitäts-ID":
+    elif header[0] == "Aktivitäts-ID":
         header = EXPECTED_COLUMNS
         dayfirst = True
+    else:
+        logger.error(
+            f"You are trying to import a Strava checkout where the `activities.csv` contains an unexpected header format. In order to import this, we need to map these to the English ones. Unfortunately Strava often changes the number of columns. This means that the program needs to be updated to match the new Strava export format. Please go to https://github.com/martin-ueding/geo-activity-playground/issues and open a new issue and share the following output in the ticket:"
+        )
+        print(header)
+        sys.exit(1)
 
     table = {
         header[i]: [rows[r][i] for r in range(1, len(rows))] for i in range(len(header))

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/webui/activity/blueprint.py

@@ -55,6 +55,13 @@ def make_activity_blueprint(
             **activity_controller.render_day(int(year), int(month), int(day)),
         )
 
+    @blueprint.route("/day-sharepic/<year>/<month>/<day>/sharepic.png")
+    def day_sharepic(year: str, month: str, day: str):
+        return Response(
+            activity_controller.render_day_sharepic(int(year), int(month), int(day)),
+            mimetype="image/png",
+        )
+
     @blueprint.route("/name/<name>")
     def name(name: str):
         return render_template(

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/webui/activity/controller.py

@@ -170,8 +170,24 @@ class ActivityController:
             "date": datetime.date(year, month, day).isoformat(),
             "total_distance": activities_that_day["distance_km"].sum(),
             "total_elapsed_time": activities_that_day["elapsed_time"].sum(),
+            "day": day,
+            "month": month,
+            "year": year,
         }
 
+    def render_day_sharepic(self, year: int, month: int, day: int) -> bytes:
+        meta = self._repository.meta
+        selection = meta["start"].dt.date == datetime.date(year, month, day)
+        activities_that_day = meta.loc[selection]
+
+        time_series = [
+            self._repository.get_time_series(activity_id)
+            for activity_id in activities_that_day["id"]
+        ]
+        assert len(activities_that_day) > 0
+        assert len(time_series) > 0
+        return (make_day_sharepic(activities_that_day, time_series, self._config),)
+
     def render_all(self) -> dict:
         cmap = matplotlib.colormaps["Dark2"]
         fc = geojson.FeatureCollection(
@@ -452,14 +468,10 @@ def pixels_in_bounds(bounds: PixelBounds) -> int:
     return (bounds.x_max - bounds.x_min) * (bounds.y_max - bounds.y_min)
 
 
-def make_sharepic(
-    activity: ActivityMeta,
-    time_series: pd.DataFrame,
-    sharepic_suppressed_fields: list[str],
-    config: Config,
-) -> bytes:
-    tile_x = time_series["x"]
-    tile_y = time_series["y"]
+def make_sharepic_base(time_series_list: list[pd.DataFrame], config: Config):
+    all_time_series = pd.concat(time_series_list)
+    tile_x = all_time_series["x"]
+    tile_y = all_time_series["y"]
     tile_width = tile_x.max() - tile_x.min()
     tile_height = tile_y.max() - tile_y.min()
 
@@ -495,16 +507,32 @@ def make_sharepic(
     img = Image.fromarray((background * 255).astype("uint8"), "RGB")
     draw = ImageDraw.Draw(img, mode="RGBA")
 
-    for _, group in time_series.groupby("segment_id"):
-        yx = list(
-            zip(
-                (tile_xz - tile_xz_center[0]) * OSM_TILE_SIZE + target_width / 2,
-                (tile_yz - tile_xz_center[1]) * OSM_TILE_SIZE + target_map_height / 2,
+    for time_series in time_series_list:
+        for _, group in time_series.groupby("segment_id"):
+            yx = list(
+                zip(
+                    (tile_xz - tile_xz_center[0]) * OSM_TILE_SIZE + target_width / 2,
+                    (tile_yz - tile_xz_center[1]) * OSM_TILE_SIZE
+                    + target_map_height / 2,
+                )
             )
-        )
 
-        draw.line(yx, fill="red", width=4)
+            draw.line(yx, fill="red", width=4)
+
+    return img
+
 
+def make_sharepic(
+    activity: ActivityMeta,
+    time_series: pd.DataFrame,
+    sharepic_suppressed_fields: list[str],
+    config: Config,
+) -> bytes:
+    footer_height = 100
+
+    img = make_sharepic_base([time_series], config)
+
+    draw = ImageDraw.Draw(img, mode="RGBA")
     draw.rectangle(
         [0, img.height - footer_height, img.width, img.height], fill=(0, 0, 0, 180)
     )
@@ -545,6 +573,48 @@ def make_sharepic(
     return bytes(f.getbuffer())
 
 
+def make_day_sharepic(
+    activities: pd.DataFrame,
+    time_series_list: list[pd.DataFrame],
+    config: Config,
+) -> bytes:
+    footer_height = 100
+
+    img = make_sharepic_base(time_series_list, config)
+
+    draw = ImageDraw.Draw(img, mode="RGBA")
+    draw.rectangle(
+        [0, img.height - footer_height, img.width, img.height], fill=(0, 0, 0, 180)
+    )
+
+    date = activities.iloc[0]["start"].date()
+    distance_km = activities["distance_km"].sum()
+    elapsed_time: pd.Timedelta = activities["elapsed_time"].sum()
+    elapsed_time = elapsed_time.round("s")
+
+    facts = {
+        "date": f"{date}",
+        "distance_km": f"{distance_km:.1f} km",
+        "elapsed_time": re.sub(r"^0 days ", "", f"{elapsed_time}"),
+    }
+
+    draw.text(
+        (35, img.height - footer_height + 10),
+        "      ".join(facts.values()),
+        font_size=20,
+    )
+
+    draw.text(
+        (img.width - 250, img.height - 20),
+        "Map: © Open Street Map Contributors",
+        font_size=14,
+    )
+
+    f = io.BytesIO()
+    img.save(f, format="png")
+    return bytes(f.getbuffer())
+
+
 def _extract_heart_rate_zones(
     time_series: pd.DataFrame, heart_rate_zone_computer: HeartRateZoneComputer
 ) -> Optional[pd.DataFrame]:

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/webui/activity/templates/activity/day.html.j2

@@ -30,7 +30,7 @@
         <ol>
             {% for activity in activities %}
             <li><span style="color: {{ activity['color'] }};">█</span> <a
-                    href="{{ url_for('activity.show', id=activity.id) }}">{{
+                    href="{{ url_for('.show', id=activity.id) }}">{{
                     activity.name }}</a></li>
             {% endfor %}
         </ol>
@@ -80,4 +80,8 @@
     </div>
 </div>
 
+<h2>Share picture</h2>
+
+<p><img src="{{ url_for('.day_sharepic', year=year, month=month, day=day) }}" /></p>
+
 {% endblock %}

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/webui/equipment/controller.py

@@ -87,7 +87,7 @@ class EquipmentController:
                 )
                 .mark_bar()
                 .encode(
-                    alt.X("kind", title="Year"),
+                    alt.X("kind", title="Kind"),
                     alt.Y("sum(distance_km)", title="Distance / km"),
                 )
                 .to_json(format="vega")

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/geo_activity_playground/webui/summary/controller.py

@@ -105,6 +105,7 @@ def embellished_activities(meta: pd.DataFrame) -> pd.DataFrame:
     df["month"] = [start.month for start in df["start"]]
     df["day"] = [start.day for start in df["start"]]
     df["week"] = [start.isocalendar().week for start in df["start"]]
+    df["iso_year"] = [start.isocalendar().year for start in df["start"]]
     df["hours"] = [
         elapsed_time.total_seconds() / 3600 for elapsed_time in df["elapsed_time"]
     ]
@@ -188,8 +189,8 @@ def plot_yearly_distance(year_kind_total: pd.DataFrame, kind_scale: alt.Scale) -
 
 def plot_year_cumulative(df: pd.DataFrame) -> str:
     year_cumulative = (
-        df[["year", "week", "distance_km"]]
-        .groupby("year")
+        df[["iso_year", "week", "distance_km"]]
+        .groupby("iso_year")
         .apply(
             lambda group: pd.DataFrame(
                 {"week": group["week"], "distance_km": group["distance_km"].cumsum()}
@@ -205,10 +206,10 @@ def plot_year_cumulative(df: pd.DataFrame) -> str:
         .encode(
             alt.X("week", title="Week"),
             alt.Y("distance_km", title="Distance / km"),
-            alt.Color("year:N", title="Year"),
+            alt.Color("iso_year:N", title="Year"),
             [
                 alt.Tooltip("week", title="Week"),
-                alt.Tooltip("year:N", title="Year"),
+                alt.Tooltip("iso_year:N", title="Year"),
                 alt.Tooltip("distance_km", title="Distance / km"),
             ],
         )
@@ -234,26 +235,26 @@ def tabulate_year_kind_mean(df: pd.DataFrame) -> pd.DataFrame:
 
 def plot_weekly_distance(df: pd.DataFrame, kind_scale: alt.Scale) -> str:
     week_kind_total_distance = (
-        df[["year", "week", "kind", "distance_km"]]
-        .groupby(["year", "week", "kind"])
+        df[["iso_year", "week", "kind", "distance_km"]]
+        .groupby(["iso_year", "week", "kind"])
         .sum()
         .reset_index()
     )
     week_kind_total_distance["year_week"] = [
         f"{year}-{week:02d}"
         for year, week in zip(
-            week_kind_total_distance["year"], week_kind_total_distance["week"]
+            week_kind_total_distance["iso_year"], week_kind_total_distance["week"]
         )
     ]
 
-    last_year = week_kind_total_distance["year"].iloc[-1]
+    last_year = week_kind_total_distance["iso_year"].iloc[-1]
     last_week = week_kind_total_distance["week"].iloc[-1]
 
     return (
         alt.Chart(
             week_kind_total_distance.loc[
-                (week_kind_total_distance["year"] == last_year)
-                | (week_kind_total_distance["year"] == last_year - 1)
+                (week_kind_total_distance["iso_year"] == last_year)
+                | (week_kind_total_distance["iso_year"] == last_year - 1)
                 & (week_kind_total_distance["week"] >= last_week)
             ],
             title="Weekly Distance",

{geo_activity_playground-0.33.4 → geo_activity_playground-0.34.0}/pyproject.toml

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