geo-activity-playground 0.44.0__tar.gz → 0.45.0__tar.gz

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/PKG-INFO

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

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/core/config.py

@@ -38,6 +38,7 @@ class Config:
     privacy_zones: dict[str, list[list[float]]] = dataclasses.field(
         default_factory=dict
     )
+    reliable_elevation_measurements: bool = True
     sharepic_suppressed_fields: list[str] = dataclasses.field(default_factory=list)
     strava_client_id: int = 131693
     strava_client_secret: str = "0ccc0100a2c218512a7ef0cea3b0e322fb4b4365"

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/core/datamodel.py

@@ -29,6 +29,9 @@ from .paths import TIME_SERIES_DIR
 logger = logging.getLogger(__name__)
 
 
+DEFAULT_UNKNOWN_NAME = "Unknown"
+
+
 class ActivityMeta(TypedDict):
     average_speed_elapsed_kmh: float
     average_speed_moving_kmh: float

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/core/meta_search.py

@@ -120,7 +120,7 @@ class SearchQuery:
             variables.append(("distance_km_max", self.distance_km_max))
 
         return "&".join(
-            f"{key}={urllib.parse.quote_plus(value)}" for key, value in variables
+            f"{key}={urllib.parse.quote_plus(str(value))}" for key, value in variables
         )
 
 

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/importers/directory.py

@@ -10,6 +10,7 @@ from tqdm import tqdm
 
 from ..core.config import Config
 from ..core.datamodel import ActivityMeta
+from ..core.datamodel import DEFAULT_UNKNOWN_NAME
 from ..core.paths import activity_extracted_dir
 from ..core.paths import activity_extracted_meta_dir
 from ..core.paths import activity_extracted_time_series_dir
@@ -84,8 +85,8 @@ def import_from_directory(
             # https://stackoverflow.com/a/74718395/653152
             name=path.name.removesuffix("".join(path.suffixes)),
             path=str(path),
-            kind="Unknown",
-            equipment="Unknown",
+            kind=DEFAULT_UNKNOWN_NAME,
+            equipment=DEFAULT_UNKNOWN_NAME,
             consider_for_achievements=True,
         )
         activity_meta.update(activity_meta_from_file)

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/importers/strava_checkout.py

@@ -13,6 +13,7 @@ import pandas as pd
 from tqdm import tqdm
 
 from ..core.datamodel import ActivityMeta
+from ..core.datamodel import DEFAULT_UNKNOWN_NAME
 from ..core.paths import activity_extracted_meta_dir
 from ..core.paths import activity_extracted_time_series_dir
 from ..core.paths import strava_last_activity_date_path
@@ -277,7 +278,7 @@ def convert_strava_checkout(
             nan_as_none(row["Activity Gear"])
             or nan_as_none(row["Bike"])
             or nan_as_none(row["Gear"])
-            or ""
+            or DEFAULT_UNKNOWN_NAME
         )
         activity_file = checkout_path / row["Filename"]
 

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/blueprints/eddington_blueprints.py

@@ -26,7 +26,12 @@ def register_eddington_blueprint(
     @blueprint.route("/")
     def distance():
         return _render_eddington_template(
-            repository, request, search_query_history, "distance", column_distance, [1]
+            repository,
+            request,
+            search_query_history,
+            "distance",
+            column_distance,
+            [1],
         )
 
     @blueprint.route("/elevation_gain")
@@ -64,6 +69,10 @@ def _render_eddington_template(
         .copy()
     )
 
+    assert (
+        len(activities) > 0
+    ), "The filter has selected zero elements, that cannot work here."
+
     activities["year"] = [start.year for start in activities["start"]]
     activities["date"] = [start.date() for start in activities["start"]]
     activities["isoyear"] = [start.isocalendar().year for start in activities["start"]]
@@ -111,24 +120,24 @@ def _render_eddington_template(
     )
 
 
-def _get_values_per_group(grouped, columnName, divisor) -> tuple[int, pd.DataFrame]:
+def _get_values_per_group(grouped, column_name, divisor) -> tuple[int, pd.DataFrame]:
     sum_per_group = grouped.apply(
-        lambda group: int(sum(group[columnName])), include_groups=False
+        lambda group: int(sum(group[column_name])), include_groups=False
     )
     counts = dict(zip(*np.unique(sorted(sum_per_group), return_counts=True)))
     eddington = pd.DataFrame(
-        {columnName: d, "count": counts.get(d, 0)}
+        {column_name: d, "count": counts.get(d, 0)}
         for d in range(max(counts.keys()) + 1)
     )
     eddington["total"] = eddington["count"][::-1].cumsum()[::-1]
-    eddington[f"{columnName}_div"] = eddington[columnName] // divisor
+    eddington[f"{column_name}_div"] = eddington[column_name] // divisor
     en = (
-        eddington.loc[eddington["total"] >= eddington[f"{columnName}_div"]][
-            "total"
+        eddington.loc[eddington["total"] >= eddington[f"{column_name}_div"]][
+            f"{column_name}_div"
         ].iloc[-1]
         * divisor
     )
-    eddington["missing"] = eddington[f"{columnName}_div"] - eddington["total"]
+    eddington["missing"] = eddington[f"{column_name}_div"] - eddington["total"]
 
     return en, eddington
 

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/blueprints/entry_views.py

@@ -31,9 +31,11 @@ def register_entry_views(
             context["distance_last_30_days_plot"] = _last_30_days_meta_plot(
                 repository.meta, kind_scale, column_distance
             )
-            context["elevation_gain_last_30_days_plot"] = _last_30_days_meta_plot(
-                repository.meta, kind_scale, column_elevation_gain
-            )
+
+            if config.reliable_elevation_measurements:
+                context["elevation_gain_last_30_days_plot"] = _last_30_days_meta_plot(
+                    repository.meta, kind_scale, column_elevation_gain
+                )
 
             context["latest_activities"] = collections.defaultdict(list)
             for activity in DB.session.scalars(

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/blueprints/equipment_blueprint.py

@@ -21,7 +21,7 @@ def make_equipment_blueprint(
         )
 
         # Prepare data for the stacked area chart
-        activities = repository.meta
+        activities = repository.meta.dropna(subset=["start"])
         activities["month"] = (
             activities["start"].dt.to_period("M").apply(lambda r: r.start_time)
         )

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/blueprints/settings_blueprint.py

@@ -277,7 +277,7 @@ def make_settings_blueprint(
         if request.method == "POST":
             zone_names = request.form.getlist("zone_name")
             zone_geojsons = request.form.getlist("zone_geojson")
-            strava_login_helper.save_privacy_zones(zone_names, zone_geojsons)
+            save_privacy_zones(zone_names, zone_geojsons, config_accessor)
 
             assert len(zone_names) == len(zone_geojsons)
             new_zone_config = {}
@@ -411,6 +411,7 @@ def make_settings_blueprint(
     @needs_authentication(authenticator)
     def strava_callback():
         code = request.args.get("code", type=str)
+        assert code
         strava_login_helper.save_strava_code(code)
         return redirect(url_for(".strava"))
 
@@ -495,3 +496,65 @@ class StravaLoginHelper:
         self._config_accessor().strava_client_code = code
         self._config_accessor.save()
         flash("Connected to Strava API", category="success")
+
+
+def save_privacy_zones(
+    zone_names: list[str], zone_geojsons: list[str], config_accessor: ConfigAccessor
+) -> None:
+    assert len(zone_names) == len(zone_geojsons)
+    new_zone_config = {}
+
+    for zone_name, zone_geojson_str in zip(zone_names, zone_geojsons):
+        if not zone_name or not zone_geojson_str:
+            continue
+
+        try:
+            zone_geojson = json.loads(zone_geojson_str)
+        except json.decoder.JSONDecodeError as e:
+            flash(
+                f"Could not parse GeoJSON for {zone_name} due to the following error: {e}"
+            )
+            continue
+
+        if not zone_geojson["type"] == "FeatureCollection":
+            flash(
+                f"Pasted GeoJSON for {zone_name} must be of type 'FeatureCollection'.",
+                category="danger",
+            )
+            continue
+
+        features = zone_geojson["features"]
+
+        if not len(features) == 1:
+            flash(
+                f"Pasted GeoJSON for {zone_name} must contain exactly one feature. You cannot have multiple shapes for one privacy zone",
+                category="danger",
+            )
+            continue
+
+        feature = features[0]
+        geometry = feature["geometry"]
+
+        if not geometry["type"] == "Polygon":
+            flash(
+                f"Geometry for {zone_name} is not a polygon. You need to create a polygon (or circle or rectangle).",
+                category="danger",
+            )
+            continue
+
+        coordinates = geometry["coordinates"]
+
+        if not len(coordinates) == 1:
+            flash(
+                f"Polygon for {zone_name} consists of multiple polygons. Please supply a simple one.",
+                category="danger",
+            )
+            continue
+
+        points = coordinates[0]
+
+        new_zone_config[zone_name] = points
+
+    config_accessor().privacy_zones = new_zone_config
+    config_accessor.save()
+    flash("Updated privacy zones.", category="success")

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/blueprints/upload_blueprint.py

@@ -11,6 +11,7 @@ from flask import url_for
 
 from ...core.activities import ActivityRepository
 from ...core.config import Config
+from ...core.datamodel import Activity
 from ...core.datamodel import DB
 from ...core.datamodel import Kind
 from ...core.enrichment import populate_database_from_extracted
@@ -78,9 +79,12 @@ def make_upload_blueprint(
                 config,
                 skip_strava=True,
             )
-            activity_id = get_file_hash(target_path)
-            flash(f"Activity was saved with ID {activity_id}.", "success")
-            return redirect(f"/activity/{activity_id}")
+            latest_activity = DB.session.scalar(
+                sqlalchemy.select(Activity).order_by(Activity.id.desc()).limit(1)
+            )
+            assert latest_activity is not None
+            flash(f"Activity was saved with ID {latest_activity.id}.", "success")
+            return redirect(f"/activity/{latest_activity.id}")
 
     @blueprint.route("/refresh")
     @needs_authentication(authenticator)

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/templates/home.html.j2

@@ -9,7 +9,9 @@
     <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 %}
     </div>
 </div>
 

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/geo_activity_playground/webui/templates/summary/index.html.j2

@@ -103,10 +103,12 @@
 
 <div class="tab-content mb-3" id="myTabContent">
     {% for year, plot in plot_distance_heatmaps.items() %}
+    {% if year %}
     <div class="tab-pane fade {% if loop.last %} show active {% endif %}" id="heatmap-{{ year }}-pane" role="tabpanel"
         aria-labelledby="heatmap-{{ year }}" tabindex="0">
         {{ vega_direct("plot_distance_heatmap_%d"|format(year), plot) }}
     </div>
+    {% endif %}
     {% endfor %}
 </div>
 

{geo_activity_playground-0.44.0 → geo_activity_playground-0.45.0}/pyproject.toml

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