geo-activity-playground 0.26.3__py3-none-any.whl → 0.27.0__py3-none-any.whl

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

@@ -0,0 +1,74 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row">
+    <div class="col">
+        <h1>Settings</h1>
+    </div>
+</div>
+
+<p>Here are various settings that control how activities are gathered, analyzed and visualized.</p>
+
+<div class="row mb-3">
+    <div class="row row-cols-1 row-cols-md-3 g-3">
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Equipment offsets</h5>
+                    <p class="card-text">Not all activities with a given equipment are recorded? Just set an offset.</p>
+                    <a href="{{ url_for('.equipment_offsets') }}" class="btn btn-primary">Set up equipment offsets</a>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Heart rate</h5>
+                    <p class="card-text">Specify maximum heart rate to derive heart rate zones.</p>
+                    <a href="{{ url_for('.heart_rate') }}" class="btn btn-primary">Set up heart rate</a>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Kinds without achievements</h5>
+                    <p class="card-text">Recorded car rides that shouldn't count towards the explorer tiles? Exempt
+                        activity kinds from consideration.</p>
+                    <a href="{{ url_for('.kinds_without_achievements') }}" class="btn btn-primary">Set up kinds without
+                        achievements</a>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Metadata extraction</h5>
+                    <p class="card-text">When using activity files, one might want to extract metadata from the paths or
+                        set defaults.</p>
+                    <a href="{{ url_for('.metadata_extraction') }}" class="btn btn-primary">Set up metadata
+                        extraction</a>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Privacy zones</h5>
+                    <p class="card-text">Define geographic zones that shall be excluded from share pictures.</p>
+                    <a href="{{ url_for('.privacy_zones') }}" class="btn btn-primary">Set up privacy zones</a>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Strava API</h5>
+                    <p class="card-text">Connect to the Strava API to download activities from there.</p>
+                    <a href="{{ url_for('.strava') }}" class="btn btn-primary">Set up Strava API</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

geo_activity_playground/webui/settings/templates/settings/kinds-without-achievements.html.j2

@@ -0,0 +1,30 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Kinds without Achievements</h1>
+
+<p>Apart from bicycle rides and runs, you might also record your car and train rides. If you don't want to include these
+    for achievements like explorer tiles, you can enter the activity kinds that should not be considered here.</p>
+
+<form method="POST">
+    <div class="row">
+        <div class="col-md-6">
+            {% for kind in kinds_without_achievements %}
+            <div class="mb-3">
+                <label for="kind_{{ loop.index }}" class="form-label">Kind</label>
+                <input type="text" class="form-control" id="kind_{{ loop.index }}" name="kind" value="{{ kind }}" />
+            </div>
+            {% endfor %}
+            <div class="mb-3">
+                <label for="regex_new" class="form-label">Kind</label>
+                <input type="text" class="form-control" id="kind_new" name="kind" />
+            </div>
+        </div>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2

@@ -0,0 +1,55 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Metadata Extraction</h1>
+
+<p>There are a few metadata fields that can be populated with information from the path of the activity file or by a
+    default value. These are:</p>
+
+<ul>
+    <li><tt>kind</tt>: The kind of the activity, like "Ride" or "Run".</li>
+    <li><tt>equipment</tt>: Name for the equipment used, like "Red Roadbike".</li>
+    <li><tt>name</tt>: Name for the activity, like "Ride with Friends".</li>
+</ul>
+
+<p>By default these fields are populated with information from within the activity files. In case one hasn't set these
+    values correctly, it can be nice to override this data.</p>
+
+<form method="POST">
+    <div class="row">
+        <div class="col-md-6">
+            {% for regex in metadata_extraction_regexes %}
+            <div class="mb-3">
+                <label for="regex_{{ loop.index }}" class="form-label">Regular expression</label>
+                <input type="text" class="form-control" id="regex_{{ loop.index }}" name="regex" value="{{ regex }}" />
+            </div>
+            {% endfor %}
+            <div class="mb-3">
+                <label for="regex_new" class="form-label">Regular expression</label>
+                <input type="text" class="form-control" id="regex_new" name="regex" />
+            </div>
+        </div>
+
+        <div class="col-md-6">
+            <p>To give an example of what is possible, consider a directory structure where we have
+                <tt>{kind}/{equipment}/{date} {name}.{ext}</tt>. Such an activity could be <tt>Ride/Red
+                    Roadbike/2024-08-10 11-45-00 Ride with Friends.fit</tt>. In order to extract this, we could use the
+                following regular expression:
+            </p>
+
+            <div class="code">
+                <pre
+                    class="code literal-block">(?P&lt;kind&gt;[^/]+)/(?P&lt;equipment&gt;[^/]+)/[-\d_ .]+(?P&lt;name&gt;[^/\.]+)</pre>
+            </div>
+
+            <p>This uses "capture groups". Have a look at the <a href="https://docs.python.org/3/library/re.html">Python
+                    regex documentation</a> if you want to build your own.</p>
+        </div>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground/webui/settings/templates/settings/privacy-zones.html.j2

@@ -0,0 +1,81 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="mb-3">Privacy Zones</h1>
+
+<p>You might want to remove points that are close to your home, work or relatives. For this you can define
+    arbitrary polygons as "privacy zones". Go to <a href="https://geojson.io/" target="_blank">GeoJSON.io</a> to have a
+    nice interactive tool for creating overlays. Create a single polygon, rectangle or circle to define a privacy zone.
+    You can define as many zones as you want, but each zone must only consist of a single area. When you are done, copy
+    the JSON output from the left into the text box below.</p>
+
+<p>You can change the name on an existing privacy zone. To delete a zone, delete the name or the GeoJSON. Zones without
+    a name will be deleted.</p>
+
+<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: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+        }).addTo(map)
+
+        let geojson_layer = L.geoJSON(geojson).addTo(map)
+        map.fitBounds(geojson_layer.getBounds())
+        return map
+    }
+</script>
+
+
+
+<form method="POST">
+    {% if privacy_zones %}
+    <h2 class="mb-3">Existing zones</h2>
+
+    <div class="row row-cols-1 row-cols-md-3 g-4 mb-3">
+        {% for zone_name, zone_geojson in privacy_zones.items() %}
+
+        <div class="col-md-4">
+            <div class="mb-3">
+                <label for="zone_name_{{ loop.index }}" class="form-label">Name</label>
+                <input type="text" class="form-control" id="zone_name_{{ loop.index }}" name="zone_name"
+                    value="{{ zone_name }}" />
+            </div>
+            <div class="mb-3">
+                <label for="zone_geojson_{{ loop.index }}" class="form-label">GeoJSON</label>
+                <textarea class="form-control" id="zone_geojson_{{ loop.index }}" name="zone_geojson"
+                    rows="10">{{ zone_geojson|tojson(indent=2) }}</textarea>
+            </div>
+            <div class="card-img-top" id="map-{{ loop.index }}" style="height: 300px; width: 100%;"></div>
+            <script>
+                let map{{ loop.index }} = add_map("{{ loop.index }}", {{ zone_geojson | safe }})
+            </script>
+        </div>
+        {% endfor %}
+    </div>
+    {% endif %}
+
+    <h2 class="mb-3">New zone</h2>
+
+    <div class="row mb-3">
+        <div class="col-md-4">
+            <div class="mb-3">
+                <label for="new_zone_name" class="form-label">Name</label>
+                <input type="text" class="form-control" id="new_zone_name" name="zone_name" />
+            </div>
+            <div class="mb-3">
+                <label for="new_zone_geojson" class="form-label">GeoJSON</label>
+                <textarea class="form-control" id="new_zone_geojson" name="zone_geojson" rows="10"></textarea>
+            </div>
+
+        </div>
+    </div>
+
+    <button type="submit" class="btn btn-primary">Save</button>
+</form>
+
+
+{% endblock %}

geo_activity_playground/webui/{strava/templates/strava/client-id.html.j2 → settings/templates/settings/strava.html.j2}

@@ -13,21 +13,31 @@
             button. If you don't want to share the API limits with other people, go the <a
                 href="https://www.strava.com/settings/api">Strava API page</a> and create your own app. Then fill in
             "client ID" and "client secret" in the form.</p>
+
+        <p>
+            Status:
+            {% if strava_client_code %}
+            <span class="badge text-bg-success">Connected</span>
+            {% else %}
+            <span class="badge text-bg-secondary">Not connected</span>
+            {% endif %}
+        </p>
     </div>
 
     <div class="col-md-6">
-        <form action="/strava/post-client-id" method="POST">
+        <form action="" method="POST">
             <div class="mb-3">
-                <label for="client_id" class="form-label">Client ID</label>
-                <input type="text" class="form-control" id="client_id" name="client_id" value="131693" />
+                <label for="strava_client_id" class="form-label">Client ID</label>
+                <input type="text" class="form-control" id="strava_client_id" name="strava_client_id"
+                    value="{{ strava_client_id }}" />
             </div>
             <div class="mb-3">
-                <label for="client_secret" class="form-label">Client Secret</label>
-                <input type="text" class="form-control" id="client_secret" name="client_secret"
-                    value="0ccc0100a2c218512a7ef0cea3b0e322fb4b4365" />
+                <label for="strava_client_secret" class="form-label">Client Secret</label>
+                <input type="text" class="form-control" id="strava_client_secret" name="strava_client_secret"
+                    value="{{ strava_client_secret }}" />
             </div>
 
-            <input type="submit" value="Connect to Strava" />
+            <button type="submit" class="btn btn-primary">Connect to Strava</button>
         </form>
     </div>
 </div>

geo_activity_playground/webui/templates/page.html.j2

@@ -60,6 +60,7 @@
                 </button>
                 <div class="collapse navbar-collapse" id="navbarSupportedContent">
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+
                         {% if num_activities > 0 %}
                         <li class="nav-item">
                             <a class="nav-link" aria-current="page" href="{{ url_for('summary.index') }}">Summary</a>
@@ -91,7 +92,10 @@
                             <a class="nav-link" aria-current="page" href="{{ url_for('upload.index') }}">Upload</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" aria-current="page" href="{{ url_for('settings') }}">Settings</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('upload.reload') }}">Refresh</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" aria-current="page" href="{{ url_for('settings.index') }}">Settings</a>
                         </li>
 
 

geo_activity_playground/webui/upload/blueprint.py

@@ -4,12 +4,13 @@ from flask import render_template
 from ...core.activities import ActivityRepository
 from ...explorer.tile_visits import TileVisitAccessor
 from .controller import UploadController
+from geo_activity_playground.core.config import Config
 
 
 def make_upload_blueprint(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
-    config: dict,
+    config: Config,
 ) -> Blueprint:
     blueprint = Blueprint("upload", __name__, template_folder="templates")
 
@@ -25,4 +26,12 @@ def make_upload_blueprint(
     def receive():
         return upload_controller.receive()
 
+    @blueprint.route("/refresh")
+    def reload():
+        return render_template("upload/reload.html.j2")
+
+    @blueprint.route("/execute-reload")
+    def execute_reload():
+        return upload_controller.execute_reload()
+
     return blueprint

geo_activity_playground/webui/upload/controller.py

@@ -1,18 +1,18 @@
 import logging
 import os
 import pathlib
-import sys
 
 from flask import flash
 from flask import redirect
 from flask import request
 from flask import Response
+from flask import url_for
 from werkzeug.utils import secure_filename
 
 from geo_activity_playground.core.activities import ActivityRepository
 from geo_activity_playground.core.activities import build_activity_meta
+from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.enrichment import enrich_activities
-from geo_activity_playground.core.paths import _strava_dynamic_config_path
 from geo_activity_playground.explorer.tile_visits import compute_tile_evolution
 from geo_activity_playground.explorer.tile_visits import compute_tile_visits
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
@@ -32,7 +32,7 @@ class UploadController:
         self,
         repository: ActivityRepository,
         tile_visit_accessor: TileVisitAccessor,
-        config: dict,
+        config: Config,
     ) -> None:
         self._repository = repository
         self._tile_visit_accessor = tile_visit_accessor
@@ -45,7 +45,7 @@ class UploadController:
         directories.sort()
         return {
             "directories": directories,
-            "has_upload": "password" in self._config.get("upload", {}),
+            "has_upload": self._config.upload_password,
         }
 
     def receive(self) -> Response:
@@ -54,7 +54,7 @@ class UploadController:
             flash("No file could be found. Did you select a file?", "warning")
             return redirect("/upload")
 
-        if request.form["password"] != self._config["upload"]["password"]:
+        if request.form["password"] != self._config.upload_password:
             flash("Incorrect upload password!", "danger")
             return redirect("/upload")
 
@@ -88,24 +88,37 @@ class UploadController:
             flash(f"Activity was saved with ID {activity_id}.", "success")
             return redirect(f"/activity/{activity_id}")
 
+    def execute_reload(self) -> None:
+        scan_for_activities(
+            self._repository,
+            self._tile_visit_accessor,
+            self._config,
+            skip_strava=True,
+        )
+        flash("Scanned for new activities.", category="success")
+        return redirect(url_for("index"))
+
 
 def scan_for_activities(
     repository: ActivityRepository,
     tile_visit_accessor: TileVisitAccessor,
-    config: dict,
+    config: Config,
     skip_strava: bool = False,
 ) -> None:
     if pathlib.Path("Activities").exists():
-        import_from_directory(config.get("metadata_extraction_regexes", []))
+        import_from_directory(
+            config.metadata_extraction_regexes,
+            None,
+        )
     if pathlib.Path("Strava Export").exists():
         import_from_strava_checkout()
-    if (_strava_dynamic_config_path.exists() or "strava" in config) and not skip_strava:
-        import_from_strava_api()
+    if config.strava_client_code and not skip_strava:
+        import_from_strava_api(config)
 
-    enrich_activities(config.get("kind", {}))
+    enrich_activities(config)
     build_activity_meta()
     repository.reload()
 
     if len(repository) > 0:
         compute_tile_visits(repository, tile_visit_accessor)
-        compute_tile_evolution(tile_visit_accessor)
+        compute_tile_evolution(tile_visit_accessor, config)

geo_activity_playground/webui/upload/templates/upload/reload.html.j2

@@ -0,0 +1,16 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<h1>Reloading</h1>
+
+<p>Checking for new activities, importing them and adding them to the database. This might take a while …</p>
+
+<div class="progress" role="progressbar" aria-label="Animated striped example" aria-valuenow="100" aria-valuemin="0"
+    aria-valuemax="100">
+    <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 100%"></div>
+</div>
+
+<script type="text/javascript">
+    window.location.replace("{{ url_for('.execute_reload') }}");
+</script>
+{% endblock %}

{geo_activity_playground-0.26.3.dist-info → geo_activity_playground-0.27.0.dist-info}/METADATA

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

{geo_activity_playground-0.26.3.dist-info → geo_activity_playground-0.27.0.dist-info}/RECORD

@@ -1,39 +1,42 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=NQDFaa1BSIdare1oIdYO0cESf0kPVnEIE3J24jlsX_E,4021
+geo_activity_playground/__main__.py,sha256=0feB3cw3-U9q0Dkrn5co76gTPpwGRWyfI5mfWNSZ_lU,4063
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/core/activities.py,sha256=I1lsn1gO_P9eHbZCZlkCO6Lvi5sqXq_-c-1aDv6uKMs,8081
-geo_activity_playground/core/config.py,sha256=YjqCiEmIAa-GM1-JfBctMEsl8-I56pZyyDdTyPduOzw,477
+geo_activity_playground/core/activities.py,sha256=Z81Itv3qrokxE1-YnPrDJ0QteyBZYjQYvTP-tHvR9j4,6606
+geo_activity_playground/core/config.py,sha256=Zk3j-MwRbkFyCN4e4jLdzA7yRNLFEWu0Uau78TBftiE,4417
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
-geo_activity_playground/core/enrichment.py,sha256=CIkUS_wtLJ8ZLwtzxsZ8gRn8mkITLwIwq3AzTxZ-kzI,6994
+geo_activity_playground/core/enrichment.py,sha256=CwZhW-svgPAYbdx3n9kvKlTgcsiCaeuJfSRCC4JxX6g,7411
+geo_activity_playground/core/heart_rate.py,sha256=IwMt58TpjOYqpAxtsj07zP2ttpN_J3GZeiv-qGhYyJc,1598
 geo_activity_playground/core/heatmap.py,sha256=bRLQHzmTEsQbX8XWeg85x_lRGk272UoYRiCnoxZ5da0,4189
-geo_activity_playground/core/paths.py,sha256=ohJN_xNLh303uc0ATpL4iH01xANIE86pILRaQi4e-RQ,1893
+geo_activity_playground/core/paths.py,sha256=AiYUJv46my_FGYbHZmSs5ZrqeE65GNdWEMmXZgunZrk,2150
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/similarity.py,sha256=Jo8jRViuORCxdIGvyaflgsQhwu9S_jn10a450FRL18A,3159
-geo_activity_playground/core/tasks.py,sha256=22rIidyRR0eDqz9T7swJJSl7I96OeZ-T6xFQkh1-RsQ,2521
+geo_activity_playground/core/tasks.py,sha256=k_DHzY--V5EHqMh-aNFh-VsLiQntvAsGbmK5zZJ0YPI,2909
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
 geo_activity_playground/core/test_time_conversion.py,sha256=Sh6nZA3uCTOdZTZa3yOijtR0m74QtZu2mcWXsDNnyQI,984
-geo_activity_playground/core/tiles.py,sha256=VxPu9vdfKnxDxaYo5JSYmka9Dt3TDxg0zo3cYVJXVHc,3359
+geo_activity_playground/core/tiles.py,sha256=KpzD-h3kNzZ2ieLt6f2xHilSF3lHyfaEXPnrGvlIAz0,3379
 geo_activity_playground/core/time_conversion.py,sha256=9J6aTlqJhWvsknQkoECNL-CIG-8BKs6ZatJJ9XJnTsg,367
 geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=k6j6KBEk2a2BY-onE8SV5TJsERGGyOrlY4as__meWpA,3304
-geo_activity_playground/explorer/tile_visits.py,sha256=CLZ8bCUKc5YoxvNa23hGF9JtlinIl9Wbk9u2xN4bJpw,13457
+geo_activity_playground/explorer/tile_visits.py,sha256=p0MK0V4fHhroR-FN8S9m5nW0vT7uO39Euo-_mOw0Q8k,13586
 geo_activity_playground/explorer/video.py,sha256=ROAmV9shfJyqTgnXVD41KFORiwnRgVpEWenIq4hMCRM,4389
 geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/importers/activity_parsers.py,sha256=m2SpvGlTZ8F3gG6YB24_ZFrlOAbtqbfWi-GIYspeUco,10593
-geo_activity_playground/importers/directory.py,sha256=YTYuroH-oYviL2a9B7No-6Fx4RrkhMqf60Yh-7dGats,5384
-geo_activity_playground/importers/strava_api.py,sha256=ihy_ezq_gYUy1V4jbtg41N6K0ilYVOEiPZE07lSiUHU,8444
-geo_activity_playground/importers/strava_checkout.py,sha256=gOmqwDJE2kP6KFwxJ8_zGn5kcEcRqnfOqw8jJ4eHcaU,8596
+geo_activity_playground/importers/csv_parser.py,sha256=7x0U4MyKNCsVFnXU6US8FQ28X9PTIoQS8U_hzF5l4So,2147
+geo_activity_playground/importers/directory.py,sha256=_KEoRxmjz4-oVhJgcMnA_JUO_ERHEkedqV5TPvANSEk,5735
+geo_activity_playground/importers/strava_api.py,sha256=pgWZp-cWOLkvlDE85lTiEKM8BCZYzOlAAdKoa2F7c6o,7780
+geo_activity_playground/importers/strava_checkout.py,sha256=N-uGTkhBJMC7cPYjRRXHOSLwpK3wc6aaSrY2RQfSitA,9419
+geo_activity_playground/importers/test_csv_parser.py,sha256=LXqva7GuSAfXYE2zZQrg-69lCtfy5MxLSq6BRwL_VyI,1191
 geo_activity_playground/importers/test_directory.py,sha256=ljXokx7q0OgtHvEdHftcQYEmZJUDVv3OOF5opklxdT4,724
 geo_activity_playground/importers/test_strava_api.py,sha256=4vX7wDr1a9aRh8myxNrIq6RwDBbP8ZeoXXPc10CAbW4,431
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/activity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/activity/blueprint.py,sha256=gGMes5ycXi2rMixVYs4NQgzTU1Vttgu50prYAe3--Hs,1749
-geo_activity_playground/webui/activity/controller.py,sha256=BSmHwO2GLyMGiFRQ0BpTsHMKDWJbz5UHnwQ9HVULN4c,16679
+geo_activity_playground/webui/activity/blueprint.py,sha256=upQzZa5sKApj_Fmu6PziFDboi7SBL5Zsi-tNSSNPlEE,1759
+geo_activity_playground/webui/activity/controller.py,sha256=VJrbUD2oofESV2imNr7LBrx6jhSA8miuwnrERPsUuQc,17573
 geo_activity_playground/webui/activity/templates/activity/day.html.j2,sha256=r3qKl9uTzOko4R-ZzyYAZt1j61JSevYP4g0Yi06HHPg,2702
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=5gB1aDjRgi_RventenRfC10_FtMT4ch_VuWvA9AMlBY,1121
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=RDLEt6ip8_ngmdLgaC5jg92Dk-F2umGwKkd8cWmvVko,2400
-geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=NOsMPUBy1UQM_YebtT6RQxLSgSGvCMetqi_mspJmUjQ,5229
-geo_activity_playground/webui/app.py,sha256=h8yc6Ls7ozE7IblCM6TFs30t6J7FoTeWATLWwp_UVQc,4117
+geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=3g-Hab06uWBPJo6DmTk4lM2OlozE1EyrQK6RgTgTuwU,5521
+geo_activity_playground/webui/app.py,sha256=xKPP0WDyHMAbkpJsuEz53skIjOMRBMvueD6LpRdYJE0,4119
 geo_activity_playground/webui/calendar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/calendar/blueprint.py,sha256=rlnhgU2DWAcdLMRq7m77NzrM_aDyp4s3kuuQHuzjHhg,782
 geo_activity_playground/webui/calendar/controller.py,sha256=QpSAkR2s1sbLSu6P_fNNTccgGglOzEH2PIv1XwKxeVY,2778
@@ -41,22 +44,31 @@ geo_activity_playground/webui/calendar/templates/calendar/index.html.j2,sha256=x
 geo_activity_playground/webui/calendar/templates/calendar/month.html.j2,sha256=sRIiNo_Rp9CHary6e-lnpKJKOuAonoDEBvKMxzbTLQE,1802
 geo_activity_playground/webui/eddington/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/eddington/blueprint.py,sha256=evIvueLfDWVTxJ9pRguqmZ9-Pybd2WmBRst_-7vX2QA,551
-geo_activity_playground/webui/eddington/controller.py,sha256=L4YssL088UMamp4qgzEtilzhaKGZsyfVUScuw-fmTjE,2888
+geo_activity_playground/webui/eddington/controller.py,sha256=ly7JSkSS79kO4CL_xugB62uRuuWKVqOjbN-pheelv94,2910
 geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256=XHKeUymQMS5x00PLOVlg-nSRCz_jHB2pvD8QunULWJ4,1839
 geo_activity_playground/webui/entry_controller.py,sha256=n9v4MriyL8kDR91LE9eeqc2tAvxyzFgoNMMXpr0qh4g,1906
 geo_activity_playground/webui/equipment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/equipment/blueprint.py,sha256=YbOAsjk05BMeUlD6wGfxE1amvlLsFjG4HMJn5SBrVRU,551
-geo_activity_playground/webui/equipment/controller.py,sha256=m1LNaGCNJnW97TlKT6x9NfQcMp6RKcZ8Q0I1FTUAvss,4037
+geo_activity_playground/webui/equipment/blueprint.py,sha256=_NIhRJuJNbXpEd_nEPo01AqnUqPgo1vawFn7E3yoeng,636
+geo_activity_playground/webui/equipment/controller.py,sha256=_iLkQeeu7UYMg7FGNemTrhm8e0pf409f9aUXnGfNsCI,4022
 geo_activity_playground/webui/equipment/templates/equipment/index.html.j2,sha256=FEfxB4XwVYELAOdjVlSlprjJH_kLmE-pNWEEXdPqc6I,1778
 geo_activity_playground/webui/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/explorer/blueprint.py,sha256=jHE6bb4H2GmYaix9P452Cyrn_30z_Nm705AZ0WNm4HQ,1950
-geo_activity_playground/webui/explorer/controller.py,sha256=8d0FFrG55ZlPQ5seQC2DegxIkPGIW7pvw8Jm4eJt3fg,10634
-geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=OxNt2_VwH-cmVXJrDNfeD-dNB9IrwBjdhhQEqkXxHj0,6529
+geo_activity_playground/webui/explorer/blueprint.py,sha256=EKnBs8llqT6Wy1uac18dF2epp3TebF9p3iGlSbj6Vl0,2337
+geo_activity_playground/webui/explorer/controller.py,sha256=M3FdPLrcP9GZiCjuRVY0ug1DtTqLvIbEDCzRHf6QuOE,11555
+geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=cm9pWY0vB84DtkTH-LBvSzfLU1FnmxQ2ECyw3Bl7dTo,6945
 geo_activity_playground/webui/heatmap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/heatmap/blueprint.py,sha256=bjQu-HL3QN5UpJ6tHOifhcLGlPr_hIKvaRu78md4JqM,1470
 geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=i376qEqTJrhezGsdPyKR8VsRY2N0JdEra7_kY7NmwW8,6822
 geo_activity_playground/webui/heatmap/templates/heatmap/index.html.j2,sha256=YLeu6P4djl8G4qAXR6DhetseqrbOodN7aN4coocknc4,1875
 geo_activity_playground/webui/search_controller.py,sha256=PzMf7b8tiJKZIZoPvQ9A2hOrzoKV9cS3jq05w2fK94c,532
+geo_activity_playground/webui/settings/blueprint.py,sha256=1u16oRlauOSPVBGBzjf08Ja9jxbqEKnwcDISWl7CmJU,4113
+geo_activity_playground/webui/settings/controller.py,sha256=ixuYgpMGggg9kmcIVTgL2gzAPhYjMpqWEPxS7YXlmnA,7902
+geo_activity_playground/webui/settings/templates/settings/equipment-offsets.html.j2,sha256=ltaYwFe8S8Mi72ddmIp1vwqlu8MEXXjBGfbpN2WBTC4,1728
+geo_activity_playground/webui/settings/templates/settings/heart-rate.html.j2,sha256=UPT3MegRgSeff36lhCo0l3ZwhqNSIg5gM6h2s32GkCY,4255
+geo_activity_playground/webui/settings/templates/settings/index.html.j2,sha256=26VEC_MbdIyd7vbFokDFtJelcuK3YFb1_3WaFLGv_bk,3183
+geo_activity_playground/webui/settings/templates/settings/kinds-without-achievements.html.j2,sha256=IdUfXon1Pu8zX3NirKb28ypshLHOvZRpz2T4bJrzrak,1067
+geo_activity_playground/webui/settings/templates/settings/metadata-extraction.html.j2,sha256=Ppa8O-zRJznbeCsF4YQj37_HM9nOW8fyTi66jvWvHmA,2285
+geo_activity_playground/webui/settings/templates/settings/privacy-zones.html.j2,sha256=7BxFvCaVJOEqbImyK5vxCmhh-NGSFaRa9ARhqjZeYJ0,3093
+geo_activity_playground/webui/settings/templates/settings/strava.html.j2,sha256=FrXgT-m1PgvsQWo9kMKpk8QenKeifSDBCZFqKgsHRxQ,1827
 geo_activity_playground/webui/square_planner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/square_planner/blueprint.py,sha256=r2VkSM547chX85g6c1BQ8NC-tkdqGdYp-2ZALBiiDTc,1320
 geo_activity_playground/webui/square_planner/controller.py,sha256=wYcNEviDgqyYxSrnwMD_5LnYXIazVH9plGX8RxG6oco,3464
@@ -73,28 +85,23 @@ geo_activity_playground/webui/static/favicon.ico,sha256=uVNZlrF22zn1lcCS_9wAoWLh
 geo_activity_playground/webui/static/mstile-150x150.png,sha256=j1ANUQJ1Xi1DR2sGqYZztob2ypfGw04eNtGpN9SxExA,11964
 geo_activity_playground/webui/static/safari-pinned-tab.svg,sha256=OzoEVGY0igWRXM1NiM3SRKugdICBN7aB_XuxaC3Mu9Q,8371
 geo_activity_playground/webui/static/site.webmanifest,sha256=4vYxdPMpwTdB8EmOvHkkYcjZ8Yrci3pOwwY3o_VwACA,440
-geo_activity_playground/webui/strava/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/strava/blueprint.py,sha256=Q2Wfxlg7bR2vjWZ3UpckPl9jWHwNB8hfP7SLBufgiUY,1055
-geo_activity_playground/webui/strava/controller.py,sha256=Ye0R-nu5SwFdk2DAIEq7OE76XLgnRk9y8iJjLObbAUc,1437
-geo_activity_playground/webui/strava/templates/strava/client-id.html.j2,sha256=m5gJk0VxcIn0VcROsOke5A5MbWXC5O1e1Lxc09MyN_g,1493
-geo_activity_playground/webui/strava/templates/strava/connected.html.j2,sha256=TN6H8YPjG2zk8fodTaSaloTEJCXnpgTCIRX_uEVTiNI,274
 geo_activity_playground/webui/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/summary/blueprint.py,sha256=kzQ6MDOycQKfDcVoEUmL7HYHJA_gu8DlzVHwO37-_jA,514
 geo_activity_playground/webui/summary/controller.py,sha256=ZOrwfrKjpc8hecUYImBvesKXZi06obfR1yhQkVTeWzw,8981
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=rsII1eMY-xNugh8A9SecnEcDZqkEOWYIfiHAGroQYuM,4442
 geo_activity_playground/webui/templates/home.html.j2,sha256=fp48MjBuO4QJfQz6YPOWH56IzStgaclx9XbwEKmUFHQ,2403
-geo_activity_playground/webui/templates/page.html.j2,sha256=RyB-G2dhdhTUSwXAxquylk2ma3DXMZ490g6yrgsxA-I,9388
+geo_activity_playground/webui/templates/page.html.j2,sha256=sqerdJLOIcgMtQy533kHPD9uVIxF3v6ItLQSjuoCqlI,9589
 geo_activity_playground/webui/templates/search.html.j2,sha256=FvNRoDfUlSzXjM_tqZY_fDhuhUDgbPaY73q56gdvF1A,1130
-geo_activity_playground/webui/templates/settings.html.j2,sha256=-q9GflrG2t6kSt-NerBN5NV1gRp12JT3KgGp_aPaKT8,674
 geo_activity_playground/webui/tile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/tile/blueprint.py,sha256=cK0o2Z3BrLycgF9zw0F8s9qF-JaYDbF5Gog-GXDtUZ8,943
 geo_activity_playground/webui/tile/controller.py,sha256=PISh4vKs27b-LxFfTARtr5RAwHFresA1Kw1MDcERSRU,1221
 geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/upload/blueprint.py,sha256=2l5q1LYtjgLF_3CAyPvCLx-wMebp14OJvgZBzGILdmQ,801
-geo_activity_playground/webui/upload/controller.py,sha256=BWcSlLy_fVAodDlnXkxE4eIotC_UHrjldACrToA-iAQ,3975
+geo_activity_playground/webui/upload/blueprint.py,sha256=qU6ZKOrhB8DA8GSbOECVu2fPKd2VtBFp0mEFzjJAgIA,1083
+geo_activity_playground/webui/upload/controller.py,sha256=NQ-JOT-kP5Vk0wgjP0AQP6E7HFAVHnCymlKhVnhwDYo,4255
 geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=hfXkEXaz_MkM46rU56423D6V6WtK-EAXPszSY-_-Tx8,1471
-geo_activity_playground-0.26.3.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.26.3.dist-info/METADATA,sha256=9v9y9sR7bMNsUoFDrYQC9d-YQ0VL0UDVHhM6RY4I0iA,1665
-geo_activity_playground-0.26.3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-geo_activity_playground-0.26.3.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.26.3.dist-info/RECORD,,
+geo_activity_playground/webui/upload/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
+geo_activity_playground-0.27.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.27.0.dist-info/METADATA,sha256=2EqcALnLKO3K5mS5TFu-pcMNfJYpP-G1b57QPk7oi7Q,1665
+geo_activity_playground-0.27.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+geo_activity_playground-0.27.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.27.0.dist-info/RECORD,,

geo_activity_playground/webui/strava/blueprint.py

@@ -1,33 +0,0 @@
-from flask import Blueprint
-from flask import redirect
-from flask import render_template
-from flask import request
-
-from .controller import StravaController
-
-
-def make_strava_blueprint(host: str, port: int) -> Blueprint:
-    strava_controller = StravaController(host, port)
-    blueprint = Blueprint("strava", __name__, template_folder="templates")
-
-    @blueprint.route("/setup")
-    def setup():
-        return render_template(
-            "strava/client-id.html.j2", **strava_controller.set_client_id()
-        )
-
-    @blueprint.route("/post-client-id", methods=["POST"])
-    def post_client_id():
-        client_id = request.form["client_id"]
-        client_secret = request.form["client_secret"]
-        url = strava_controller.save_client_id(client_id, client_secret)
-        return redirect(url)
-
-    @blueprint.route("/callback")
-    def strava_callback():
-        code = request.args.get("code", type=str)
-        return render_template(
-            "strava/connected.html.j2", **strava_controller.save_code(code)
-        )
-
-    return blueprint