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

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/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/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/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/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/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/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/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.dist-info → geo_activity_playground-0.43.1.dist-info}/METADATA

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

{geo_activity_playground-0.43.0.dist-info → geo_activity_playground-0.43.1.dist-info}/RECORD

@@ -20,7 +20,7 @@ geo_activity_playground/core/datamodel.py,sha256=fBq2D9N8wjWVSSt0bLqxIOBLouRySO7
 geo_activity_playground/core/enrichment.py,sha256=Hs1lB__s5TwPLOWPaaheOJeJIBQFUa68NTbCI5M5wWI,7640
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=Ygh2uySZ9_q-oddU_2vXfzGfXV9rfTyeQFBT7sIiXCI,6657
-geo_activity_playground/core/missing_values.py,sha256=STTNF3L_Zcl3v4QhWaqfPDtsxDu_YBvFjZyugb72XeA,296
+geo_activity_playground/core/missing_values.py,sha256=HjonaLV0PFMICnuMrbdUNnK9uy_8PBh_RxI5GuEMQK0,250
 geo_activity_playground/core/parametric_plot.py,sha256=IefPc6lwthxowvjUDA5wu23oBSw9jq399l04gSaNrOQ,3880
 geo_activity_playground/core/paths.py,sha256=CLQYA_6ouxHJYgrt_uGp-9sO7MG60prdD6cvVwhA_2g,2670
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
@@ -30,7 +30,7 @@ geo_activity_playground/core/summary_stats.py,sha256=v5FtWnE1imDF5axI6asVN55wCrl
 geo_activity_playground/core/tasks.py,sha256=-_9cxekoHSWzCW4XblNeqrwi2tTqr5AE7_-p8fdqhwc,2886
 geo_activity_playground/core/test_datamodel.py,sha256=-VrGHgx5Z3MSQPqHGmmm7atRJYbg5y_ukvRHKxk22PI,569
 geo_activity_playground/core/test_meta_search.py,sha256=zhuD343Xce-4Fkznw81DHQ7pK5eyX5UbcyCHuYRKsr8,3091
-geo_activity_playground/core/test_missing_values.py,sha256=zlyrKHLCzUSBdktiy87oKz7_bySpfohVPxG1HRGRHqw,278
+geo_activity_playground/core/test_missing_values.py,sha256=7yvg6dUu7p8PR_rxUxgFaJCrGzfYUcF8Zf6y7bCEYKw,356
 geo_activity_playground/core/test_summary_stats.py,sha256=qH_45mPRFD2H-Rr0Ku-RYc67vhC7qKxbPr7J2F36uV8,3081
 geo_activity_playground/core/test_tiles.py,sha256=zce1FxNfsSpOQt66jMehdQRVoNdl-oiFydx6iVBHZXM,764
 geo_activity_playground/core/test_time_conversion.py,sha256=Sh6nZA3uCTOdZTZa3yOijtR0m74QtZu2mcWXsDNnyQI,984
@@ -51,15 +51,15 @@ geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xN
 geo_activity_playground/importers/test_directory.py,sha256=_fn_-y98ZyElbG0BRxAmGFdtGobUShPU86SdEOpuv-A,691
 geo_activity_playground/importers/test_strava_api.py,sha256=7b8bl5Rh2BctCmvTPEhCadxtUOq3mfzuadD6F5XxRio,398
 geo_activity_playground/webui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/app.py,sha256=LEKALJE-856bQE-79MVfsqGHr5G68IIyHL3cmA6eZyU,7888
+geo_activity_playground/webui/app.py,sha256=SyRztm6P0pQuq3Vn4g7gFwg1pwyZsElVNZOeljN5jEY,8139
 geo_activity_playground/webui/authenticator.py,sha256=jtQqvpVHa_eLTAulmvvJgDRoCWOEege49G9zn3MfYk8,1394
 geo_activity_playground/webui/blueprints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=NDFw5v765uGpaX2kMIH09EALsZmYYLSJRkrn7bq_Wvo,25258
+geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=QRkSPDJfBNRJn9UHchQm_Rg_b_Or0AqxUzNNzOxTx30,25688
 geo_activity_playground/webui/blueprints/auth_blueprint.py,sha256=_VZeP3VN626BoOOZUkNVnuw9v-cEOrkHz5lhFPmxqMY,784
 geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py,sha256=xESHzYxlbhz4oNDuxV0A70eVKpFwz84pYC3q_YVZZg8,2812
 geo_activity_playground/webui/blueprints/calendar_blueprint.py,sha256=4EIBZ8rdXEu3tbl1faVlRwHb8Qp0JuMc3eyxwMkq6g8,2848
 geo_activity_playground/webui/blueprints/eddington_blueprints.py,sha256=Umb2wtKmAXuQZEXt0d985qMILtvqc3vxj_yXymnzmUs,8702
-geo_activity_playground/webui/blueprints/entry_views.py,sha256=RK2ypZO75DhweGjoKK7pG699urDB7twFkWaS2CyWmtw,2824
+geo_activity_playground/webui/blueprints/entry_views.py,sha256=9OuaxbA-J5D2Qn2OSSIjIb-eRTxXY8i1LhlfUk1W60Q,2910
 geo_activity_playground/webui/blueprints/equipment_blueprint.py,sha256=juQ5L2BlrECb00LBbiY2yc0b8W_B9Y3fPwtbiaRfgpo,5634
 geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=6w6seOCVf7Z5y4BBtgVwoZ4t8qastnm7ViX8Bs_zj2w,15566
 geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=iHI5YJYhX7ZOlzTgzl2efIRDzt3UMYCx7X4-LVd0MWk,8702
@@ -70,7 +70,7 @@ geo_activity_playground/webui/blueprints/settings_blueprint.py,sha256=p_17BC2ZQy
 geo_activity_playground/webui/blueprints/square_planner_blueprint.py,sha256=xVaxJxmt8Dysl3UL9f2y__LVLtTH2Np1Ust4OSXKRAk,4746
 geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=rK4LGR2Rpioy4wSqNYuyRn4WxaWeBLensJ3PmAd-ouY,11469
 geo_activity_playground/webui/blueprints/tile_blueprint.py,sha256=YzZf9OrNdjhc1_j4MtO1DMcw1uCv29ueNsYd-mWqgbg,837
-geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=_VeGu08vlRZlRn5J4t7VdBk2TTW5GXB4JUcge9mbX9Y,4111
+geo_activity_playground/webui/blueprints/upload_blueprint.py,sha256=4ZCPZiaO3zAMPeFHal-4mmMyDSW2a5amOXtYtKVpOxw,4592
 geo_activity_playground/webui/columns.py,sha256=hSW8bFVKRUMBlWZYAN-tZ_tfED3VDQK75e4Zzw7_jZ0,642
 geo_activity_playground/webui/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
 geo_activity_playground/webui/plot_util.py,sha256=5Uesjj-xcMskQX2z9viDZYHSxLGrH2a5dHA1ogsJW9U,261
@@ -113,7 +113,7 @@ geo_activity_playground/webui/templates/activity/day.html.j2,sha256=CHEvxlZralCm
 geo_activity_playground/webui/templates/activity/edit.html.j2,sha256=r979JPqaZi_2ymTykxpkjdpw0D2tsB9VJaf7OaGPaME,1961
 geo_activity_playground/webui/templates/activity/lines.html.j2,sha256=_ZDg1ruW-9UMJfOudy1-uY_-IcSSaagq7tPCih5Bb8g,1079
 geo_activity_playground/webui/templates/activity/name.html.j2,sha256=7Wbh3IrVL5lMRve467H0P10Shn5FzGpaXLhV0H-X4Hk,2725
-geo_activity_playground/webui/templates/activity/show.html.j2,sha256=FcZajTHRGpWLtV6nes2KjyhvBS5wsc_-WH8m-SCWEAA,10578
+geo_activity_playground/webui/templates/activity/show.html.j2,sha256=uSTjr0hm8tjBOWb71xKReKuUsVv_5PaoKaqdYUe1noI,10665
 geo_activity_playground/webui/templates/activity/trim.html.j2,sha256=3oAXQab6QqWjGBC9KCvWNOVn8uRmxoDLj3hx_O63TXc,1836
 geo_activity_playground/webui/templates/auth/index.html.j2,sha256=ILQ5HvTEYc3OrtOAIFt1VrqWorVD70V9DC342znmP70,579
 geo_activity_playground/webui/templates/bubble_chart/index.html.j2,sha256=yd7lWjtxxVmJZqCiXb0Y1gMEOQ7LQYJXEdpE7JB1OZY,1616
@@ -132,7 +132,7 @@ geo_activity_playground/webui/templates/photo/map.html.j2,sha256=MWhqt5Q8ExiRhgx
 geo_activity_playground/webui/templates/photo/new.html.j2,sha256=GGLejO4ap6ZMe54jZP39ktSLkdw5j67bf5PTlHEK7qc,383
 geo_activity_playground/webui/templates/plot_builder/edit.html.j2,sha256=x5Ki425me3HY6CcBQ37le9g8rCpbOxFVkdr0N_L84-g,2230
 geo_activity_playground/webui/templates/plot_builder/index.html.j2,sha256=fBuGLT2HIwlgz5eGeKXOdIDqzDSQoY99w-hyt_0JP-w,832
-geo_activity_playground/webui/templates/search/index.html.j2,sha256=7W74ecprIWGYZ2-6xFIK_k6_mf-GRyRHNzE3ZjhWDqU,1192
+geo_activity_playground/webui/templates/search/index.html.j2,sha256=tZ2RwiaC1cLCLfcxbDvpnLSjPeqnTkByAT6ncVitnLw,1318
 geo_activity_playground/webui/templates/search_form.html.j2,sha256=QL0inDTaEHPxoQGs3EB19bD0jAMnUkOrb_r5OoQn7JU,8251
 geo_activity_playground/webui/templates/settings/admin-password.html.j2,sha256=VYwddpObD1RpeTH5Dm4y7VtmT7kwURDCIjxyzJeq08c,495
 geo_activity_playground/webui/templates/settings/color-schemes.html.j2,sha256=iR91Wxd2_TMuIo9dBDZBrWSUGHNwTwzC6O8oNH-XBt4,1653
@@ -152,8 +152,8 @@ geo_activity_playground/webui/templates/square_planner/index.html.j2,sha256=-OnY
 geo_activity_playground/webui/templates/summary/index.html.j2,sha256=soGpTK-pD81YBlMWNWLnkWeEmVIbI5JwmGZQUN2c3DI,9151
 geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
 geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-0.43.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.43.0.dist-info/METADATA,sha256=KhD9a5T2Tr9eRYK2UjvQK2wd5o-zbtBjpswTzN63RKo,1850
-geo_activity_playground-0.43.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-geo_activity_playground-0.43.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.43.0.dist-info/RECORD,,
+geo_activity_playground-0.43.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.43.1.dist-info/METADATA,sha256=cD_X2yhW8FOAo1wI7PzNahmKhm2nCHE4LXDKH4eltVo,1850
+geo_activity_playground-0.43.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+geo_activity_playground-0.43.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.43.1.dist-info/RECORD,,