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

geo_activity_playground/alembic/versions/93cc82ad1b60_add_parametricplotspec.py

@@ -0,0 +1,39 @@
+from typing import Sequence
+from typing import Union
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision: str = "93cc82ad1b60"
+down_revision: Union[str, None] = "e02e27876deb"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "plot_specs",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("mark", sa.String(), nullable=True),
+        sa.Column("x", sa.String(), nullable=True),
+        sa.Column("y", sa.String(), nullable=True),
+        sa.Column("color", sa.String(), nullable=True),
+        sa.Column("shape", sa.String(), nullable=True),
+        sa.Column("size", sa.String(), nullable=True),
+        sa.Column("row", sa.String(), nullable=True),
+        sa.Column("opacity", sa.String(), nullable=True),
+        sa.Column("column", sa.String(), nullable=True),
+        sa.Column("facet", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("plot_specs")
+    # ### end Alembic commands ###

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

@@ -1,6 +1,8 @@
 import datetime
+import json
 import logging
 from typing import Any
+from typing import Optional
 from typing import TypedDict
 
 import numpy as np
@@ -109,21 +111,25 @@ class Activity(DB.Model):
         return f"{self.start} {self.name}"
 
     @property
-    def average_speed_moving_kmh(self) -> float:
-        return self.distance_km / (self.moving_time.total_seconds() / 3_600)
+    def average_speed_moving_kmh(self) -> Optional[float]:
+        if self.moving_time is not None:
+            return self.distance_km / (self.moving_time.total_seconds() / 3_600)
 
     @property
-    def average_speed_elapsed_kmh(self) -> float:
-        return self.distance_km / (self.elapsed_time.total_seconds() / 3_600)
+    def average_speed_elapsed_kmh(self) -> Optional[float]:
+        if self.elapsed_time is not None:
+            return self.distance_km / (self.elapsed_time.total_seconds() / 3_600)
 
     @property
     def raw_time_series(self) -> pd.DataFrame:
         path = time_series_dir() / f"{self.id}.parquet"
         try:
-            return pd.read_parquet(path)
+            time_series = pd.read_parquet(path)
+            if "altitude" in time_series.columns:
+                time_series.rename(columns={"altitude": "elevation"}, inplace=True)
+            return time_series
         except OSError as e:
-            logger.error(f"Error while reading {path}, deleting cache file …")
-            path.unlink(missing_ok=True)
+            logger.error(f"Error while reading {path}.")
             raise
 
     @property
@@ -234,7 +240,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
@@ -255,3 +261,44 @@ def get_or_make_equipment(name: str, config: Config) -> Equipment:
         )
         DB.session.add(equipment)
         return equipment
+
+
+class PlotSpec(DB.Model):
+    __tablename__ = "plot_specs"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+
+    name: Mapped[str] = mapped_column(sa.String, nullable=False)
+
+    mark: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    x: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    y: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    color: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    shape: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    size: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    row: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    opacity: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    column: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+    facet: Mapped[str] = mapped_column(sa.String, nullable=False, default="")
+
+    FIELDS = [
+        "name",
+        "mark",
+        "x",
+        "y",
+        "color",
+        "shape",
+        "size",
+        "row",
+        "opacity",
+        "column",
+        "facet",
+    ]
+
+    def __str__(self) -> str:
+        return self.name
+
+    def to_json(self) -> str:
+        return json.dumps(
+            {key: getattr(self, key) for key in self.FIELDS if getattr(self, key)}
+        )

geo_activity_playground/core/enrichment.py

@@ -192,10 +192,12 @@ def _embellish_single_time_series(
         timeseries["y"] = y
 
     if "altitude" in timeseries.columns:
-        altitude_diff = timeseries["altitude"].diff()
-        altitude_diff = altitude_diff.ewm(span=5, min_periods=5).mean()
-        altitude_diff.loc[altitude_diff.abs() > 30] = 0
-        altitude_diff.loc[altitude_diff < 0] = 0
-        timeseries["elevation_gain_cum"] = altitude_diff.cumsum()
+        timeseries.rename(columns={"altitude": "elevation"}, inplace=True)
+    if "elevation" in timeseries.columns:
+        elevation_diff = timeseries["elevation"].diff()
+        elevation_diff = elevation_diff.ewm(span=5, min_periods=5).mean()
+        elevation_diff.loc[elevation_diff.abs() > 30] = 0
+        elevation_diff.loc[elevation_diff < 0] = 0
+        timeseries["elevation_gain_cum"] = elevation_diff.cumsum()
 
     return timeseries

geo_activity_playground/core/parametric_plot.py

@@ -0,0 +1,108 @@
+import altair as alt
+import pandas as pd
+
+from .datamodel import PlotSpec
+
+
+MARKS = {
+    "point": "Point",
+    "circle": "Circle",
+    "area": "Area",
+    "bar": "Bar",
+    "rect": "Rectangle",
+}
+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",
+    "calories": "Energy / kcal",
+    "steps": "Steps",
+    "elevation_gain": "Elevation gain / m",
+    "start_elevation": "Start elevation / m",
+    "end_elevation": "End elevation / m",
+    "sum(elevation_gain)": "Total elevation gain / m",
+    "mean(elevation_gain)": "Average elevation gain / m",
+    "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",
+    "start_latitude": "Start latitude / °",
+    "start_longitude": "Start longitude / °",
+    "end_latitude": "End latitude / °",
+    "end_longitude": "End longitude / °",
+}
+DISCRETE_VARIABLES = {
+    "equipment": "Equipment",
+    "kind": "Activity kind",
+    "consider_for_achievements": "Consider for achievements",
+    "year(start):O": "Year",
+    "iso_year:O": "ISO Year",
+    "yearquarter(start)": "Year, Quarter",
+    "yearquartermonth(start)": "Year, Quarter, Month",
+    "yearmonth(start)": "Year, Month",
+    "quarter(start)": "Quarter",
+    "quartermonth(start)": "Quarter, Month",
+    "month(start)": "Month",
+    "week:O": "ISO Week",
+    "date(start)": "Day of month",
+    "weekday(start)": "Day of week",
+}
+
+VARIABLES_1 = {"": "", **DISCRETE_VARIABLES}
+VARIABLES_2 = {"": "", **DISCRETE_VARIABLES, **CONTINUOUS_VARIABLES}
+
+
+def make_parametric_plot(df: pd.DataFrame, spec: PlotSpec) -> 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()
+        case "rect":
+            chart = chart.mark_rect()
+        case _:
+            raise ValueError()
+
+    encodings = [
+        alt.X(spec.x, title=VARIABLES_2[spec.x]),
+        alt.Y(spec.y, title=VARIABLES_2[spec.y]),
+    ]
+    tooltips = [
+        alt.Tooltip(spec.x, title=VARIABLES_2[spec.x]),
+        alt.Tooltip(spec.y, title=VARIABLES_2[spec.y]),
+    ]
+
+    if spec.color:
+        encodings.append(alt.Color(spec.color, title=VARIABLES_2[spec.color]))
+        tooltips.append(alt.Tooltip(spec.color, title=VARIABLES_2[spec.color]))
+    if spec.shape:
+        encodings.append(alt.Shape(spec.shape, title=VARIABLES_2[spec.shape]))
+        tooltips.append(alt.Tooltip(spec.shape, title=VARIABLES_2[spec.shape]))
+    if spec.size:
+        encodings.append(alt.Size(spec.size, title=VARIABLES_2[spec.size]))
+        tooltips.append(alt.Tooltip(spec.size, title=VARIABLES_2[spec.size]))
+    if spec.opacity:
+        encodings.append(alt.Size(spec.opacity, title=VARIABLES_2[spec.opacity]))
+        tooltips.append(alt.Opacity(spec.opacity, title=VARIABLES_2[spec.opacity]))
+    if spec.row:
+        encodings.append(alt.Row(spec.row, title=VARIABLES_2[spec.row]))
+        tooltips.append(alt.Tooltip(spec.row, title=VARIABLES_2[spec.row]))
+    if spec.column:
+        encodings.append(alt.Column(spec.column, title=VARIABLES_2[spec.column]))
+        tooltips.append(alt.Tooltip(spec.column, title=VARIABLES_2[spec.column]))
+    if spec.facet:
+        encodings.append(
+            alt.Facet(spec.facet, columns=3, title=VARIABLES_2[spec.facet])
+        )
+        tooltips.append(alt.Tooltip(spec.facet, title=VARIABLES_2[spec.facet]))
+
+    return chart.encode(*encodings, tooltips).interactive().to_json(format="vega")

geo_activity_playground/core/test_datamodel.py

@@ -0,0 +1,7 @@
+from .datamodel import Activity
+
+
+def test_zero_duration() -> None:
+    activity = Activity(name="Test", distance_km=10.0)
+    assert activity.average_speed_elapsed_kmh is None
+    assert activity.average_speed_moving_kmh is None

geo_activity_playground/importers/activity_parsers.py

@@ -121,9 +121,9 @@ def read_fit_activity(path: pathlib.Path, open) -> tuple[ActivityMeta, pd.DataFr
                         if "distance" in fields:
                             row["distance"] = values["distance"]
                         if "altitude" in fields:
-                            row["altitude"] = values["altitude"]
+                            row["elevation"] = values["altitude"]
                         if "enhanced_altitude" in fields:
-                            row["altitude"] = values["enhanced_altitude"]
+                            row["elevation"] = values["enhanced_altitude"]
                         if "speed" in fields:
                             factor = _fit_speed_unit_factor(fields["speed"].units)
                             row["speed"] = values["speed"] * factor
@@ -188,10 +188,10 @@ def read_gpx_activity(path: pathlib.Path, open) -> pd.DataFrame:
                 time = convert_to_datetime_ns(time)
                 points.append((time, point.latitude, point.longitude, point.elevation))
 
-    df = pd.DataFrame(points, columns=["time", "latitude", "longitude", "altitude"])
-    # Some files don't have altitude information. In these cases we remove the column.
-    if not df["altitude"].any():
-        del df["altitude"]
+    df = pd.DataFrame(points, columns=["time", "latitude", "longitude", "elevation"])
+    # Some files don't have elevation information. In these cases we remove the column.
+    if not df["elevation"].any():
+        del df["elevation"]
     return df
 
 
@@ -230,7 +230,7 @@ def read_tcx_activity(path: pathlib.Path, opener) -> pd.DataFrame:
                 "longitude": trackpoint.longitude,
             }
             if trackpoint.elevation:
-                row["altitude"] = trackpoint.elevation
+                row["elevation"] = trackpoint.elevation
             if trackpoint.hr_value:
                 row["heartrate"] = trackpoint.hr_value
             if trackpoint.cadence:
@@ -256,16 +256,16 @@ def read_kml_activity(path: pathlib.Path, opener) -> pd.DataFrame:
                     parts = where.split(" ")
                     if len(parts) == 2:
                         lon, lat = parts
-                        alt = None
+                        elevation = None
                     if len(parts) == 3:
-                        lon, lat, alt = parts
+                        lon, lat, elevation = parts
                     row = {
                         "time": time,
                         "latitude": float(lat),
                         "longitude": float(lon),
                     }
-                    if alt is not None:
-                        row["altitude"] = float(alt)
+                    if elevation is not None:
+                        row["elevation"] = float(elevation)
                     rows.append(row)
     return pd.DataFrame(rows)
 

geo_activity_playground/importers/strava_checkout.py

@@ -258,6 +258,13 @@ def convert_strava_checkout(
     activities = pd.read_csv(checkout_path / "activities.csv")
     print(activities)
 
+    # Handle German localization.
+    if activities.columns[0] == "Aktivitäts-ID":
+        assert len(activities.columns) == len(
+            EXPECTED_COLUMNS
+        ), "Strava seems to have changed for format again. Please file a bug report at https://github.com/martin-ueding/geo-activity-playground/issues and include the first line of the 'activities.csv'."
+        activities.columns = EXPECTED_COLUMNS
+
     for _, row in tqdm(activities.iterrows(), desc="Import activity files"):
         # Some people have manually added activities without position data. These don't have a file there. We'll skip these.
         if not isinstance(row["Filename"], str):

geo_activity_playground/webui/app.py

@@ -1,6 +1,7 @@
 import datetime
 import importlib
 import json
+import logging
 import os
 import pathlib
 import secrets
@@ -32,6 +33,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
@@ -43,6 +45,9 @@ from .flasher import FlaskFlasher
 from .search_util import SearchQueryHistory
 
 
+logger = logging.getLogger(__name__)
+
+
 def get_secret_key():
     secret_file = pathlib.Path("Cache/flask-secret.json")
     if secret_file.exists():
@@ -65,9 +70,9 @@ def web_ui_main(
 
     app = Flask(__name__)
 
-    app.config["SQLALCHEMY_DATABASE_URI"] = (
-        f"sqlite:///{basedir.absolute()}/database.sqlite"
-    )
+    database_path = basedir / "database.sqlite"
+    logger.info(f"Using database file at '{database_path.absolute()}'.")
+    app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{database_path.absolute()}"
     app.config["ALEMBIC"] = {"script_location": "../alembic/versions"}
     DB.init_app(app)
 
@@ -137,6 +142,9 @@ def web_ui_main(
         "/heatmap": make_heatmap_blueprint(
             repository, tile_visit_accessor, config_accessor(), search_query_history
         ),
+        "/plot-builder": make_plot_builder_blueprint(
+            repository, flasher, authenticator
+        ),
         "/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/activity_blueprint.py

@@ -148,8 +148,8 @@ def make_activity_blueprint(
             )
         ) is not None:
             context["heart_zones_plot"] = heart_rate_zone_plot(heart_zones)
-        if "altitude" in time_series.columns:
-            context["altitude_time_plot"] = altitude_time_plot(time_series)
+        if "elevation" in time_series.columns:
+            context["elevation_time_plot"] = elevation_time_plot(time_series)
         if "elevation_gain_cum" in time_series.columns:
             context["elevation_gain_cum_plot"] = elevation_gain_cum_plot(time_series)
         if "heartrate" in time_series.columns:
@@ -445,13 +445,13 @@ def distance_time_plot(time_series: pd.DataFrame) -> str:
     )
 
 
-def altitude_time_plot(time_series: pd.DataFrame) -> str:
+def elevation_time_plot(time_series: pd.DataFrame) -> str:
     return (
-        alt.Chart(time_series, title="Altitude")
+        alt.Chart(time_series, title="Elevation")
         .mark_line()
         .encode(
             alt.X("time", title="Time"),
-            alt.Y("altitude", scale=alt.Scale(zero=False), title="Altitude / m"),
+            alt.Y("elevation", scale=alt.Scale(zero=False), title="Elevation / m"),
             alt.Color("segment_id:N", title="Segment"),
         )
         .interactive(bind_y=False)
@@ -461,14 +461,14 @@ def altitude_time_plot(time_series: pd.DataFrame) -> str:
 
 def elevation_gain_cum_plot(time_series: pd.DataFrame) -> str:
     return (
-        alt.Chart(time_series, title="Altitude Gain")
+        alt.Chart(time_series, title="Elevation Gain")
         .mark_line()
         .encode(
             alt.X("time", title="Time"),
             alt.Y(
                 "elevation_gain_cum",
                 scale=alt.Scale(zero=False),
-                title="Altitude gain / m",
+                title="Elevation gain / m",
             ),
             alt.Color("segment_id:N", title="Segment"),
         )

geo_activity_playground/webui/blueprints/plot_builder_blueprint.py

@@ -0,0 +1,89 @@
+import sqlalchemy
+from flask import Blueprint
+from flask import redirect
+from flask import render_template
+from flask import request
+from flask import Response
+from flask import url_for
+
+from ...core.activities import ActivityRepository
+from ...core.datamodel import DB
+from ...core.parametric_plot import make_parametric_plot
+from ...core.parametric_plot import MARKS
+from ...core.parametric_plot import PlotSpec
+from ...core.parametric_plot import VARIABLES_1
+from ...core.parametric_plot import VARIABLES_2
+from ..authenticator import Authenticator
+from ..authenticator import needs_authentication
+from ..flasher import Flasher
+from ..flasher import FlashTypes
+
+
+def make_plot_builder_blueprint(
+    repository: ActivityRepository, flasher: Flasher, authenticator: Authenticator
+) -> Blueprint:
+    blueprint = Blueprint("plot_builder", __name__, template_folder="templates")
+
+    @blueprint.route("/")
+    def index() -> Response:
+        return render_template(
+            "plot_builder/index.html.j2",
+            specs=DB.session.scalars(sqlalchemy.select(PlotSpec)).all(),
+        )
+
+    @blueprint.route("/new")
+    @needs_authentication(authenticator)
+    def new() -> Response:
+        spec = PlotSpec(
+            name="My New Plot",
+            mark="bar",
+            x="year(start):O",
+            y="sum(distance_km)",
+            color="kind",
+        )
+        DB.session.add(spec)
+        DB.session.commit()
+        return redirect(url_for(".edit", id=spec.id))
+
+    @blueprint.route("/edit/<int:id>")
+    @needs_authentication(authenticator)
+    def edit(id: int) -> Response:
+        spec = DB.session.get(PlotSpec, id)
+        if request.args:
+            spec.name = request.args["name"]
+            spec.mark = request.args["mark"]
+            spec.x = request.args["x"]
+            spec.y = request.args["y"]
+            spec.color = request.args["color"]
+            spec.shape = request.args["shape"]
+            spec.size = request.args["size"]
+            spec.size = request.args["size"]
+            spec.row = request.args["row"]
+            spec.column = request.args["column"]
+            spec.facet = request.args["facet"]
+            spec.opacity = request.args["opacity"]
+        try:
+            plot = make_parametric_plot(repository.meta, spec)
+            DB.session.commit()
+        except ValueError as e:
+            plot = None
+            flasher.flash_message(str(e), FlashTypes.WARNING)
+        return render_template(
+            "plot_builder/edit.html.j2",
+            marks=MARKS,
+            discrete=VARIABLES_1,
+            continuous=VARIABLES_2,
+            plot=plot,
+            spec=spec,
+        )
+
+    @blueprint.route("/delete/<int:id>")
+    @needs_authentication(authenticator)
+    def delete(id: int) -> Response:
+        spec = DB.session.get(PlotSpec, id)
+        DB.session.delete(spec)
+        flasher.flash_message(f"Deleted plot '{spec.name}'.", FlashTypes.SUCCESS)
+        DB.session.commit()
+        return redirect(url_for(".index"))
+
+    return blueprint

geo_activity_playground/webui/blueprints/summary_blueprint.py

@@ -3,6 +3,7 @@ import datetime
 
 import altair as alt
 import pandas as pd
+import sqlalchemy
 from flask import Blueprint
 from flask import render_template
 from flask import request
@@ -10,7 +11,10 @@ from flask import request
 from ...core.activities import ActivityRepository
 from ...core.activities import make_geojson_from_time_series
 from ...core.config import Config
+from ...core.datamodel import DB
+from ...core.datamodel import PlotSpec
 from ...core.meta_search import apply_search_query
+from ...core.parametric_plot import make_parametric_plot
 from ..plot_util import make_kind_scale
 from ..search_util import search_query_from_form
 from ..search_util import SearchQueryHistory
@@ -62,6 +66,10 @@ def make_summary_blueprint(
                 for activity_id, reasons in nominations.items()
             ],
             query=query.to_jinja(),
+            custom_plots=[
+                (spec, make_parametric_plot(repository.meta, spec))
+                for spec in DB.session.scalars(sqlalchemy.select(PlotSpec)).all()
+            ],
         )
 
     return blueprint

geo_activity_playground/webui/templates/activity/show.html.j2

@@ -132,16 +132,16 @@
     </div>
 </div>
 
-{% if altitude_time_plot is defined %}
+{% if elevation_time_plot is defined %}
 <div class="row mb-3">
     <div class="col">
-        <h2>Altitude</h2>
+        <h2>Elevation</h2>
     </div>
 </div>
 
 <div class="row mb-3">
     <div class="col-md-4">
-        {{ vega_direct("altitude_time_plot", altitude_time_plot) }}
+        {{ vega_direct("elevation_time_plot", elevation_time_plot) }}
     </div>
     {% if elevation_gain_cum_plot is defined %}
     <div class="col-md-4">

geo_activity_playground/webui/templates/page.html.j2

@@ -130,6 +130,8 @@
                                     <hr class="dropdown-divider">
                                 </li>
 
+                                <li><a class="dropdown-item" href="{{ url_for('plot_builder.index') }}">Plot Builder</a>
+                                </li>
                                 <li><a class="dropdown-item" href="{{ url_for('settings.index') }}">Settings</a></li>
                             </ul>
                         </li>
@@ -196,7 +198,9 @@
 
         <div class="row border-top py-3 my-4">
             <ul class="nav col-4">
-                <li class="nav-item px-2 nav-link"><a href="https://github.com/martin-ueding/geo-activity-playground/blob/main/docs/changelog.md" class="nav-link px-2 text-muted" target="_blank">Version {{ version }}</a></li>
+                <li class="nav-item px-2 nav-link"><a
+                        href="https://github.com/martin-ueding/geo-activity-playground/blob/main/docs/changelog.md"
+                        class="nav-link px-2 text-muted" target="_blank">Version {{ version }}</a></li>
             </ul>
             <ul class="nav col-8 justify-content-end">
                 <li class="nav-item"><a href="https://github.com/martin-ueding/geo-activity-playground"

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

@@ -0,0 +1,63 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="row mb-3">Plot Builder</h1>
+
+<div class="mb-3"><a class="btn btn-primary" href="{{ url_for('.index') }}">Back to overview</a></div>
+
+
+<div class="row mb-3">
+    <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>
+            <div class="mb-3">
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" class="form-control" value="{{ spec.name }}">
+            </div>
+
+            {{ select_field("Mark", "mark", marks, spec.mark)}}
+
+            {{ select_field("X", "x", continuous, spec.x)}}
+            {{ select_field("Y", "y", continuous, spec.y)}}
+            {{ select_field("Color", "color", continuous, spec.color)}}
+            {{ select_field("Size", "size", continuous, spec.size)}}
+            {{ select_field("Shape", "shape", discrete, spec.shape)}}
+            {{ select_field("Opacity", "opacity", discrete, spec.opacity)}}
+            {{ select_field("Facet", "facet", discrete, spec.facet)}}
+            {{ select_field("Row", "row", discrete, spec.row)}}
+            {{ select_field("Column", "column", discrete, spec.column)}}
+
+            <button type="submit" class="btn btn-primary">Save & Preview</button>
+        </form>
+    </div>
+    <div class="col-md-8">
+        {% if plot %}
+        {{ vega_direct("plot", plot) }}
+        {% endif %}
+    </div>
+</div>
+
+
+<h1 class="mb-3">JSON Export</h1>
+
+<p>If you want to share this plot specification with somebody else, send them the following code snippet. It contains
+    the name that you have given your plot but no data from your activities.</p>
+
+<code><pre>{{ spec.to_json() }}</pre></code>
+
+
+
+{% endblock %}

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

@@ -0,0 +1,32 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+
+<h1 class="row mb-3">Plot Builder</h1>
+
+{% if specs %}
+<table class="table mb-3">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Actions</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for spec in specs %}
+        <tr>
+            <td>{{ spec.name }}</td>
+            <td>
+                <a class="btn btn-small btn-primary" href="{{ url_for('.edit', id=spec.id) }}">Edit</a>
+                <a class="btn btn-small btn-danger" href="{{ url_for('.delete', id=spec.id) }}"
+                    onclick="if(!confirm('Are you sure to Delete This?')){ event.preventDefault() }">Delete</a>
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endif %}
+
+<a class="btn btn-primary" href="{{ url_for('.new') }}">New</a>
+
+{% endblock %}

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

@@ -9,6 +9,18 @@
     {{ search_form(query, equipments_avail, kinds_avail, search_query_favorites, search_query_last, request_url) }}
 </div>
 
+{% if custom_plots %}
+<h2>Your custom plots</h2>
+{% for spec, plot in custom_plots %}
+<h3>{{ spec.name }}</h3>
+<div class="row mb-3">
+    <div class="col">
+        {{ vega_direct("custom_plot_" ~ loop.index, plot) }}
+    </div>
+</div>
+{% endfor %}
+{% endif %}
+
 <h2>Distances</h2>
 
 <p>This is your weekly distance for the past rolling year, split by activity kind.</p>

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.39.0
+Version: 0.40.0
 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.40.0.dist-info}/RECORD

@@ -1,47 +1,56 @@
+geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/__main__.py,sha256=eL7NlKydYrzi4ikTvvKmlwkEFxx0V6CXOHOhRtazmd8,2907
 geo_activity_playground/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 geo_activity_playground/alembic/env.py,sha256=46oMzwSROaAsYuYWTd46txFdRLD3adm_SCn01A_ex8Q,2081
 geo_activity_playground/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 geo_activity_playground/alembic/versions/451e7836b53d_add_square_planner_bookmark.py,sha256=WrmlDllnJECg6cSOeS05wYCa977_SXbJUV5khDSzntw,1082
 geo_activity_playground/alembic/versions/63d3b7f6f93c_initial_version.py,sha256=YTnnENkQ8WqLz7PFof7tUWNkWcoHGkAfAM52x1N9umo,3029
+geo_activity_playground/alembic/versions/93cc82ad1b60_add_parametricplotspec.py,sha256=P9nG348kz6Wi2lD8lJ_f-0juBtlJb1tqBWYqP2XMQPE,1365
 geo_activity_playground/alembic/versions/ab83b9d23127_add_upstream_id.py,sha256=Wz02lBP2r7-09DjuQP8u8i7ypQ2SZU5RUc422-_ZBDk,851
 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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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/enrichment.py,sha256=LWAKF6mAKtiZcIF8ptAgpt8fYTYZAnSuXGHuX5TTO6o,7220
+geo_activity_playground/core/datamodel.py,sha256=v5tLkPO53ilVIE78_gLz7igi6qh0ffdDPJmF7P2lkgE,10303
+geo_activity_playground/core/enrichment.py,sha256=kc9747ocSs2_3R7oW9Rjs3_lKP37gdvBUbyWpILaqHc,7346
 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=IefPc6lwthxowvjUDA5wu23oBSw9jq399l04gSaNrOQ,3880
 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
 geo_activity_playground/core/similarity.py,sha256=L2de3DPRdDeDY5AxZwLDcH7FjHWRWklr41VNU06q9kQ,3117
 geo_activity_playground/core/summary_stats.py,sha256=v5FtWnE1imDF5axI6asVN55wCrlD73oZ6lvqzxsTN2c,1006
 geo_activity_playground/core/tasks.py,sha256=-_9cxekoHSWzCW4XblNeqrwi2tTqr5AE7_-p8fdqhwc,2886
+geo_activity_playground/core/test_datamodel.py,sha256=noNgiGzs2BOZvdi2FosLvW8YTinE6Gl7_JrEs7D8GBI,230
 geo_activity_playground/core/test_meta_search.py,sha256=zhuD343Xce-4Fkznw81DHQ7pK5eyX5UbcyCHuYRKsr8,3091
 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
 geo_activity_playground/core/tiles.py,sha256=lV6X1Uc9XQecu2LALIvxpnMcLsVtWx7JczJ5a_S1eZE,2139
 geo_activity_playground/core/time_conversion.py,sha256=x5mXG6Y4GtdX7CBmwucGNSWBp9JQJDbZ7u0JkdUY1Vs,379
+geo_activity_playground/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/explorer/grid_file.py,sha256=YNL_c4O1-kxaajATJwj4ZLywCL5Hpj9qy2h-F7rk8Yg,3260
 geo_activity_playground/explorer/tile_visits.py,sha256=C8IpAGmrjMGYhyTVK-tl2ptM9-CXF2mwibhJYn7gLf8,13905
 geo_activity_playground/explorer/video.py,sha256=7j6Qv3HG6On7Tn7xh7Olwrx_fbQnfzS7CeRg3TEApHg,4397
 geo_activity_playground/heatmap_video.py,sha256=I8i1uVvbbPUXVtvLAROaLy58nQoUPnuMCZkERWNkQjg,3318
-geo_activity_playground/importers/activity_parsers.py,sha256=DL11K2KFcESo7SC4CrvV4u1RALT5TbUJ22oOp7f1aG0,11058
+geo_activity_playground/importers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geo_activity_playground/importers/activity_parsers.py,sha256=yD7L5eDOpiLWf6RHSQf4-Nk2S3vgfVHngc9ZlFSrioM,11090
 geo_activity_playground/importers/csv_parser.py,sha256=O1pP5GLhWhnWcy2Lsrr9g17Zspuibpt-GtZ3ZS5eZF4,2143
 geo_activity_playground/importers/directory.py,sha256=4Q7UAFa7ztkgqf4FvPbH2LlrO-7a8Fu7tkYPHOpHm1g,5210
 geo_activity_playground/importers/strava_api.py,sha256=J0-VXNrLq22fhTcWkQPE5AVrzy5aegC7SBi-UXFtAy4,7576
-geo_activity_playground/importers/strava_checkout.py,sha256=EixNFXXnxkopqUs0qe6iShYTbGu_o_g2_1lxuUIsz4E,9679
+geo_activity_playground/importers/strava_checkout.py,sha256=uNcmA-ADURNpW5zJdRkG07eHjj1MVoIKsv0EWdc5iRw,10090
 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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geo_activity_playground/webui/app.py,sha256=xoRnF2ISq74v48ZBpyrCxEFPCwtS4fw3WZvWbvExSmE,7208
 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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geo_activity_playground/webui/blueprints/activity_blueprint.py,sha256=A0hxhdEY_Ma5AEWT3Gv70Ys70DWSqSJOEdQAMeNb5CU,24337
 geo_activity_playground/webui/blueprints/auth_blueprint.py,sha256=_VZeP3VN626BoOOZUkNVnuw9v-cEOrkHz5lhFPmxqMY,784
 geo_activity_playground/webui/blueprints/bubble_chart_blueprint.py,sha256=tiqDf-DZLdjm8faatZ5fqbh7gkII2KmBPRtkcKqoLIA,2194
 geo_activity_playground/webui/blueprints/calendar_blueprint.py,sha256=L6R8xieYYXeEMDzJs-MjWax1JAHhppWy3r3U8MyCOAk,2585
@@ -50,10 +59,11 @@ 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=7HrjpBM-608HSOh0i31Lmt7yDNMfWlEn6G7DlYqlV9w,3031
 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
-geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=g7j0wmqk3PwPJ-zQrSEJMcke1SUsrSkiOBhOfzaIP1A,9126
+geo_activity_playground/webui/blueprints/summary_blueprint.py,sha256=-CArocRkcjzC7aTOCsG_8BnLJSX2b9X9C79mesyfvRw,9465
 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/flasher.py,sha256=Covc1D9cO_jjokRWnvyiXCc2tfp3aZ8XkNqFdA1AXtk,500
@@ -97,7 +107,7 @@ geo_activity_playground/webui/templates/activity/day.html.j2,sha256=CHEvxlZralCm
 geo_activity_playground/webui/templates/activity/edit.html.j2,sha256=9HDFjYfUQBB6HAgeIZppFPlpiJ1vDZWcGyP7uYG_Hnw,1369
 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=OjgD8uM1L8nO12yPcHAhqMPFOtA2k2iUNkCT3EhHBg8,8318
+geo_activity_playground/webui/templates/activity/show.html.j2,sha256=NKXplqDMkzS5z7JKJliNr5bKxTG6cr3ahd6vrmN0280,8322
 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=pqyafhIgL97FuD4_-lMb8lRWC3rejwrjawbmfp17XFY,1143
@@ -108,7 +118,9 @@ geo_activity_playground/webui/templates/equipment/index.html.j2,sha256=wwrGmfCCB
 geo_activity_playground/webui/templates/explorer/index.html.j2,sha256=3t9ikAF6oMvEaVlS3Kb1tj9ngomIQlatzqPnqVsEDKA,6908
 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/page.html.j2,sha256=1if_h8w2nsq9wNut-nzlpTNsPsQTxV0yPMdgUvz7bz8,11250
+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=_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
@@ -123,11 +135,11 @@ geo_activity_playground/webui/templates/settings/segmentation.html.j2,sha256=QV7
 geo_activity_playground/webui/templates/settings/sharepic.html.j2,sha256=qZkfEpd4CtKKMaSSVadqvNEgMRYLV-0X-pw5-nJvukk,678
 geo_activity_playground/webui/templates/settings/strava.html.j2,sha256=GCE5gskQ6xJ8AM1qGrrUVLDOiuqg510mWzzsZjia0gk,2211
 geo_activity_playground/webui/templates/square_planner/index.html.j2,sha256=-OnY2nQCgZCslOzf28ogZwFykwF8tZm7PgFwOE3eBDk,8176
-geo_activity_playground/webui/templates/summary/index.html.j2,sha256=bM89LdumssVvmuI0EeI8mnzMYxSzNjWY_XWfzn-f6nI,5377
+geo_activity_playground/webui/templates/summary/index.html.j2,sha256=T8YUGMXaZYeVl7Q5-H1YhdnGo3bx_LtExPQ60qj_Zhs,5638
 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.40.0.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.40.0.dist-info/METADATA,sha256=lhX789KVp1udKHGEsa3XojbAwFYRHs2X1E0DlTr9veo,1758
+geo_activity_playground-0.40.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+geo_activity_playground-0.40.0.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.40.0.dist-info/RECORD,,