geo-activity-playground 0.39.0__py3-none-any.whl → 0.39.1__py3-none-any.whl

geo_activity_playground/core/activities.py

@@ -91,6 +91,9 @@ class ActivityRepository:
         df["hours"] = [
             elapsed_time.total_seconds() / 3600 for elapsed_time in df["elapsed_time"]
         ]
+        df["hours_moving"] = [
+            moving_time.total_seconds() / 3600 for moving_time in df["moving_time"]
+        ]
         df.index = df["id"]
         return df
 

geo_activity_playground/core/datamodel.py

@@ -234,7 +234,7 @@ def get_or_make_kind(name: str, config: Config) -> Kind:
     else:
         kind = Kind(
             name=name,
-            consider_for_achievements=config.kinds_without_achievements.get(name, True),
+            consider_for_achievements=name in config.kinds_without_achievements,
         )
         DB.session.add(kind)
         return kind

geo_activity_playground/core/parametric_plot.py

@@ -0,0 +1,101 @@
+import dataclasses
+from typing import Optional
+
+import altair as alt
+import pandas as pd
+
+
+@dataclasses.dataclass
+class ParametricPlotSpec:
+    mark: str
+    x: str
+    y: str
+    color: Optional[str]
+    shape: Optional[str]
+    size: Optional[str]
+    row: Optional[str]
+    column: Optional[str]
+
+
+MARKS = {"point": "Point", "circle": "Circle", "area": "Area", "bar": "Bar"}
+CONTINUOUS_VARIABLES = {
+    "distance_km": "Distance / km",
+    "sum(distance_km)": "Total distance / km",
+    "mean(distance_km)": "Average distance / km",
+    "start": "Date",
+    "hours": "Elapsed time / h",
+    "hours_moving": "Moving time / h",
+    "start_latitude": "Start latitude / °",
+    "start_longitude": "Start longitude / °",
+    "end_latitude": "End latitude / °",
+    "end_longitude": "End longitude / °",
+    "start_elevation": "Start elevation / m",
+    "end_elevation": "End elevation / m",
+    "elevation_gain": "Elevation gain / m",
+    "sum(elevation_gain)": "Total elevation gain / m",
+    "mean(elevation_gain)": "Average elevation gain / m",
+    "calories": "Energy / kcal",
+    "steps": "Steps",
+    "num_new_tiles_14": "New tiles 14",
+    "num_new_tiles_14": "New tiles 17",
+    "average_speed_moving_kmh": "Average moving speed / km/h",
+    "average_speed_elapsed_kmh": "Average elapsed speed / km/h",
+}
+DISCRETE_VARIABLES = {
+    "": "",
+    "year(start)": "Year",
+    "yearquarter(start)": "Year, Quarter",
+    "yearquartermonth(start)": "Year, Quarter, Month",
+    "yearmonth(start)": "Year, Month",
+    "quarter(start)": "Quarter",
+    "quartermonth(start)": "Quarter, Month",
+    "month(start)": "Month",
+    "date(start)": "Day of month",
+    "weekday(start)": "Day of week",
+    "iso_year": "ISO Year",
+    "week": "ISO Week",
+    "equipment": "Equipment",
+    "kind": "Activity kind",
+    "consider_for_achievements": "Consider for achievements",
+}
+ALL_VARIABLES = {**DISCRETE_VARIABLES, **CONTINUOUS_VARIABLES}
+
+
+def make_parametric_plot(df: pd.DataFrame, spec: ParametricPlotSpec) -> str:
+    chart = alt.Chart(df)
+
+    match spec.mark:
+        case "point":
+            chart = chart.mark_point()
+        case "circle":
+            chart = chart.mark_circle()
+        case "area":
+            chart = chart.mark_area()
+        case "bar":
+            chart = chart.mark_bar()
+
+    encodings = [
+        alt.X(spec.x, title=ALL_VARIABLES[spec.x]),
+        alt.Y(spec.y, title=ALL_VARIABLES[spec.y]),
+    ]
+    tooltips = [
+        alt.Tooltip(spec.x, title=ALL_VARIABLES[spec.x]),
+        alt.Tooltip(spec.y, title=ALL_VARIABLES[spec.y]),
+    ]
+    if spec.color:
+        encodings.append(alt.Color(spec.color, title=ALL_VARIABLES[spec.color]))
+        tooltips.append(alt.Tooltip(spec.color, title=ALL_VARIABLES[spec.color]))
+    if spec.shape:
+        encodings.append(alt.Shape(spec.shape, title=ALL_VARIABLES[spec.shape]))
+        tooltips.append(alt.Tooltip(spec.shape, title=ALL_VARIABLES[spec.shape]))
+    if spec.size:
+        encodings.append(alt.Size(spec.size, title=ALL_VARIABLES[spec.size]))
+        tooltips.append(alt.Tooltip(spec.size, title=ALL_VARIABLES[spec.size]))
+    if spec.row:
+        encodings.append(alt.Row(spec.row, title=ALL_VARIABLES[spec.row]))
+        tooltips.append(alt.Tooltip(spec.row, title=ALL_VARIABLES[spec.row]))
+    if spec.column:
+        encodings.append(alt.Column(spec.column, title=ALL_VARIABLES[spec.column]))
+        tooltips.append(alt.Tooltip(spec.column, title=ALL_VARIABLES[spec.column]))
+
+    return chart.encode(*encodings).interactive().to_json(format="vega")

geo_activity_playground/webui/app.py

@@ -32,6 +32,7 @@ from .blueprints.entry_views import register_entry_views
 from .blueprints.equipment_blueprint import make_equipment_blueprint
 from .blueprints.explorer_blueprint import make_explorer_blueprint
 from .blueprints.heatmap_blueprint import make_heatmap_blueprint
+from .blueprints.plot_builder_blueprint import make_plot_builder_blueprint
 from .blueprints.search_blueprint import make_search_blueprint
 from .blueprints.settings_blueprint import make_settings_blueprint
 from .blueprints.square_planner_blueprint import make_square_planner_blueprint
@@ -137,6 +138,7 @@ def web_ui_main(
         "/heatmap": make_heatmap_blueprint(
             repository, tile_visit_accessor, config_accessor(), search_query_history
         ),
+        "/plot-builder": make_plot_builder_blueprint(repository),
         "/settings": make_settings_blueprint(config_accessor, authenticator, flasher),
         "/square-planner": make_square_planner_blueprint(tile_visit_accessor),
         "/search": make_search_blueprint(

geo_activity_playground/webui/blueprints/plot_builder_blueprint.py

@@ -0,0 +1,43 @@
+from flask import Blueprint
+from flask import render_template
+from flask import request
+from flask import Response
+
+from ...core.activities import ActivityRepository
+from ...core.parametric_plot import ALL_VARIABLES
+from ...core.parametric_plot import CONTINUOUS_VARIABLES
+from ...core.parametric_plot import DISCRETE_VARIABLES
+from ...core.parametric_plot import make_parametric_plot
+from ...core.parametric_plot import MARKS
+from ...core.parametric_plot import ParametricPlotSpec
+
+
+def make_plot_builder_blueprint(repository: ActivityRepository) -> Blueprint:
+    blueprint = Blueprint("plot_builder", __name__, template_folder="templates")
+
+    @blueprint.route("/")
+    def index() -> Response:
+        context = {}
+        if request.args:
+            spec = ParametricPlotSpec(
+                mark=request.args["mark"],
+                x=request.args["x"],
+                y=request.args["y"],
+                color=request.args.get("color", None),
+                shape=request.args.get("shape", None),
+                size=request.args.get("size", None),
+                row=request.args.get("row", None),
+                column=request.args.get("column", None),
+            )
+            plot = make_parametric_plot(repository.meta, spec)
+            context["plot"] = plot
+        return render_template(
+            "plot_builder/index.html.j2",
+            marks=MARKS,
+            continuous=ALL_VARIABLES,
+            discrete=DISCRETE_VARIABLES,
+            **context,
+            **request.args
+        )
+
+    return blueprint

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

@@ -0,0 +1,44 @@
+{% extends "page.html.j2" %}
+{% from "search_form.html.j2" import search_form %}
+
+{% block container %}
+
+<h1 class="row mb-3">Plot Builder</h1>
+
+
+<div class="row">
+    <div class="col-md-4">
+        {% macro select_field(label, name, choices, active) %}
+        <div class="mb-3">
+            <label for="{{ name }}">{{ label }}</label>
+            <select name="{{ name }}" class="form-select">
+                {% for choice_value, choice_label in choices.items() %}
+                <option id="{{ name }}" value="{{ choice_value }}" {% if active==choice_value %} selected {% endif %}>
+                    {{ choice_label }}
+                </option>
+                {% endfor %}
+            </select>
+        </div>
+        {% endmacro %}
+
+        <form>
+            {{ select_field("Mark", "mark", marks, mark)}}
+
+            {{ select_field("X", "x", continuous, x)}}
+            {{ select_field("Y", "y", continuous, y)}}
+            {{ select_field("Color", "color", continuous, color)}}
+            {{ select_field("Size", "size", continuous, size)}}
+            {{ select_field("Shape", "shape", discrete, shape)}}
+            {{ select_field("Row", "row", discrete, row)}}
+            {{ select_field("Column", "column", discrete, column)}}
+
+            <button type="submit" class="btn btn-primary">Submit</button>
+        </form>
+    </div>
+    <div class="col-md-8">
+        {% if plot %}
+        {{ vega_direct("plot", plot) }}
+        {% endif %}
+    </div>
+</div>
+{% endblock %}

{geo_activity_playground-0.39.0.dist-info → geo_activity_playground-0.39.1.dist-info}/METADATA

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

{geo_activity_playground-0.39.0.dist-info → geo_activity_playground-0.39.1.dist-info}/RECORD

@@ -8,13 +8,14 @@ geo_activity_playground/alembic/versions/ab83b9d23127_add_upstream_id.py,sha256=
 geo_activity_playground/alembic/versions/b03491c593f6_add_crop_indices.py,sha256=1pt7aes0PWJXZ98HxqeDK-ehaU9KLApjCmZYoqCa8V0,975
 geo_activity_playground/alembic/versions/e02e27876deb_add_square_planner_bookmark_name.py,sha256=Y0OMxp5z_-CQ83rww6GEBFRawXu0J0pLrLArgSjJ7wQ,866
 geo_activity_playground/alembic/versions/script.py.mako,sha256=3qBrHBf7F7ChKDUIdiNItiSXrDpgQdM7sR0YKzpaC50,689
-geo_activity_playground/core/activities.py,sha256=7Z8xiT0juLdo1nQ3fPqWKtSp6MjRkSzd-_FYrzb-Tpg,5360
+geo_activity_playground/core/activities.py,sha256=R3RDvOkHyWL2Wr-Bgqjgr5wDjVqaJ3WSECL2fbMyiu8,5485
 geo_activity_playground/core/config.py,sha256=eGWWbNfHa6H64AHCnFYTsAJ7-pWi-PhyxL4hjZ4u03U,5256
 geo_activity_playground/core/coordinates.py,sha256=tDfr9mlXhK6E_MMIJ0vYWVCoH0Lq8uyuaqUgaa8i0jg,966
-geo_activity_playground/core/datamodel.py,sha256=cbVNvvHLYHYBg-Gaabm3bewfro8uQ4Sqdq_0mujcos0,8693
+geo_activity_playground/core/datamodel.py,sha256=EeMcwZ2xbqQRwo6R7lOJwbc9iIXnpgg2E4eBdsAbk24,8685
 geo_activity_playground/core/enrichment.py,sha256=LWAKF6mAKtiZcIF8ptAgpt8fYTYZAnSuXGHuX5TTO6o,7220
 geo_activity_playground/core/heart_rate.py,sha256=-S3WAhS7AOywrw_Lk5jfuo_fu6zvZQ1VtjwEKSycWpU,1542
 geo_activity_playground/core/meta_search.py,sha256=naErjAC7ZCFhOF6d492kbegZxCdzbpGcJvjQLJTE4xE,5016
+geo_activity_playground/core/parametric_plot.py,sha256=JdG2HvQHn5mMY1pfcebdgajzpp0CD7KvaHyeaJodDsE,3538
 geo_activity_playground/core/paths.py,sha256=aUXGuNn9hBvGPQWPoUJeImHN0PB0fS1tja1tm2eq8mA,2595
 geo_activity_playground/core/privacy_zones.py,sha256=4TumHsVUN1uW6RG3ArqTXDykPVipF98DCxVBe7YNdO8,512
 geo_activity_playground/core/raster_map.py,sha256=Cq8dNLdxVQg3Agzn2bmXVu0-8kZf56QrSe-LKNn3jaU,7994
@@ -39,7 +40,7 @@ geo_activity_playground/importers/strava_checkout.py,sha256=EixNFXXnxkopqUs0qe6i
 geo_activity_playground/importers/test_csv_parser.py,sha256=nOTVTdlzIY0TDcbWp7xNyNaIO6Mkeu55hVziVl22QE4,1092
 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/app.py,sha256=K-xZsNjorxPhVl9_z-W1MX0_s3gTjZ8XU7P56SFhwDk,6872
+geo_activity_playground/webui/app.py,sha256=h1AULky6kMxxmi54h3aTaE8rtJjOeRoCXIYI4gFNicU,7013
 geo_activity_playground/webui/authenticator.py,sha256=jtQqvpVHa_eLTAulmvvJgDRoCWOEege49G9zn3MfYk8,1394
 geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=ERYcUqvaG-hQqOr6uKEIZzGk1WelNKDHwvecsfu2c3c,24328
 geo_activity_playground/webui/blueprints/auth_blueprint.py,sha256=_VZeP3VN626BoOOZUkNVnuw9v-cEOrkHz5lhFPmxqMY,784
@@ -50,6 +51,7 @@ geo_activity_playground/webui/blueprints/entry_views.py,sha256=-CRrE5b9QYyrmQhLY
 geo_activity_playground/webui/blueprints/equipment_blueprint.py,sha256=juQ5L2BlrECb00LBbiY2yc0b8W_B9Y3fPwtbiaRfgpo,5634
 geo_activity_playground/webui/blueprints/explorer_blueprint.py,sha256=ZNDRwtmYvWGyqDe3fszGp0DR5qzRRxRss32ZGPRuXsY,12469
 geo_activity_playground/webui/blueprints/heatmap_blueprint.py,sha256=iHI5YJYhX7ZOlzTgzl2efIRDzt3UMYCx7X4-LVd0MWk,8702
+geo_activity_playground/webui/blueprints/plot_builder_blueprint.py,sha256=EWLsNNIAl7eK73WVIi5Tneqjg0QVUZXoM1lScldr4ck,1544
 geo_activity_playground/webui/blueprints/search_blueprint.py,sha256=Sv_KL1Cdai26y51qVfI-5jZLhtElREsEar1dbR_VAC4,2275
 geo_activity_playground/webui/blueprints/settings_blueprint.py,sha256=UUv63BDQFnBPq8fLDdlWHd5mxL5qIgcGUuqQRFemyEA,16108
 geo_activity_playground/webui/blueprints/square_planner_blueprint.py,sha256=xVaxJxmt8Dysl3UL9f2y__LVLtTH2Np1Ust4OSXKRAk,4746
@@ -109,6 +111,7 @@ geo_activity_playground/webui/templates/explorer/index.html.j2,sha256=3t9ikAF6oM
 geo_activity_playground/webui/templates/heatmap/index.html.j2,sha256=kTVvEt-GmSNebDlVMa6zwyIuP0mJcZQFuqj-IY8JV5U,1359
 geo_activity_playground/webui/templates/home.html.j2,sha256=vQp9uMn7BLY7pexWJVpQVWN8ZbbtWZvkW_hYSkYQeZs,2212
 geo_activity_playground/webui/templates/page.html.j2,sha256=TSNEZNLFzJ76G_22dDIXoTozfdWjmKk03qZl6exsdCQ,11043
+geo_activity_playground/webui/templates/plot_builder/index.html.j2,sha256=JQvXHVnPqA6Vlp2HfOt8_LhzvJ_eH5xTxe8-51sMkQk,1493
 geo_activity_playground/webui/templates/search/index.html.j2,sha256=_kxTgsdbT8o-4ryW0pvyWE7a-rOs7xzGUpdSPp8Q1is,1320
 geo_activity_playground/webui/templates/search_form.html.j2,sha256=TG9xIql0HnhsXtbHZxl3GLBt6cGYjA8jPeBq11syQ3A,6512
 geo_activity_playground/webui/templates/settings/admin-password.html.j2,sha256=VYwddpObD1RpeTH5Dm4y7VtmT7kwURDCIjxyzJeq08c,495
@@ -126,8 +129,8 @@ geo_activity_playground/webui/templates/square_planner/index.html.j2,sha256=-OnY
 geo_activity_playground/webui/templates/summary/index.html.j2,sha256=bM89LdumssVvmuI0EeI8mnzMYxSzNjWY_XWfzn-f6nI,5377
 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.39.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.39.0.dist-info/METADATA,sha256=jughq9g1K5BCZKW7diQ6A8p9Lmp1CJk3vlQhDUcYmc0,1758
-geo_activity_playground-0.39.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-geo_activity_playground-0.39.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.39.0.dist-info/RECORD,,
+geo_activity_playground-0.39.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.39.1.dist-info/METADATA,sha256=ez-3_BF1sUiuV-TSZ7pO0yIjHw6u0BBxJtVQ8aITGn4,1758
+geo_activity_playground-0.39.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+geo_activity_playground-0.39.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.39.1.dist-info/RECORD,,