geo-activity-playground 0.45.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

geo_activity_playground/webui/columns.py

@@ -15,19 +15,44 @@ column_distance = ColumnDescription(
     unit="km",
     format=".1f",
 )
-
-column_elevation = ColumnDescription(
-    name="elevation",
-    display_name="Elevation",
-    unit="m",
-    format=".0f",
-)
 column_elevation_gain = ColumnDescription(
     name="elevation_gain",
     display_name="Elevation Gain",
     unit="m",
     format=".0f",
 )
+column_hours = ColumnDescription(
+    name="hours",
+    display_name="Elapsed time",
+    unit="h",
+    format=".1f",
+)
+column_hours_moving = ColumnDescription(
+    name="hours_moving",
+    display_name="Moving time",
+    unit="h",
+    format=".1f",
+)
+column_calories = ColumnDescription(
+    name="calories",
+    display_name="Energy",
+    unit="kcal",
+    format=".1f",
+)
+column_steps = ColumnDescription(
+    name="steps",
+    display_name="Steps",
+    unit="1",
+    format=".1f",
+)
+META_COLUMNS = [
+    column_distance,
+    column_elevation_gain,
+    column_hours,
+    column_hours_moving,
+    column_calories,
+    column_steps,
+]
 
 column_speed = ColumnDescription(
     name="speed",
@@ -35,3 +60,11 @@ column_speed = ColumnDescription(
     unit="km/h",
     format=".1f",
 )
+column_elevation = ColumnDescription(
+    name="elevation",
+    display_name="Elevation",
+    unit="m",
+    format=".0f",
+)
+
+TIME_SERIES_COLUMNS = [column_speed, column_elevation]

geo_activity_playground/webui/static/{browserconfig.xml → favicons/browserconfig.xml}

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/static/mstile-150x150.png"/>
+            <square150x150logo src="/static/favicons/mstile-150x150.png"/>
             <TileColor>#da532c</TileColor>
         </tile>
     </msapplication>

geo_activity_playground/webui/static/{site.webmanifest → favicons/site.webmanifest}

@@ -3,13 +3,13 @@
   "short_name": "MySite",
   "icons": [
     {
-      "src": "/static/web-app-manifest-192x192.png",
+      "src": "/static/favicons/web-app-manifest-192x192.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/static/web-app-manifest-512x512.png",
+      "src": "/static/favicons/web-app-manifest-512x512.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"

geo_activity_playground/webui/static/server-side-explorer.js

@@ -0,0 +1,60 @@
+
+let tile_layer = null
+
+function changeColor(method) {
+    if (tile_layer) {
+        map.removeLayer(tile_layer)
+    }
+    tile_layer = L.tileLayer(`/explorer/${zoom}/tile/{z}/{x}/{y}.png?color_strategy=${method}`, {
+        maxZoom: 19,
+        attribution: map_tile_attribution
+    }).addTo(map)
+}
+
+let map = L.map('explorer-map', {
+    fullscreenControl: true,
+    center: [center_latitude, center_longitude],
+    zoom: 12
+});
+
+changeColor('default')
+
+if (bbox) {
+    map.fitBounds(L.geoJSON(bbox).getBounds())
+}
+
+map.on('click', e => {
+    fetch(`/explorer/${zoom}/info/${e.latlng.lat}/${e.latlng.lng}`)
+        .then(response => response.json())
+        .then(data => {
+            if (!data.tile_xy) {
+                return;
+            }
+            console.debug(data);
+
+            let lines = [
+                `<dt>Tile</dt>`,
+                `<dd>${data.tile_xy}</dd>`,
+                `<dt>First visit</dt>`,
+                `<dd>${data.first_time}</br><a href=/activity/${data.first_activity_id}>${data.first_activity_name}</a></dd>`,
+                `<dt>Last visit</dt>`,
+                `<dd>${data.last_time}</br><a href=/activity/${data.last_activity_id}>${data.last_activity_name}</a></dd>`,
+                `<dt>Number of visits</dt>`,
+                `<dd>${data.num_visits}</dd>`,
+            ]
+            if (data.this_cluster_size) {
+                lines.push(`<dt>This cluster size</dt><dd>${data.this_cluster_size}</dd>`)
+            }
+
+            L.popup()
+                .setLatLng(e.latlng)
+                .setContent('<dl>' + lines.join('') + '</dl>')
+                .openOn(map);
+        }
+        );
+});
+
+function downloadAs(suffix) {
+    bounds = map.getBounds();
+    window.location.href = `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
+}

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

@@ -30,19 +30,19 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("tick_plot", tick_plot) }}
+        {{ vega_direct(tick_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("equipment_plot", equipment_plot) }}
+        {{ vega_direct(equipment_plot) }}
     </div>
 </div>
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("distance_plot", distance_plot) }}
+        {{ vega_direct(distance_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("minutes_plot", minutes_plot) }}
+        {{ vega_direct(minutes_plot) }}
     </div>
 </div>
 

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

@@ -182,13 +182,13 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("distance_time_plot", distance_time_plot) }}
+        {{ vega_direct(distance_time_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("speed_time_plot", speed_time_plot) }}
+        {{ vega_direct(speed_time_plot) }}
     </div>
     <div class="col-md-4">
-        {{ vega_direct("speed_distribution_plot", speed_distribution_plot) }}
+        {{ vega_direct(speed_distribution_plot) }}
     </div>
 </div>
 
@@ -201,11 +201,11 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("elevation_time_plot", elevation_time_plot) }}
+        {{ vega_direct(elevation_time_plot) }}
     </div>
     {% if elevation_gain_cum_plot is defined %}
     <div class="col-md-4">
-        {{ vega_direct("elevation_gain_cum_plot", elevation_gain_cum_plot) }}
+        {{ vega_direct(elevation_gain_cum_plot) }}
     </div>
     {% endif %}
 </div>
@@ -216,11 +216,11 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("heartrate_time_plot", heartrate_time_plot) }}
+        {{ vega_direct(heartrate_time_plot) }}
     </div>
     <div class="col-md-4">
         {% if heart_zones_plot is defined %}
-        {{ vega_direct("heart_zones_plot", heart_zones_plot) }}
+        {{ vega_direct(heart_zones_plot) }}
         {% else %}
         <p>Your activity has heart data, but this program doesn't know your maximum heart rate (or birth year) and
             therefore cannot compute the heart rate zones. Go to the <a
@@ -235,7 +235,7 @@
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("cadence_time_plot", cadence_time_plot) }}
+        {{ vega_direct(cadence_time_plot) }}
     </div>
 </div>
 {% endif %}

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

@@ -14,6 +14,7 @@
         <input type="password" class="form-control" id="password" name="password" />
     </div>
 
+    <input type="hidden" name="redirect" value="{{ redirect }}" />
     <button type="submit" class="btn btn-primary">Log In</button>
 </form>
 {% endif %}

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

@@ -54,7 +54,7 @@
         <p>In a graphical representation, the Eddington number is the distance where the red line intersects with the
             blue area.</p>
 
-        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -63,7 +63,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -94,7 +94,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">

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

@@ -76,7 +76,7 @@
         <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) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -85,7 +85,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -116,7 +116,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">

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

@@ -80,7 +80,7 @@
             the
             blue area.</p>
 
-        {{ vega_direct("logarithmic_plot", logarithmic_plot) }}
+        {{ vega_direct(logarithmic_plot) }}
     </div>
 </div>
 
@@ -89,7 +89,7 @@
 
     <p>How did the Eddington number evolve over time?</p>
 
-    {{ vega_direct("eddington_number_history_plot", eddington_number_history_plot) }}
+    {{ vega_direct(eddington_number_history_plot) }}
 </div>
 
 <div class="mb-3">
@@ -120,7 +120,7 @@
 
 <div class="row mb-3">
     <div class="col-md-8">
-        {{ vega_direct("eddington_per_week_plot", eddington_per_week_plot) }}
+        {{ vega_direct(eddington_per_week_plot) }}
     </div>
 
     <div class="col-md-4">

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

@@ -35,7 +35,7 @@
 <div class="row mb-3">
     <div class="col">
         <h2>Monthly Equipment Usage</h2>
-        {{ vega_direct("stacked_area_chart", stacked_area_chart) }}
+        {{ vega_direct(stacked_area_chart) }}
     </div>
 </div>
 

geo_activity_playground/webui/templates/explorer/server-side.html.j2

@@ -14,10 +14,24 @@
 
 <div class="row mb-3">
     <div class="col">
-        <h2>Map with explored tiles</h2>
+        <p>You have {{ num_tiles }} explored tiles. There are {{ num_cluster_tiles }} cluster tiles in
+            total. Your largest cluster consists of {{ max_cluster_size }} tiles. Your largest square has size
+            {{ square_size }}².
+        </p>
+        <p>Open the <a
+                href="{{ url_for('square_planner.index', zoom=zoom, x=square_x, y=square_y, size=square_size) }}">Square
+                Planner</a> to plan the next extension.</p>
     </div>
 </div>
 
+<div class="btn-group mb-3" role="group">
+    <button type="button" class="btn btn-primary" onclick="changeColor('colorful_cluster')">Colorful Cluster</button>
+    <button type="button" class="btn btn-primary" onclick="changeColor('max_cluster')">Max Cluster</button>
+    <button type="button" class="btn btn-primary" onclick="changeColor('first')">First Visit</button>
+    <button type="button" class="btn btn-primary" onclick="changeColor('last')">Last Visit</button>
+    <button type="button" class="btn btn-primary" onclick="changeColor('visits')">Number of Visits</button>
+</div>
+
 <div class="row mb-3">
     <div class="col">
         <div id="explorer-map" class="mb-1" style="height: 800px;"></div>
@@ -26,47 +40,39 @@
                 onclick="downloadAs('missing.geojson')">Missing as GeoJSON</a> or <a href="#"
                 onclick="downloadAs('missing.gpx')"">Missing as GPX</a>.</p>
         <script>
-            let map = L.map('explorer-map', {
-                fullscreenControl: true,
-                center: [{{ center.latitude }}, {{ center.longitude }}],
-            zoom: 12
-            });
-            L.tileLayer('/explorer/{{ zoom }}/tile/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: '{{ map_tile_attribution|safe }}'
-            }).addTo(map)
-
-            let bbox = {{ center.bbox| safe }}
-            if (bbox) {
-                map.fitBounds(L.geoJSON(bbox).getBounds())
-            }
+            const center_latitude = {{ center.latitude }};
+            const center_longitude = {{ center.longitude }};
+            const zoom = {{ zoom }};
+            const bbox = {{ center.bbox | safe }};
+            const map_tile_attribution = '{{ map_tile_attribution|safe }}';
         </script>
+        <script src=" /static/server-side-explorer.js"></script>
     </div>
 </div>
 
 <div class=" row mb-3">
-                <div class="col">
-                    <h2>Tile history</h2>
-                </div>
+    <div class="col">
+        <h2>Tile history</h2>
     </div>
+</div>
 
-    <div class="row mb-3">
-        <div class="col-md-4">
-            {% if plot_tile_evolution|length > 0 %}
-            {{ vega_direct("plot_tile_evolution", plot_tile_evolution) }}
-            {% endif %}
-        </div>
-        <div class="col-md-4">
-            {% if plot_cluster_evolution|length > 0 %}
-            {{ vega_direct("plot_cluster_evolution", plot_cluster_evolution) }}
-            {% endif %}
-        </div>
-        <div class="col-md-4">
-            {% if plot_square_evolution|length > 0 %}
-            {{ vega_direct("plot_square_evolution", plot_square_evolution) }}
-            {% endif %}
-        </div>
+<div class="row mb-3">
+    <div class="col-md-4">
+        {% if plot_tile_evolution|length > 0 %}
+        {{ vega_direct(plot_tile_evolution) }}
+        {% endif %}
+    </div>
+    <div class="col-md-4">
+        {% if plot_cluster_evolution|length > 0 %}
+        {{ vega_direct(plot_cluster_evolution) }}
+        {% endif %}
     </div>
+    <div class="col-md-4">
+        {% if plot_square_evolution|length > 0 %}
+        {{ vega_direct(plot_square_evolution) }}
+        {% endif %}
+    </div>
+</div>
 
-    {% endif %}
-    {% endblock %}
+{% endif %}
+{% endblock %}

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

@@ -0,0 +1,39 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1>Export metadata and activities</h1>
+
+<p>Here you can export all metadata and activities as a ZIP file. Depending on the file format chosen, exporting an
+    activity can take around one second. You can observe a progress bar in the terminal.</p>
+
+<form method="get" enctype="multipart/form-data" action="{{ url_for('.export') }}">
+    <div class="mb-3">
+        <label for="meta_format" class="form-label">Metadata format</label>
+        <select name="meta_format" id="meta_format" class="form-select" aria-label="Metadata format">
+            <option value="parquet">Parquet</option>
+            {# <option value="json">JSON</option> #}
+            <option value="csv">CSV</option>
+            <option value="xlsx">Excel</option>
+            <option value="ods">OpenDocument Spreadsheet (LibreOffice)</option>
+        </select>
+    </div>
+
+    <div class="mb-3">
+        <label for="activity_format" class="form-label">Activity time series format</label>
+        <select name="activity_format" id="activity_format" class="form-select"
+            aria-label="Activity time series format">
+            <option value="">No export of activities</option>
+            <option value="parquet">Parquet</option>
+            <option value="csv">CSV</option>
+            <option value="geojson">GeoJSON</option>
+            <option value="gpx">GPX</option>
+            <option value="xlsx">Excel</option>
+            <option value="ods">OpenDocument Spreadsheet (LibreOffice)</option>
+        </select>
+    </div>
+    <button type="submit" class="btn btn-primary">Export</button>
+</form>
+
+
+{% endblock %}

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

@@ -0,0 +1,58 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1>Hall of Fame</h1>
+
+<div class="mb-3">
+    {% include "search_form.html.j2" %}
+</div>
+
+<script>
+    function add_map(id, geojson) {
+        let map = L.map(`map-${id}`, {
+            fullscreenControl: true
+        })
+        L.tileLayer('/tile/color/{z}/{x}/{y}.png', {
+            maxZoom: 19,
+            attribution: '{{ map_tile_attribution|safe }}'
+        }).addTo(map)
+
+        let geojson_layer = L.geoJSON(geojson).addTo(map)
+        map.fitBounds(geojson_layer.getBounds())
+        return map
+    }
+</script>
+
+{% for activity_batch in nominations|batch(3) %}
+<div class="row row-cols-1 row-cols-md-3 g-4 mb-3">
+    {% for activity, reasons, line_geojson in activity_batch %}
+    <div class="col">
+        <div class="card">
+            <div class="card-img-top" id="map-{{ activity.id }}" style="height: 200px; width: 100%;"></div>
+            <script>
+                let map{{ activity.id }} = add_map("{{ activity.id }}", {{ line_geojson | safe }})
+            </script>
+            <div class="card-body">
+                <a href="{{ url_for('activity.show', id=activity.id) }}">
+                    <h5 class="card-title">{{ activity["name"] }}</h5>
+                </a>
+                <p class="card-text">
+                <ul style='list-style-type: "🏆 "'>
+                    {% for reason in reasons %}
+                    <li>{{ reason }}</li>
+                    {% 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>
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+{% endfor %}
+
+
+{% endblock %}

geo_activity_playground/webui/templates/home.html.j2

@@ -8,10 +8,7 @@
 <div class="row mb-3">
     <div class="col">
         <h2>Last 30 days</h2>
-        {{ vega_direct("distance-last-30-days", distance_last_30_days_plot) }}
-        {% if elevation_gain_last_30_days_plot %}
-        {{ vega_direct("elevation-gain-last-30-days", elevation_gain_last_30_days_plot) }}
-        {% endif %}
+        {{ tabbed_vega(last_30_days_plot) }}
     </div>
 </div>