geo-activity-playground 0.42.0__py3-none-any.whl → 0.43.1__py3-none-any.whl

geo_activity_playground/webui/blueprints/photo_blueprint.py

@@ -0,0 +1,198 @@
+import datetime
+import pathlib
+import uuid
+
+import dateutil.parser
+import exifread
+import geojson
+import sqlalchemy
+from flask import Blueprint
+from flask import redirect
+from flask import render_template
+from flask import request
+from flask import Response
+from flask import url_for
+from PIL import Image
+from PIL import ImageOps
+
+from ...core.config import ConfigAccessor
+from ...core.datamodel import Activity
+from ...core.datamodel import DB
+from ...core.datamodel import Photo
+from ...core.paths import PHOTOS_DIR
+from ..authenticator import Authenticator
+from ..authenticator import needs_authentication
+from ..flasher import Flasher
+from ..flasher import FlashTypes
+
+
+def ratio_to_decimal(numbers: list[exifread.utils.Ratio]) -> float:
+    deg, min, sec = numbers.values
+    return deg.decimal() + min.decimal() / 60 + sec.decimal() / 3600
+
+
+def get_metadata_from_image(path: pathlib.Path) -> dict:
+    with open(path, "rb") as f:
+        tags = exifread.process_file(f)
+    metadata = {}
+    try:
+        metadata["latitude"] = ratio_to_decimal(tags["GPS GPSLatitude"])
+        metadata["longitude"] = ratio_to_decimal(tags["GPS GPSLongitude"])
+    except KeyError:
+        pass
+    try:
+        metadata["time"] = datetime.datetime.strptime(
+            str(tags["EXIF DateTimeOriginal"]), "%Y:%m:%d %H:%M:%S"
+        )
+    except KeyError:
+        pass
+
+    return metadata
+
+
+def make_photo_blueprint(
+    config_accessor: ConfigAccessor, authenticator: Authenticator, flasher: Flasher
+) -> Blueprint:
+    blueprint = Blueprint("photo", __name__, template_folder="templates")
+
+    @blueprint.route("/get/<int:id>/<int:size>.webp")
+    def get(id: int, size: int) -> Response:
+        assert size < 5000
+        photo = DB.session.get_one(Photo, id)
+
+        original_path = PHOTOS_DIR() / "original" / photo.path
+        small_path = PHOTOS_DIR() / f"size-{size}" / photo.path.with_suffix(".webp")
+
+        if not small_path.exists():
+            with Image.open(original_path) as im:
+                target_size = (size, size)
+                im = ImageOps.contain(im, target_size)
+                small_path.parent.mkdir(exist_ok=True)
+                im.save(small_path)
+
+        with open(small_path, "rb") as f:
+            return Response(f.read(), mimetype="image/webp")
+
+    @blueprint.route("/map")
+    def map() -> str:
+        return render_template("photo/map.html.j2")
+
+    @blueprint.route("/map-for-all/photos.geojson")
+    def map_for_all() -> Response:
+        photos = DB.session.scalars(sqlalchemy.select(Photo)).all()
+        fc = geojson.FeatureCollection(
+            features=[
+                geojson.Feature(
+                    geometry=geojson.Point((photo.longitude, photo.latitude)),
+                    properties={
+                        "photo_id": photo.id,
+                        "url_marker": url_for(".get", id=photo.id, size=128),
+                        "url_popup": url_for(".get", id=photo.id, size=512),
+                        "url_full": url_for(".get", id=photo.id, size=4096),
+                    },
+                )
+                for photo in photos
+            ]
+        )
+        return Response(
+            geojson.dumps(fc, sort_keys=True, indent=2, ensure_ascii=False),
+            mimetype="application/json",
+        )
+
+    @blueprint.route("/map-for-activity/<int:activity_id>/photos.geojson")
+    def map_for_activity(activity_id: int) -> Response:
+        activity = DB.session.get_one(Activity, activity_id)
+        fc = geojson.FeatureCollection(
+            features=[
+                geojson.Feature(
+                    geometry=geojson.Point((photo.longitude, photo.latitude)),
+                    properties={
+                        "photo_id": photo.id,
+                        "url_marker": url_for(".get", id=photo.id, size=128),
+                        "url_popup": url_for(".get", id=photo.id, size=512),
+                        "url_full": url_for(".get", id=photo.id, size=4096),
+                    },
+                )
+                for photo in activity.photos
+            ]
+        )
+        return Response(
+            geojson.dumps(fc, sort_keys=True, indent=2, ensure_ascii=False),
+            mimetype="application/json",
+        )
+
+    @blueprint.route("/new", methods=["GET", "POST"])
+    @needs_authentication(authenticator)
+    def new() -> Response:
+        if request.method == "POST":
+            # check if the post request has the file part
+            if "file" not in request.files:
+                flasher.flash_message(
+                    "No file could be found. Did you select a file?", FlashTypes.WARNING
+                )
+                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"))
+
+            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(
+                    "Your image doesn't have the EXIF attribute 'EXIF DateTimeOriginal' and hence cannot be dated.",
+                    FlashTypes.DANGER,
+                )
+                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")
+
+    return blueprint

geo_activity_playground/webui/blueprints/upload_blueprint.py

@@ -1,6 +1,7 @@
 import os
 import pathlib
 
+import sqlalchemy
 from flask import Blueprint
 from flask import flash
 from flask import redirect
@@ -10,7 +11,10 @@ from flask import url_for
 
 from ...core.activities import ActivityRepository
 from ...core.config import Config
+from ...core.datamodel import DB
+from ...core.datamodel import Kind
 from ...core.enrichment import populate_database_from_extracted
+from ...core.tasks import work_tracker_path
 from ...explorer.tile_visits import compute_tile_evolution
 from ...explorer.tile_visits import compute_tile_visits_new
 from ...explorer.tile_visits import TileVisitAccessor
@@ -114,6 +118,13 @@ def scan_for_activities(
     populate_database_from_extracted(config)
 
     if len(repository) > 0:
+        kinds = DB.session.scalars(sqlalchemy.select(Kind)).all()
+        if all(kind.consider_for_achievements == False for kind in kinds):
+            for kind in kinds:
+                kind.consider_for_achievements = True
+            DB.session.commit()
+            tile_visit_accessor.reset()
+            work_tracker_path("tile-state").unlink()
         compute_tile_visits_new(repository, tile_visit_accessor)
         compute_tile_evolution(tile_visit_accessor.tile_state, config)
         tile_visit_accessor.save()

geo_activity_playground/webui/search_util.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from werkzeug.datastructures import MultiDict
 
 from ..core.config import ConfigAccessor
@@ -7,13 +9,20 @@ from .authenticator import Authenticator
 
 
 def search_query_from_form(args: MultiDict) -> SearchQuery:
-    query = SearchQuery(
-        equipment=args.getlist("equipment"),
-        kind=args.getlist("kind"),
-        name=args.get("name", None),
-        name_case_sensitive=_parse_bool(args.get("name_case_sensitive", "false")),
-        start_begin=_parse_date_or_none(args.get("start_begin", None)),
-        start_end=_parse_date_or_none(args.get("start_end", None)),
+    query = SearchQuery.from_primitives(
+        {
+            "equipment": map(int, args.getlist("equipment")),
+            "kind": map(int, args.getlist("kind")),
+            "tag": map(int, args.getlist("tag")),
+            "name": args.get("name", None),
+            "name_case_sensitive": _parse_bool(
+                args.get("name_case_sensitive", "false")
+            ),
+            "start_begin": args.get("start_begin", None),
+            "start_end": args.get("start_end", None),
+            "distance_km_min": _optional_float(args.get("distance_km_min", None)),
+            "distance_km_max": _optional_float(args.get("distance_km_max", None)),
+        }
     )
 
     return query
@@ -23,6 +32,13 @@ def _parse_bool(s: str) -> bool:
     return s == "true"
 
 
+def _optional_float(s: str) -> Optional[float]:
+    if s:
+        return float(s)
+    else:
+        return None
+
+
 class SearchQueryHistory:
     def __init__(
         self, config_accessor: ConfigAccessor, authenticator: Authenticator

geo_activity_playground/webui/templates/activity/show.html.j2

@@ -10,14 +10,16 @@
 <div class="row mb-3">
     <div class="col-sm-12 col-md-4">
         <dl>
-            <dt>Name</dt>
-            <dd>{{ activity.name }}</dd>
-
             {% if activity.kind %}
             <dt>Kind</dt>
             <dd>{{ activity.kind.name }}</dd>
             {% endif %}
 
+            {% if activity.equipment %}
+            <dt>Equipment</dt>
+            <dd>{{ activity.equipment.name }}</dd>
+            {% endif %}
+
             {% if activity.tags %}
             <dt>Tags</dt>
             <dd>
@@ -61,11 +63,6 @@
             <dd>{{ activity.elevation_gain|round(0)|int }} m</dd>
             {% endif %}
 
-            {% if activity.equipment %}
-            <dt>Equipment</dt>
-            <dd>{{ activity.equipment.name }}</dd>
-            {% endif %}
-
             {% if new_tiles[14] %}
             <dt>New Explorer Tiles</dt>
             <dd>{{ new_tiles[14] }}</dd>
@@ -97,9 +94,33 @@
             }).addTo(map);
 
             let geojson = L.geoJSON({{ color_line_geojson| safe }}, {
-                style: function (feature) { return { color: feature.properties.color } }
+                style: function (feature) { return { color: feature.properties.color ? feature.properties.color : 'red' } }
             }).addTo(map)
             map.fitBounds(geojson.getBounds());
+
+
+
+            fetch("{{ url_for('photo.map_for_activity', activity_id = activity.id) }}")
+                .then(function (response) {
+                    return response.json();
+                })
+                .then(function (data) {
+                    L.geoJSON(data, {
+                        pointToLayer: function (feature, latlng) {
+                            return L.marker(latlng, {
+                                icon: new L.Icon({
+                                    iconSize: [32, 32],
+                                    iconAnchor: [16, 16],
+                                    popupAnchor: [16, 0],
+                                    iconUrl: feature.properties.url_marker,
+                                })
+                            });
+                        },
+                        onEachFeature: function (feature, layer) {
+                            layer.bindPopup(`<a href="${feature.properties.url_full}" target="_blank"><img src="${feature.properties.url_popup}" /></a>`)
+                        }
+                    }).addTo(map);
+                });
         </script>
 
 
@@ -113,6 +134,7 @@
             }
         </style>
 
+        {% if line_color_bar %}
         <div>
             {% for value, color in line_color_bar.colors %}
             <span class="colorbar" style="width: 15px; background-color: {{ color }}">{{ value }}</span>
@@ -132,11 +154,23 @@
                 </select>
             </form>
         </div>
+        {% endif %}
     </div>
 </div>
 
-
+{% if activity.photos %}
+<h2 class="mb-3">Photos</h2>
 <div class="row mb-3">
+    {% for photo in activity.photos %}
+    <div class="col-md-3">
+        <img src="{{ url_for('photo.get', id=photo.id, size=512) }}" width="100%" />
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
+
+
+<div class=" row mb-3">
     <div class="col">
         <h2>Distance & speed</h2>
     </div>
@@ -212,7 +246,8 @@
 
 {% if new_tiles_geojson %}
 <h2>New explorer tiles</h2>
-<p>With this activity you have explored new explorer tiles. The following maps show the new tiles on the respective zoom
+<p>With this activity you have explored new explorer tiles. The following maps show the new tiles on the respective
+    zoom
     levels.</p>
 <script>
     function add_map(id, geojson) {

geo_activity_playground/webui/templates/eddington/distance.html.j2

@@ -1,11 +1,10 @@
 {% extends "page.html.j2" %}
-{% from "search_form.html.j2" import search_form %}
 
 {% block container %}
 <h1 class="mb-3">Eddington Number</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+    {% include "search_form.html.j2" %}
 </div>
 
 <div class="row mb-3">

geo_activity_playground/webui/templates/eddington/elevation_gain.html.j2

@@ -1,11 +1,10 @@
 {% extends "page.html.j2" %}
-{% from "search_form.html.j2" import search_form %}
 
 {% block container %}
 <h1 class="mb-3">Eddington Number for Elevation Gain</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+    {% include "search_form.html.j2" %}
 </div>
 
 <div class="row mb-3">

geo_activity_playground/webui/templates/elevation_eddington/index.html.j2

@@ -1,11 +1,10 @@
 {% extends "page.html.j2" %}
-{% from "search_form.html.j2" import search_form %}
 
 {% block container %}
 <h1 class="mb-3">Eddington Number for Elevation Gain</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+    {% include "search_form.html.j2" %}
 </div>
 
 <div class="row mb-3">
@@ -13,20 +12,21 @@
         <form method="GET">
             <div class="mb-3">
                 <label class="form-label">Divisor</label>
-                <select class="form-select" aria-label="Divisor" name="elevation_eddington_divisor" onchange="this.form.submit()">
+                <select class="form-select" aria-label="Divisor" name="elevation_eddington_divisor"
+                    onchange="this.form.submit()">
                     {% for dv in divisor_values_avail %}
                     <option {% if dv==elevation_eddington_divisor %} selected {% endif %}>{{ dv }}</option>
                     {% endfor %}
                     {% for key, value in query.items() %}
-                        {% if value and key != "active" %}
-                            {% if value is sequence %}
-                                {% for v in value %}
-                                <input type="hidden" name="{{ key }}" value="{{ v }}"/>
-                                {% endfor %}
-                            {% else %}
-                            <input type="hidden" name="{{ key }}" value="{{ value }}"/>
-                            {% endif %}
-                        {% endif %}
+                    {% if value and key != "active" %}
+                    {% if value is sequence %}
+                    {% for v in value %}
+                    <input type="hidden" name="{{ key }}" value="{{ v }}" />
+                    {% endfor %}
+                    {% else %}
+                    <input type="hidden" name="{{ key }}" value="{{ value }}" />
+                    {% endif %}
+                    {% endif %}
                     {% endfor %}
                 </select>
             </div>
@@ -37,9 +37,11 @@
         <p>Your Eddington number with divisor {{ elevation_eddington_divisor }} is <b>{{ eddington_number }}</b>.</p>
 
         <p>That means that on {{ (eddington_number / elevation_eddington_divisor) | int }} separate days you
-            have recorded activities with an elevation gain of more than {{ eddington_number }} m. Going high is one thing, going often is
+            have recorded activities with an elevation gain of more than {{ eddington_number }} m. Going high is one
+            thing, going often is
             another. But going high often is hard. Also if you increment the Eddington number, all days with less
-            elevation gain will not count any more. It becomes increasingly hard to increment the Eddington number because you
+            elevation gain will not count any more. It becomes increasingly hard to increment the Eddington number
+            because you
             don't only need to achieve a higher count, but all flatter activities don't count towards the bigger number.
         </p>
     </div>
@@ -74,7 +76,8 @@
     <div class="col">
         <h2>Plot</h2>
 
-        <p>In a graphical representation, the Eddington number is the elevation gain where the red line intersects with the
+        <p>In a graphical representation, the Eddington number is the elevation gain where the red line intersects with
+            the
             blue area.</p>
 
         {{ vega_direct("logarithmic_plot", logarithmic_plot) }}

geo_activity_playground/webui/templates/heatmap/index.html.j2

@@ -1,11 +1,10 @@
 {% extends "page.html.j2" %}
-{% from "search_form.html.j2" import search_form %}
 
 {% block container %}
 <h1 class="mb-3">Heatmap</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+    {% include "search_form.html.j2" %}
 </div>
 
 <div class="row mb-3">

geo_activity_playground/webui/templates/page.html.j2

@@ -123,6 +123,12 @@
                         </li>
                         {% endif %}
 
+                        {% if photo_count > 0 %}
+                        <li class="nav-item">
+                            <a class="nav-link" aria-current="page" href="{{ url_for('photo.map') }}">Photo Map</a>
+                        </li>
+                        {% endif %}
+
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
                                 aria-expanded="false">
@@ -131,6 +137,8 @@
                             <ul class="dropdown-menu">
                                 <li><a class="dropdown-item" href="{{ url_for('upload.index') }}">Upload Activities</a>
                                 </li>
+                                <li><a class="dropdown-item" href="{{ url_for('photo.new') }}">Upload Photos</a>
+                                </li>
                                 <li><a class="dropdown-item" href="{{ url_for('upload.reload') }}">Scan New
                                         Activities</a>
                                 </li>

geo_activity_playground/webui/templates/photo/map.html.j2

@@ -0,0 +1,45 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<h1>Photo Map</h1>
+
+<div id="photo-map" style="height: 800px;" class="mb-3"></div>
+<script>
+    var map = L.map('photo-map', {
+        fullscreenControl: true
+    });
+    L.tileLayer('/tile/color/{z}/{x}/{y}.png', {
+        maxZoom: 19,
+        attribution: '{{ map_tile_attribution|safe }}'
+    }).addTo(map);
+
+    fetch("{{ url_for('photo.map_for_all') }}")
+        .then(function (response) {
+            return response.json();
+        })
+        .then(function (data) {
+            let layer = L.geoJSON(data, {
+                pointToLayer: function (feature, latlng) {
+                    return L.marker(latlng, {
+                        icon: new L.Icon({
+                            iconSize: [32, 32],
+                            iconAnchor: [16, 16],
+                            popupAnchor: [16, 0],
+                            iconUrl: feature.properties.url_marker,
+                        })
+                    });
+                },
+                onEachFeature: function (feature, layer) {
+                    layer.bindPopup(`<a href="${feature.properties.url_full}" target="_blank"><img src="${feature.properties.url_popup}" /></a>`)
+                }
+            })
+
+            let group = L.markerClusterGroup()
+            group.addLayer(layer)
+
+            group.addTo(map);
+            map.fitBounds(group.getBounds());
+        });
+</script>
+
+{% endblock %}

geo_activity_playground/webui/templates/photo/new.html.j2

@@ -0,0 +1,13 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<h1>Upload Photo</h1>
+
+<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">
+    </div>
+    <button type="submit" class="btn btn-primary">Upload</button>
+</form>
+{% endblock %}

geo_activity_playground/webui/templates/search/index.html.j2

@@ -1,12 +1,11 @@
 {% extends "page.html.j2" %}
-{% from "search_form.html.j2" import search_form %}
 
 {% block container %}
 
 <h1 class="row mb-3">Activities Overview & Search</h1>
 
 <div class="mb-3">
-    {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
+    {% include "search_form.html.j2" %}
 </div>
 
 <table class="table table-sort table-arrows">
@@ -32,7 +31,11 @@
             </td>
             <td>{{ '%.1f' % activity["distance_km"] }} km</td>
             <td>{{ activity.elapsed_time|td }}</td>
-            <td>{{ activity.average_speed_moving_kmh|round(1) }}</td>
+            <td>
+                {% if not activity.average_speed_moving_kmh|isna %}
+                {{ activity.average_speed_moving_kmh|round(1) }}
+                {% endif %}
+            </td>
             <td>{{ activity["equipment"] }}</td>
             <td>{{ activity['kind'] }}</td>
         </tr>