geo-activity-playground 1.1.0__tar.gz → 1.2.0__tar.gz

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/PKG-INFO

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

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/core/datamodel.py

@@ -32,6 +32,17 @@ logger = logging.getLogger(__name__)
 DEFAULT_UNKNOWN_NAME = "Unknown"
 
 
+def format_timedelta(v: datetime.timedelta):
+    if pd.isna(v):
+        return "—"
+    else:
+        seconds = v.total_seconds()
+        h = int(seconds // 3600)
+        m = int(seconds // 60 % 60)
+        s = int(seconds // 1 % 60)
+        return f"{h}:{m:02d}:{s:02d}"
+
+
 class ActivityMeta(TypedDict):
     average_speed_elapsed_kmh: float
     average_speed_moving_kmh: float
@@ -165,6 +176,23 @@ class Activity(DB.Model):
         else:
             return self.raw_time_series
 
+    @property
+    def emoji_string(self) -> str:
+        bits = []
+        if self.kind:
+            bits.append(f"{self.kind.name} with")
+        if self.distance_km:
+            bits.append(f"📏 {round(self.distance_km, 1)} km")
+        if self.elapsed_time:
+            bits.append(f"⏱️ {format_timedelta(self.elapsed_time)} h")
+        if self.elevation_gain:
+            bits.append(f"⛰️ {round(self.elevation_gain, 1)} m")
+        if self.calories:
+            bits.append(f"🍭 {self.calories} kcal")
+        if self.steps:
+            bits.append(f"👣 {self.steps}")
+        return " ".join(bits)
+
     def delete_data(self) -> None:
         for path in [
             TIME_SERIES_DIR() / f"{self.id}.parquet",
@@ -229,14 +257,15 @@ def query_activity_meta(clauses: list = []) -> pd.DataFrame:
         .order_by(Activity.start)
     ).all()
     df = pd.DataFrame(rows)
-    # If the search yields only activities without time information, the dtype isn't derived correctly.
-    df["start"] = pd.to_datetime(df["start"])
-    # start = df["start"].to_list()
-    # random.shuffle(start)
-    # df["start"] = pd.Series(start)
-    df["elapsed_time"] = pd.to_timedelta(df["elapsed_time"])
 
     if len(df):
+        # If the search yields only activities without time information, the dtype isn't derived correctly.
+        df["start"] = pd.to_datetime(df["start"])
+        # start = df["start"].to_list()
+        # random.shuffle(start)
+        # df["start"] = pd.Series(start)
+        df["elapsed_time"] = pd.to_timedelta(df["elapsed_time"])
+
         for old, new in [
             ("elapsed_time", "average_speed_elapsed_kmh"),
             ("moving_time", "average_speed_moving_kmh"),

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/photo_blueprint.py

@@ -12,6 +12,7 @@ from flask import render_template
 from flask import request
 from flask import Response
 from flask import url_for
+from flask.typing import ResponseReturnValue
 from PIL import Image
 from PIL import ImageOps
 
@@ -123,7 +124,7 @@ def make_photo_blueprint(
 
     @blueprint.route("/new", methods=["GET", "POST"])
     @needs_authentication(authenticator)
-    def new() -> Response:
+    def new() -> ResponseReturnValue:
         if request.method == "POST":
             # check if the post request has the file part
             if "file" not in request.files:
@@ -132,66 +133,74 @@ def make_photo_blueprint(
                 )
                 return redirect(url_for(".new"))
 
-            file = request.files["file"]
-            # If the user does not select a file, the browser submits an
-            # empty file without a filename.
-            if file.filename == "":
-                flasher.flash_message("No selected file.", FlashTypes.WARNING)
-                return redirect(url_for(".new"))
-            if not file:
-                flasher.flash_message("Empty file uploaded.", FlashTypes.WARNING)
-                return redirect(url_for(".new"))
+            new_photos: list[Photo] = []
+            for file in request.files.getlist("file"):
+                # If the user does not select a file, the browser submits an
+                # empty file without a filename.
+                if file.filename == "":
+                    flasher.flash_message("No selected file.", FlashTypes.WARNING)
+                    return redirect(url_for(".new"))
+                if not file:
+                    flasher.flash_message("Empty file uploaded.", FlashTypes.WARNING)
+                    return redirect(url_for(".new"))
+
+                filename = str(uuid.uuid4()) + pathlib.Path(file.filename).suffix
+                path = PHOTOS_DIR() / "original" / filename
+                path.parent.mkdir(exist_ok=True)
+                file.save(path)
+                metadata = get_metadata_from_image(path)
+
+                if "time" not in metadata:
+                    flasher.flash_message(
+                        f"Your image '{file.filename}' doesn't have the EXIF attribute 'EXIF DateTimeOriginal' and hence cannot be dated.",
+                        FlashTypes.DANGER,
+                    )
+                    continue
+                time: datetime.datetime = metadata["time"]
+
+                activity = DB.session.scalar(
+                    sqlalchemy.select(Activity)
+                    .where(
+                        Activity.start.is_not(None),
+                        Activity.elapsed_time.is_not(None),
+                        Activity.start <= time,
+                    )
+                    .order_by(Activity.start.desc())
+                    .limit(1)
+                )
+                if activity is None or activity.start + activity.elapsed_time < time:
+                    flasher.flash_message(
+                        f"Your image '{file.filename}' is from {time} but no activity could be found. Please first upload an activity or fix the time in the photo.",
+                        FlashTypes.DANGER,
+                    )
+                    continue
+
+                if "latitude" not in metadata:
+                    time_series = activity.time_series
+                    print(time_series)
+                    row = time_series.loc[time_series["time"] >= time].iloc[0]
+                    metadata["latitude"] = row["latitude"]
+                    metadata["longitude"] = row["longitude"]
+
+                photo = Photo(
+                    filename=filename,
+                    time=time,
+                    latitude=metadata["latitude"],
+                    longitude=metadata["longitude"],
+                    activity=activity,
+                )
 
-            filename = str(uuid.uuid4()) + pathlib.Path(file.filename).suffix
-            path = PHOTOS_DIR() / "original" / filename
-            path.parent.mkdir(exist_ok=True)
-            file.save(path)
-            metadata = get_metadata_from_image(path)
+                DB.session.add(photo)
+                DB.session.commit()
+                new_photos.append(photo)
 
-            if "time" not in metadata:
+            if new_photos:
                 flasher.flash_message(
-                    "Your image doesn't have the EXIF attribute 'EXIF DateTimeOriginal' and hence cannot be dated.",
-                    FlashTypes.DANGER,
+                    f"Added {len(new_photos)} new photos.", FlashTypes.SUCCESS
                 )
+                return redirect(f"/activity/{new_photos[-1].activity.id}")
+            else:
                 return redirect(url_for(".new"))
-            time: datetime.datetime = metadata["time"]
-
-            activity = DB.session.scalar(
-                sqlalchemy.select(Activity)
-                .where(
-                    Activity.start.is_not(None),
-                    Activity.elapsed_time.is_not(None),
-                    Activity.start <= time,
-                )
-                .order_by(Activity.start.desc())
-                .limit(1)
-            )
-            if activity is None or activity.start + activity.elapsed_time < time:
-                flasher.flash_message(
-                    f"Your image is from {time} but no activity could be found. Please first upload an activity or fix the time in the photo",
-                    FlashTypes.DANGER,
-                )
-            print(activity)
-
-            if "latitude" not in metadata:
-                time_series = activity.time_series
-                print(time_series)
-                row = time_series.loc[time_series["time"] >= time].iloc[0]
-                metadata["latitude"] = row["latitude"]
-                metadata["longitude"] = row["longitude"]
-
-            photo = Photo(
-                filename=filename,
-                time=time,
-                latitude=metadata["latitude"],
-                longitude=metadata["longitude"],
-                activity=activity,
-            )
-
-            DB.session.add(photo)
-            DB.session.commit()
-
-            return redirect(f"/activity/{activity.id}")
         else:
             return render_template("photo/new.html.j2")
 

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -447,6 +447,23 @@ def make_settings_blueprint(
         else:
             return render_template("settings/tags-edit.html.j2", tag=tag)
 
+    @blueprint.route("/tile-source", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def tile_source() -> str:
+        if request.method == "POST":
+            config_accessor().map_tile_url = request.form["map_tile_url"]
+            config_accessor().map_tile_attribution = request.form[
+                "map_tile_attribution"
+            ]
+            config_accessor.save()
+            flasher.flash_message("Tile source updated.", FlashTypes.SUCCESS)
+        return render_template(
+            "settings/tile-source.html.j2",
+            map_tile_url=config_accessor().map_tile_url,
+            map_tile_attribution=config_accessor().map_tile_attribution,
+            test_url=config_accessor().map_tile_url.format(zoom=14, x=8514, y=5504),
+        )
+
     return blueprint
 
 

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/templates/equipment/index.html.j2

@@ -49,13 +49,13 @@
 <h3>{{ equipment }}</h3>
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct(data.total_distances_plot_id, data.total_distances_plot) }}
+        {{ vega_direct(data.total_distances_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct(data.yearly_distance_plot_id, data.yearly_distance_plot) }}
+        {{ vega_direct(data.yearly_distance_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct(data.usages_plot_id, data.usages_plot) }}
+        {{ vega_direct(data.usages_plot) }}
     </div>
 </div>
 {% endfor %}

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/templates/hall_of_fame/index.html.j2

@@ -44,9 +44,8 @@
                     {% endfor %}
                 </ul>
                 </p>
-                <p class="card-text"><small class="text-body-secondary"></small>{{ activity.kind }} with {{
-                    (activity.distance_km)|round(1) }} km / {{activity.elevation_gain|round|int}} m in {{
-                    activity.elapsed_time|td }} on {{ activity.start|dt }}</small></p>
+                <p class="card-text"><small class="text-body-secondary"></small>{{ activity.emoji_string }} on {{
+                    activity.start|dt }}</small></p>
             </div>
         </div>
     </div>

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/templates/home.html.j2

@@ -46,14 +46,7 @@
                     <h5 class="card-title">{{ elem.activity.name }}</h5>
                 </a>
                 <p class="card-text">
-                    {{ elem.activity.kind.name }} with
-                    📏 {{ (elem.activity.distance_km)|round(1) }} km
-                    {% if elem.activity.elapsed_time %}
-                    ⏱️ {{ elem.activity.elapsed_time|td }}
-                    {% endif %}
-                    {% if elem.activity.elevation_gain %}
-                    ⛰️ {{ (elem.activity.elevation_gain)|round|int }} m
-                    {% endif %}
+                    {{ elem.activity.emoji_string }}
                 </p>
                 {% if elem.activity.start %}
                 <p class="card-text"><small class="text-body-secondary">{{ elem.activity.start|dt }}</small></p>

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/templates/photo/new.html.j2

@@ -6,7 +6,7 @@
 <form method="POST" enctype="multipart/form-data">
     <div class="mb-3">
         <label for="file" class="form-label">Photo file</label>
-        <input type="file" name="file" id="file" class="form-control">
+        <input type="file" name="file" id="file" class="form-control" multiple>
     </div>
     <button type="submit" class="btn btn-primary">Upload</button>
 </form>

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/geo_activity_playground/webui/templates/settings/index.html.j2

@@ -56,6 +56,15 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Map tile source</h5>
+                    <p class="card-text">Change the source of the map tiles.</p>
+                    <a href="{{ url_for('.tile_source') }}" class="btn btn-primary">Change tile source</a>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="card">
                 <div class="card-body">

geo_activity_playground-1.2.0/geo_activity_playground/webui/templates/settings/tile-source.html.j2

@@ -0,0 +1,33 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Tile Source</h1>
+
+<p>You can change the tile source to be whatever you like. Be aware that different sources have different licensing
+    constraints. It is on you to make sure that you are allowed to use the tiles from the source that you enter. See <a
+        href="https://wiki.openstreetmap.org/wiki/Raster_tile_providers" target="_blank">this list of raster tile
+        providers</a> for inspiration.</p>
+
+
+<form action="" method="POST" class="mb-3">
+    <div class="mb-3">
+        <label for="map_tile_url" class="form-label">Map tile URL</label>
+        <input type="text" class="form-control" id="map_tile_url" name="map_tile_url" value="{{ map_tile_url }}" />
+    </div>
+    <div class="mb-3">
+        <label for="map_tile_attribution" class="form-label">Map tile attribution</label>
+        <input type="text" class="form-control" id="map_tile_attribution" name="map_tile_attribution"
+            value="{{ map_tile_attribution|e }}" />
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+<h2>Test image</h2>
+
+<p>This is a tile using your current tile source:</p>
+
+<p><img src="{{ test_url }}"></p>
+
+{% endblock %}

{geo_activity_playground-1.1.0 → geo_activity_playground-1.2.0}/pyproject.toml

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