geo-activity-playground 0.43.0__tar.gz → 0.43.2__tar.gz

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/PKG-INFO

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

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/core/missing_values.py

@@ -8,8 +8,6 @@ import pandas as pd
 def some(value: Any) -> Optional[Any]:
     if value is None:
         return None
-    elif np.isnan(value):
-        return None
     elif pd.isna(value):
         return None
     else:

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/core/test_missing_values.py

@@ -1,4 +1,5 @@
 import numpy as np
+import pandas as pd
 
 from .missing_values import some
 
@@ -17,3 +18,7 @@ def test_float() -> None:
 
 def test_integer() -> None:
     assert some(1) == 1
+
+
+def test_nat() -> None:
+    assert some(pd.NaT) == None

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/app.py

@@ -8,6 +8,7 @@ import secrets
 import shutil
 import urllib.parse
 
+import pandas as pd
 import sqlalchemy
 from flask import Flask
 from flask import request
@@ -105,15 +106,25 @@ def web_ui_main(
 
     @app.template_filter()
     def dt(value: datetime.datetime):
-        return value.strftime("%Y-%m-%d %H:%M")
+        if pd.isna(value):
+            return "—"
+        else:
+            return value.strftime("%Y-%m-%d %H:%M")
 
     @app.template_filter()
     def td(v: datetime.timedelta):
-        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}"
+        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}"
+
+    @app.template_filter()
+    def isna(value):
+        return pd.isna(value)
 
     authenticator = Authenticator(config_accessor())
     search_query_history = SearchQueryHistory(config_accessor, authenticator)

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/blueprints/activity_blueprint.py

@@ -111,11 +111,14 @@ def make_activity_blueprint(
                 == activity.id
             )
             for zoom in sorted(config.explorer_zoom_levels)
+            if not tile_visit_accessor.tile_state["tile_history"][zoom].empty
         }
 
         new_tiles_geojson = {}
         new_tiles_per_zoom = {}
         for zoom in sorted(config.explorer_zoom_levels):
+            if tile_visit_accessor.tile_state["tile_history"][zoom].empty:
+                continue
             new_tiles = tile_visit_accessor.tile_state["tile_history"][zoom].loc[
                 tile_visit_accessor.tile_state["tile_history"][zoom]["activity_id"]
                 == activity.id
@@ -141,25 +144,32 @@ def make_activity_blueprint(
 
         context = {
             "activity": activity,
-            "line_json": line_json,
-            "distance_time_plot": distance_time_plot(time_series),
-            "color_line_geojson": make_geojson_color_line(
-                time_series, line_color_column
-            ),
-            "speed_time_plot": speed_time_plot(time_series),
-            "speed_distribution_plot": speed_distribution_plot(time_series),
+            "color_line_geojson": line_json,
             "similar_activites": similar_activities,
-            "line_color_bar": make_color_bar(
-                time_series[line_color_column],
-                line_color_columns_avail[line_color_column].format,
-            ),
-            "date": activity.start.date(),
-            "time": activity.start.time(),
             "new_tiles": new_tiles_per_zoom,
             "new_tiles_geojson": new_tiles_geojson,
-            "line_color_column": line_color_column,
-            "line_color_columns_avail": line_color_columns_avail,
         }
+
+        if not pd.isna(time_series["time"]).all():
+            context.update(
+                {
+                    "distance_time_plot": distance_time_plot(time_series),
+                    "color_line_geojson": make_geojson_color_line(
+                        time_series, line_color_column
+                    ),
+                    "speed_time_plot": speed_time_plot(time_series),
+                    "speed_distribution_plot": speed_distribution_plot(time_series),
+                    "line_color_bar": make_color_bar(
+                        time_series[line_color_column],
+                        line_color_columns_avail[line_color_column].format,
+                    ),
+                    "date": activity.start.date(),
+                    "time": activity.start.time(),
+                    "line_color_column": line_color_column,
+                    "line_color_columns_avail": line_color_columns_avail,
+                }
+            )
+
         if (
             heart_zones := _extract_heart_rate_zones(
                 time_series, heart_rate_zone_computer

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/blueprints/entry_views.py

@@ -37,7 +37,10 @@ def register_entry_views(
 
             context["latest_activities"] = collections.defaultdict(list)
             for activity in DB.session.scalars(
-                sqlalchemy.select(Activity).order_by(Activity.start.desc()).limit(100)
+                sqlalchemy.select(Activity)
+                .where(Activity.start.is_not(None))
+                .order_by(Activity.start.desc())
+                .limit(100)
             ):
                 context["latest_activities"][activity.start.date()].append(
                     {

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -95,16 +95,18 @@ def make_settings_blueprint(
     def index():
         return render_template("settings/index.html.j2")
 
-    @blueprint.route("/admin-password")
+    @blueprint.route("/admin-password", methods=["GET", "POST"])
     @needs_authentication(authenticator)
     def admin_password() -> Response:
         if request.method == "POST":
             config_accessor().upload_password = request.form["password"]
             config_accessor.save()
             flasher.flash_message("Updated admin password.", FlashTypes.SUCCESS)
-        return render_template(
-            "settings/admin-password.html.j2",
-            password=config_accessor().upload_password,
+        return Response(
+            render_template(
+                "settings/admin-password.html.j2",
+                password=config_accessor().upload_password,
+            )
         )
 
     @blueprint.route("/color-schemes", methods=["GET", "POST"])

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/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-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/templates/activity/show.html.j2

@@ -94,7 +94,7 @@
             }).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());
 
@@ -134,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>
@@ -153,6 +154,7 @@
                 </select>
             </form>
         </div>
+        {% endif %}
     </div>
 </div>
 

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/geo_activity_playground/webui/templates/search/index.html.j2

@@ -31,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>

{geo_activity_playground-0.43.0 → geo_activity_playground-0.43.2}/pyproject.toml

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