geo-activity-playground 0.33.3__py3-none-any.whl → 0.34.1__py3-none-any.whl

geo_activity_playground/explorer/video.py

@@ -9,13 +9,14 @@ from typing import Tuple
 
 import numpy as np
 import pandas as pd
-import scipy.interpolate
 from PIL import Image
 from PIL import ImageEnhance
 from tqdm import tqdm
 
 from ..core.tiles import get_tile
 
+# import scipy.interpolate
+
 
 def build_image(
     center_x: float,

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/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/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/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/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/webui/static/Leaflet.fullscreen.min.js

@@ -0,0 +1 @@
+L.Control.Fullscreen=L.Control.extend({options:{position:"topleft",title:{"false":"View Fullscreen","true":"Exit Fullscreen"}},onAdd:function(map){var container=L.DomUtil.create("div","leaflet-control-fullscreen leaflet-bar leaflet-control");this.link=L.DomUtil.create("a","leaflet-control-fullscreen-button leaflet-bar-part",container);this.link.href="#";this._map=map;this._map.on("fullscreenchange",this._toggleTitle,this);this._toggleTitle();L.DomEvent.on(this.link,"click",this._click,this);return container},_click:function(e){L.DomEvent.stopPropagation(e);L.DomEvent.preventDefault(e);this._map.toggleFullscreen(this.options)},_toggleTitle:function(){this.link.title=this.options.title[this._map.isFullscreen()]}});L.Map.include({isFullscreen:function(){return this._isFullscreen||false},toggleFullscreen:function(options){var container=this.getContainer();if(this.isFullscreen()){if(options&&options.pseudoFullscreen){this._disablePseudoFullscreen(container)}else if(document.exitFullscreen){document.exitFullscreen()}else if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}else if(document.msExitFullscreen){document.msExitFullscreen()}else{this._disablePseudoFullscreen(container)}}else{if(options&&options.pseudoFullscreen){this._enablePseudoFullscreen(container)}else if(container.requestFullscreen){container.requestFullscreen()}else if(container.mozRequestFullScreen){container.mozRequestFullScreen()}else if(container.webkitRequestFullscreen){container.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT)}else if(container.msRequestFullscreen){container.msRequestFullscreen()}else{this._enablePseudoFullscreen(container)}}},_enablePseudoFullscreen:function(container){L.DomUtil.addClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(true);this.invalidateSize();this.fire("fullscreenchange")},_disablePseudoFullscreen:function(container){L.DomUtil.removeClass(container,"leaflet-pseudo-fullscreen");this._setFullscreen(false);this.invalidateSize();this.fire("fullscreenchange")},_setFullscreen:function(fullscreen){this._isFullscreen=fullscreen;var container=this.getContainer();if(fullscreen){L.DomUtil.addClass(container,"leaflet-fullscreen-on")}else{L.DomUtil.removeClass(container,"leaflet-fullscreen-on")}},_onFullscreenChange:function(e){var fullscreenElement=document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement;if(fullscreenElement===this.getContainer()&&!this._isFullscreen){this._setFullscreen(true);this.fire("fullscreenchange")}else if(fullscreenElement!==this.getContainer()&&this._isFullscreen){this._setFullscreen(false);this.fire("fullscreenchange")}}});L.Map.mergeOptions({fullscreenControl:false});L.Map.addInitHook(function(){if(this.options.fullscreenControl){this.fullscreenControl=new L.Control.Fullscreen(this.options.fullscreenControl);this.addControl(this.fullscreenControl)}var fullscreenchange;if("onfullscreenchange"in document){fullscreenchange="fullscreenchange"}else if("onmozfullscreenchange"in document){fullscreenchange="mozfullscreenchange"}else if("onwebkitfullscreenchange"in document){fullscreenchange="webkitfullscreenchange"}else if("onmsfullscreenchange"in document){fullscreenchange="MSFullscreenChange"}if(fullscreenchange){var onFullscreenChange=L.bind(this._onFullscreenChange,this);this.whenReady(function(){L.DomEvent.on(document,fullscreenchange,onFullscreenChange)});this.on("unload",function(){L.DomEvent.off(document,fullscreenchange,onFullscreenChange)})}});L.control.fullscreen=function(options){return new L.Control.Fullscreen(options)};

geo_activity_playground/webui/static/MarkerCluster.Default.css

@@ -0,0 +1,60 @@
+.marker-cluster-small {
+	background-color: rgba(181, 226, 140, 0.6);
+	}
+.marker-cluster-small div {
+	background-color: rgba(110, 204, 57, 0.6);
+	}
+
+.marker-cluster-medium {
+	background-color: rgba(241, 211, 87, 0.6);
+	}
+.marker-cluster-medium div {
+	background-color: rgba(240, 194, 12, 0.6);
+	}
+
+.marker-cluster-large {
+	background-color: rgba(253, 156, 115, 0.6);
+	}
+.marker-cluster-large div {
+	background-color: rgba(241, 128, 23, 0.6);
+	}
+
+	/* IE 6-8 fallback colors */
+.leaflet-oldie .marker-cluster-small {
+	background-color: rgb(181, 226, 140);
+	}
+.leaflet-oldie .marker-cluster-small div {
+	background-color: rgb(110, 204, 57);
+	}
+
+.leaflet-oldie .marker-cluster-medium {
+	background-color: rgb(241, 211, 87);
+	}
+.leaflet-oldie .marker-cluster-medium div {
+	background-color: rgb(240, 194, 12);
+	}
+
+.leaflet-oldie .marker-cluster-large {
+	background-color: rgb(253, 156, 115);
+	}
+.leaflet-oldie .marker-cluster-large div {
+	background-color: rgb(241, 128, 23);
+}
+
+.marker-cluster {
+	background-clip: padding-box;
+	border-radius: 20px;
+	}
+.marker-cluster div {
+	width: 30px;
+	height: 30px;
+	margin-left: 5px;
+	margin-top: 5px;
+
+	text-align: center;
+	border-radius: 15px;
+	font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+.marker-cluster span {
+	line-height: 30px;
+	}

geo_activity_playground/webui/static/MarkerCluster.css

@@ -0,0 +1,14 @@
+.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
+	-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
+	-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
+	transition: transform 0.3s ease-out, opacity 0.3s ease-in;
+}
+
+.leaflet-cluster-spider-leg {
+	/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
+	-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
+	-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
+	-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
+	transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
+}