Merge pull request #321 from openbikesensor/next

together with @opatut: finally. 🚀

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.8.0
+
+### Features
+
+* Bulk actions on users owned tracks (reprocess, download, make private, make public, delete) (#269, #38)
+* Easy sorting by device for "multi-device users" (e.g. group lending out OBSes)
+* Region display at higher zoom levels to easily find interesting areas (#112)
+* Export of road statistics on top of the already-existing event statistics (#341)
+
+### Improvements
+
+* Refactored database access to hopefully combat portal crashes (#337)
+* New infrastructure for map imports that makes import of larger maps possible on small VMs (#334)
+* Reference current postgres and postgis versions in docker-compose.yaml files (#286)
+* Configurable terms-and-conditions link (#320)
+* French translation by @cbiteau (#303)
+
+### Bug Fixes
+
+* Logout not working (#285)
+* Duplicate road usage hashes (#335, #253)
+* cannot import name .... (#338)
+
 ## 0.7.0
 
 ### Features

Dockerfile

@@ -1,44 +1,5 @@
 # This dockerfile is for the API + Frontend production image
 
-#############################################
-# Build osm2pgsql AS builder
-#############################################
-
-# This image should be the same as final one, because of the lib versions
-FROM python:3.9.7-bullseye as osm2pgsql-builder
-
-ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=Europe/Berlin
-ENV OSM2PGSQL_VERSION=1.5.1
-
-# Dependencies
-RUN apt-get update &&\
-    apt-get install -y \
-    make \
-    cmake \
-    g++ \
-    libboost-dev \
-    libboost-system-dev \
-    libboost-filesystem-dev \
-    libexpat1-dev \
-    zlib1g-dev \
-    libbz2-dev \
-    libpq-dev \
-    libproj-dev \
-    lua5.3 \
-    liblua5.3-dev \
-    git &&\
-    rm -rf /var/lib/apt/lists/*
-
-# Clone & Build
-RUN git clone  --branch $OSM2PGSQL_VERSION https://github.com/openstreetmap/osm2pgsql.git &&\
-    cd osm2pgsql/ &&\
-    mkdir build &&\
-    cd build &&\
-    cmake .. &&\
-    make -j4 &&\
-    make install
-
 #############################################
 # Build the frontend AS builder
 #############################################
@@ -60,7 +21,7 @@ RUN npm run build
 # Build the API and add the built frontend to it
 #############################################
 
-FROM python:3.9.7-bullseye
+FROM python:3.11.3-bullseye
 
 RUN apt-get update &&\
     apt-get install -y \
@@ -93,11 +54,7 @@ ADD api/obs /opt/obs/api/obs/
 ADD api/tools /opt/obs/api/tools/
 RUN pip install -e /opt/obs/api/
 
-ADD roads_import.lua /opt/obs/api/tools
-ADD osm2pgsql.sh /opt/obs/api/tools
-
 COPY --from=frontend-builder /opt/obs/frontend/build /opt/obs/frontend/build
-COPY --from=osm2pgsql-builder /usr/local/bin/osm2pgsql /usr/local/bin/osm2pgsql
 
 EXPOSE 3000
 

README.md

@@ -36,10 +36,11 @@ git submodule update --init --recursive
 
 ## Production setup
 
-There is a guide for a deployment based on docker in the
+There is a guide for a deployment based on docker at
-[deployment](deployment) folder. Lots of non-docker deployment strategy are
+[docs/production-deployment.md](docs/production-deployment.md). Lots of
-possible, but they are not "officially" supported, so please do not expect the
+non-docker deployment strategies are possible, but they are not "officially"
-authors of the software to assist in troubleshooting. 
+supported, so please do not expect the authors of the software to assist in
+troubleshooting. 
 
 This is a rather complex application, and it is expected that you know the
 basics of deploying a modern web application securely onto a production server.
@@ -52,7 +53,8 @@ Please note that you will always need to install your own reverse proxy that
 terminates TLS for you and handles certificates. We do not support TLS directly
 in the application, instead, please use this prefered method. 
 
-Upgrading and migrating is descrube
+Upgrading and migrating is described in [UPGRADING.md](./UPGRADING.md) for each
+version.
 
 ### Migrating (Production)
 
@@ -75,18 +77,6 @@ docker-compose run --rm api alembic upgrade head
 docker-compose run --rm api tools/prepare_sql_tiles
 ```
 
-
-docker-compose run --rm api alembic upgrade head
-
-### Upgrading from v0.2 to v0.3
-
-After v0.2 we switched the underlying technology of the API and the database.
-We now have no more MongoDB, instead, everything has moved to the PostgreSQL
-installation. For development setups, it is advised to just reset the whole
-state (remove the `local` folder) and start fresh. For production upgrades,
-please follow the relevant section in [`UPGRADING.md`](./UPGRADING.md).
-
-
 ## Development setup
 
 We've moved the whole development setup into Docker to make it easy for
@@ -101,7 +91,6 @@ Then clone the repository as described above.
 
 ### Configure Keycloak
 
-
 Login will not be possible until you configure the keycloak realm correctly. Boot your keycloak instance:
 
 ```bash
@@ -164,7 +153,7 @@ You will need to re-run this command after updates, to migrate the database and
 (re-)create the functions in the SQL database that are used when generating
 vector tiles.
 
-You should also import OpenStreetMap data now, see below for instructions.
+You should also [import OpenStreetMap data](docs/osm-import.md) now.
 
 ### Boot the application
 
@@ -190,48 +179,6 @@ docker-compose run --rm api alembic upgrade head
 ```
 
 
-## Import OpenStreetMap data
-
-**Hint:** This step may be skipped if you are using [Lean mode](./docs/lean-mode.md).
-
-You need to import road information from OpenStreetMap for the portal to work.
-This information is stored in your PostgreSQL database and used when processing
-tracks (instead of querying the Overpass API), as well as for vector tile
-generation. The process applies to both development and production setups. For
-development, you should choose a small area for testing, such as your local
-county or city, to keep the amount of data small. For production use you have
-to import the whole region you are serving.
-
-* Install `osm2pgsql`. 
-* Download the area(s) you would like to import from [GeoFabrik](https://download.geofabrik.de). 
-* Import each file like this:
-
-    ```bash
-    osm2pgsql --create --hstore --style roads_import.lua -O flex \
-      -H localhost -d obs -U obs -W \
-      path/to/downloaded/myarea-latest.osm.pbf 
-    ```
-
-You might need to adjust the host, database and username (`-H`, `-d`, `-U`) to
-your setup, and also provide the correct password when queried. For the
-development setup the password is `obs`. For production, you might need to
-expose the containers port and/or create a TCP tunnel, for example with SSH,
-such that you can run the import from your local host and write to the remote
-database.
-
-The import process should take a few seconds to minutes, depending on the area
-size. A whole country might even take one or more hours. You should probably
-not try to import `planet.osm.pbf`. 
-
-You can run the process multiple times, with the same or different area files,
-to import or update the data. However, for this to work, the actual [command
-line arguments](https://osm2pgsql.org/doc/manual.html#running-osm2pgsql) are a
-bit different each time, including when first importing, and the disk space
-required is much higher. 
-
-Refer to the documentation of `osm2pgsql` for assistance. We are using "flex
-mode", the provided script `roads_import.lua` describes the transformations
-and extractions to perform on the original data.
 
 ## Troubleshooting
 

UPGRADING.md

@@ -1,9 +1,32 @@
 # Upgrading
-
 This document describes the general steps to upgrade between major changes.
 Simple migrations, e.g. for adding schema changes, are not documented
 explicitly. Their general usage is described in the [README](./README.md) (for
-development) and [deployment/README.md](deployment/README.md) (for production).
+development) and [docs/production-deployment.md](docs/production-deployment.md) (for production).
+
+
+## 0.8.0
+Upgrade to `0.7.x` first. See below for details. Then follow these steps:
+
+> **Warning** The update includes a reprocessing of tracks after import. Depending on the number of tracks this can take a few hours. The portal is reachable during that time but events disappear and incrementally reappear during reimport.
+
+> **Info** With this version the import process for OpenStreetMap data has changed: the [new process](docs/osm-import.md) is easier on resources and finally permits to import a full country on a low-end VM.
+
+- Do your [usual backup](docs/production-deployment.md)
+- get the release in your source folder (``git pull; git checkout 0.8.0`` and update submodules ``git submodule update --recursive``)
+- Rebuild images ``docker-compose build``
+- Stop your portal and worker services ``docker-compose stop worker portal``
+- run upgrade
+  ```bash
+  docker-compose run --rm portal tools/upgrade.py
+  ```
+  this automatically does the following
+  - Migration of database schema using alembic.
+  - Upgrade of SQL tile schema to new schema.
+  - Import the nuts-regions from the web into the database.
+  - Trigger a re-import of all tracks.
+- Start your portal and worker services. ``docker-compose up -d worker portal``
+
 
 ## 0.7.0
 
@@ -57,7 +80,7 @@ You can, but do not have to, reimport all tracks. This will generate a GPX file
 for each track and allow the users to download those. If a GPX file has not yet
 been created, the download will fail. To reimport all tracks, log in to your
 PostgreSQL database (instructions are in [README.md](./README.md) for
-development and [deployment/README.md](./deployment/README.md) for production)
+development and [docs/production-deployment.md](./docs/production-deployment.md) for production)
 and run:
 
 ```sql
@@ -77,7 +100,7 @@ Make sure your worker is running to process the queue.
   `POSTGRES_MAX_OVERFLOW`. Check the example config for sane default values.
 * Re-run `tools/prepare_sql_tiles.py` again (see README)
 * It has been made easier to import OSM data, check
-  [deployment/README.md](deployment/README.md) for the sections "Download
+  [docs/production-deployment.md](./docs/production-deployment.md) for the sections "Download
   OpenStreetMap maps" and "Import OpenStreetMap data". You can now download
   multiple .pbf files and then import them at once, using the docker image
   built with the `Dockerfile`. Alternatively, you can choose to enable [lean
@@ -132,5 +155,5 @@ Make sure your worker is running to process the queue.
   `export/users.json` into your realm, it will re-add all the users from the
   old installation. You should delete the file and `export/` folder afterwards.
 * Start `portal`.
-* Consider configuring a worker service. See [deployment/README.md](deployment/README.md).
+* Consider configuring a worker service. See [docs/production-deployment.md](./docs/production-deployment.md).
 

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.7-bullseye
+FROM python:3.11.3-bullseye
 
 WORKDIR /opt/obs/api
 

api/config.dev.py

@@ -2,9 +2,8 @@ HOST = "0.0.0.0"
 PORT = 3000
 DEBUG = True
 VERBOSE = False
-AUTO_RESTART = True
+AUTO_RELOAD = True
 SECRET = "!!!!!!!!!!!!CHANGE ME!!!!!!!!!!!!"
-LEAN_MODE = False
 POSTGRES_URL = "postgresql+asyncpg://obs:obs@postgres/obs"
 POSTGRES_POOL_SIZE = 20
 POSTGRES_MAX_OVERFLOW = 2 * POSTGRES_POOL_SIZE
@@ -30,5 +29,7 @@ ADDITIONAL_CORS_ORIGINS = [
     "http://localhost:8880/",  # for maputnik on 8880
     "http://localhost:8888/",  # for maputnik on 8888
 ]
+TILE_SEMAPHORE_SIZE = 4
+EXPORT_SEMAPHORE_SIZE = 4
 
 # vim: set ft=python :

api/config.py.example

@@ -5,12 +5,7 @@ PORT = 3000
 # Extended log output, but slower
 DEBUG = False
 VERBOSE = DEBUG
-AUTO_RESTART = DEBUG
+AUTO_RELOAD = DEBUG
-
-# Turn on lean mode to simplify the setup. Lots of features will be
-# unavailable, but you will not need to manage OpenStreetMap data. Please make
-# sure to configure the OBS_FACE_CACHE_DIR correctly for lean mode.
-LEAN_MODE = False
 
 # Required to encrypt or sign sessions, cookies, tokens, etc.
 SECRET = "!!!<<<CHANGEME>>>!!!"
@@ -66,4 +61,13 @@ TILES_FILE = None
 # default. Python list, or whitespace separated string.
 ADDITIONAL_CORS_ORIGINS = None
 
+# How many asynchronous requests may be sent to the database to generate tile
+# information. Should be less than POSTGRES_POOL_SIZE to leave some connections
+# to the other features of the API ;)
+TILE_SEMAPHORE_SIZE = 4
+
+# How many asynchronous requests may generate exported data simultaneously.
+# Keep this small.
+EXPORT_SEMAPHORE_SIZE = 1
+
 # vim: set ft=python :

api/migrations/versions/35e7f1768f9b_create_table_road.py

@@ -22,13 +22,16 @@ def upgrade():
     op.create_table(
         "road",
         sa.Column(
-            "way_id", sa.BIGINT, autoincrement=True, primary_key=True, index=True
+            "way_id", sa.BIGINT, primary_key=True, index=True, autoincrement=False
         ),
         sa.Column("zone", dbtype("zone_type")),
-        sa.Column("name", sa.String),
+        sa.Column("name", sa.Text),
-        sa.Column("geometry", dbtype("GEOMETRY"), index=True),
+        sa.Column("geometry", dbtype("geometry(LINESTRING,3857)")),
         sa.Column("directionality", sa.Integer),
-        sa.Column("oenway", sa.Boolean),
+        sa.Column("oneway", sa.Boolean),
+    )
+    op.execute(
+        "CREATE INDEX road_geometry_idx ON road USING GIST (geometry) WITH (FILLFACTOR=100);"
     )
 
 

api/migrations/versions/587e69ecb466_transform_overtaking_event_geometry_to_.py

@@ -0,0 +1,30 @@
+"""transform overtaking_event geometry to 3857
+
+Revision ID: 587e69ecb466
+Revises: f4b0f460254d
+Create Date: 2023-04-01 14:30:49.927505
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "587e69ecb466"
+down_revision = "f4b0f460254d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("UPDATE overtaking_event SET geometry = ST_Transform(geometry, 3857);")
+    op.execute(
+        "ALTER TABLE overtaking_event ALTER COLUMN geometry TYPE geometry(POINT, 3857);"
+    )
+
+
+def downgrade():
+    op.execute(
+        "ALTER TABLE overtaking_event ALTER COLUMN geometry TYPE geometry;"
+    )
+    op.execute("UPDATE overtaking_event SET geometry = ST_Transform(geometry, 4326);")

api/migrations/versions/a049e5eb24dd_create_table_region.py

@@ -0,0 +1,35 @@
+"""create table region
+
+Revision ID: a049e5eb24dd
+Revises: a9627f63fbed
+Create Date: 2022-04-02 21:28:43.124521
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+from migrations.utils import dbtype
+
+
+# revision identifiers, used by Alembic.
+revision = "a049e5eb24dd"
+down_revision = "99a3d2eb08f9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "region",
+        sa.Column("id", sa.String(24), primary_key=True, index=True),
+        sa.Column("name", sa.Text),
+        sa.Column("geometry", dbtype("GEOMETRY(GEOMETRY,3857)"), index=False),
+        sa.Column("admin_level", sa.Integer, index=True),
+    )
+    op.execute(
+        "CREATE INDEX region_geometry_idx ON region USING GIST (geometry) WITH (FILLFACTOR=100);"
+    )
+
+
+def downgrade():
+    op.drop_table("region")

api/migrations/versions/b8b0fbae50a4_add_import_groups.py

@@ -0,0 +1,39 @@
+"""add import groups
+
+Revision ID: b8b0fbae50a4
+Revises: f7b21148126a
+Create Date: 2023-03-26 09:41:36.621203
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "b8b0fbae50a4"
+down_revision = "f7b21148126a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column(
+        "road",
+        sa.Column("import_group", sa.String(), nullable=True),
+    )
+    op.add_column(
+        "region",
+        sa.Column("import_group", sa.String(), nullable=True),
+    )
+
+    # Set existing to "osm2pgsql"
+    road = sa.table("road", sa.column("import_group", sa.String))
+    op.execute(road.update().values(import_group="osm2pgsql"))
+
+    region = sa.table("region", sa.column("import_group", sa.String))
+    op.execute(region.update().values(import_group="osm2pgsql"))
+
+
+def downgrade():
+    op.drop_column("road", "import_group")
+    op.drop_column("region", "import_group")

api/migrations/versions/f4b0f460254d_add_osm_id_indexes.py

@@ -0,0 +1,24 @@
+"""add osm id indexes
+
+Revision ID: f4b0f460254d
+Revises: b8b0fbae50a4
+Create Date: 2023-03-30 10:56:22.066768
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "f4b0f460254d"
+down_revision = "b8b0fbae50a4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("CREATE INDEX IF NOT EXISTS ix_road_way_id ON road (way_id);")
+
+
+def downgrade():
+    op.drop_index("ix_road_way_id")

api/migrations/versions/f7b21148126a_add_user_device.py

@@ -0,0 +1,41 @@
+"""add user_device
+
+Revision ID: f7b21148126a
+Revises: a9627f63fbed
+Create Date: 2022-09-15 17:48:06.764342
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "f7b21148126a"
+down_revision = "a049e5eb24dd"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "user_device",
+        sa.Column("id", sa.Integer, autoincrement=True, primary_key=True),
+        sa.Column("user_id", sa.Integer, sa.ForeignKey("user.id", ondelete="CASCADE")),
+        sa.Column("identifier", sa.String, nullable=False),
+        sa.Column("display_name", sa.String, nullable=True),
+        sa.Index("user_id_identifier", "user_id", "identifier", unique=True),
+    )
+    op.add_column(
+        "track",
+        sa.Column(
+            "user_device_id",
+            sa.Integer,
+            sa.ForeignKey("user_device.id", ondelete="RESTRICT"),
+            nullable=True,
+        ),
+    )
+
+
+def downgrade():
+    op.drop_column("track", "user_device_id")
+    op.drop_table("user_device")

api/obs/api/app.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import re
 
@@ -21,16 +22,60 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from obs.api.db import User, make_session, connect_db
+from obs.api.cors import setup_options, add_cors_headers
 from obs.api.utils import get_single_arg
-from sqlalchemy.util import asyncio
 
 log = logging.getLogger(__name__)
 
+
+class SanicAccessMessageFilter(logging.Filter):
+    """
+    A filter that modifies the log message of a sanic.access log entry to
+    include useful information.
+    """
+
+    def filter(self, record):
+        record.msg = f"{record.request} -> {record.status}"
+        return True
+
+
+def configure_sanic_logging():
+    for logger_name in ["sanic.root", "sanic.access", "sanic.error"]:
+        logger = logging.getLogger(logger_name)
+        for handler in logger.handlers:
+            logger.removeHandler(handler)
+
+    logger = logging.getLogger("sanic.access")
+    for filter_ in logger.filters:
+        logger.removeFilter(filter_)
+    logger.addFilter(SanicAccessMessageFilter())
+    logging.getLogger("sanic.root").setLevel(logging.WARNING)
+
+
 app = Sanic(
     "openbikesensor-api",
     env_prefix="OBS_",
-    log_config={},
 )
+configure_sanic_logging()
+
+app.config.update(
+    dict(
+        DEBUG=False,
+        VERBOSE=False,
+        AUTO_RELOAD=False,
+        POSTGRES_POOL_SIZE=20,
+        POSTGRES_MAX_OVERFLOW=40,
+        DEDICATED_WORKER=True,
+        FRONTEND_URL=None,
+        FRONTEND_HTTPS=True,
+        TILES_FILE=None,
+        TILE_SEMAPHORE_SIZE=4,
+        EXPORT_SEMAPHORE_SIZE=1,
+    )
+)
+
+# overwrite from defaults again
+app.config.load_environment_vars("OBS_")
 
 if isfile("./config.py"):
     app.update_config("./config.py")
@@ -59,6 +104,39 @@ class NoConnectionLostFilter(logging.Filter):
 logging.getLogger("sanic.error").addFilter(NoConnectionLostFilter)
 
 
+def setup_cors(app):
+    frontend_url = app.config.get("FRONTEND_URL")
+    additional_origins = app.config.get("ADDITIONAL_CORS_ORIGINS")
+    if not frontend_url and not additional_origins:
+        # No CORS configured
+        return
+
+    origins = []
+    if frontend_url:
+        u = urlparse(frontend_url)
+        origins.append(f"{u.scheme}://{u.netloc}")
+
+    if isinstance(additional_origins, str):
+        origins += re.split(r"\s+", additional_origins)
+    elif isinstance(additional_origins, list):
+        origins += additional_origins
+    elif additional_origins is not None:
+        raise ValueError(
+            "invalid option type for ADDITIONAL_CORS_ORIGINS, must be list or space separated str"
+        )
+
+    app.ctx.cors_origins = origins
+
+    # Add OPTIONS handlers to any route that is missing it
+    app.register_listener(setup_options, "before_server_start")
+
+    # Fill in CORS headers
+    app.register_middleware(add_cors_headers, "response")
+
+
+setup_cors(app)
+
+
 @app.exception(SanicException, BaseException)
 async def _handle_sanic_errors(_request, exception):
     if isinstance(exception, asyncio.CancelledError):
@@ -95,39 +173,6 @@ def configure_paths(c):
 configure_paths(app.config)
 
 
-def setup_cors(app):
-    frontend_url = app.config.get("FRONTEND_URL")
-    additional_origins = app.config.get("ADDITIONAL_CORS_ORIGINS")
-    if not frontend_url and not additional_origins:
-        # No CORS configured
-        return
-
-    origins = []
-    if frontend_url:
-        u = urlparse(frontend_url)
-        origins.append(f"{u.scheme}://{u.netloc}")
-
-    if isinstance(additional_origins, str):
-        origins += re.split(r"\s+", additional_origins)
-    elif isinstance(additional_origins, list):
-        origins += additional_origins
-    elif additional_origins is not None:
-        raise ValueError(
-            "invalid option type for ADDITIONAL_CORS_ORIGINS, must be list or space separated str"
-        )
-
-    from sanic_cors import CORS
-
-    CORS(
-        app,
-        origins=origins,
-        supports_credentials=True,
-        expose_headers={"Content-Disposition"},
-    )
-
-
-setup_cors(app)
-
 # TODO: use a different interface, maybe backed by the PostgreSQL, to allow
 # scaling the API
 Session(app, interface=InMemorySessionInterface())
@@ -142,6 +187,12 @@ async def app_connect_db(app, loop):
     )
     app.ctx._db_engine = await app.ctx._db_engine_ctx.__aenter__()
 
+    if app.config.TILE_SEMAPHORE_SIZE:
+        app.ctx.tile_semaphore = asyncio.Semaphore(app.config.TILE_SEMAPHORE_SIZE)
+
+    if app.config.EXPORT_SEMAPHORE_SIZE:
+        app.ctx.export_semaphore = asyncio.Semaphore(app.config.EXPORT_SEMAPHORE_SIZE)
+
 
 @app.after_server_stop
 async def app_disconnect_db(app, loop):
@@ -294,9 +345,7 @@ from .routes import (
     exports,
 )
 
-if not app.config.LEAN_MODE:
+from .routes import tiles, mapdetails
-    from .routes import tiles, mapdetails
-
 from .routes import frontend
 
 

api/obs/api/cors.py

@@ -0,0 +1,68 @@
+from collections import defaultdict
+from typing import Dict, FrozenSet, Iterable
+
+from sanic import Sanic, response
+from sanic_routing.router import Route
+
+
+def _add_cors_headers(request, response, methods: Iterable[str]) -> None:
+    allow_methods = list(set(methods))
+
+    if "OPTIONS" not in allow_methods:
+        allow_methods.append("OPTIONS")
+
+    origin = request.headers.get("origin")
+    if origin in request.app.ctx.cors_origins:
+        headers = {
+            "Access-Control-Allow-Methods": ",".join(allow_methods),
+            "Access-Control-Allow-Origin": origin,
+            "Access-Control-Allow-Credentials": "true",
+            "Access-Control-Allow-Headers": (
+                "origin, content-type, accept, "
+                "authorization, x-xsrf-token, x-request-id"
+            ),
+            "Access-Control-Expose-Headers": "content-disposition",
+        }
+        response.headers.extend(headers)
+
+
+def add_cors_headers(request, response):
+    if request.method != "OPTIONS":
+        methods = [method for method in request.route.methods]
+        _add_cors_headers(request, response, methods)
+
+
+def _compile_routes_needing_options(routes: Dict[str, Route]) -> Dict[str, FrozenSet]:
+    needs_options = defaultdict(list)
+    # This is 21.12 and later. You will need to change this for older versions.
+    for route in routes.values():
+        if "OPTIONS" not in route.methods:
+            needs_options[route.uri].extend(route.methods)
+
+    return {uri: frozenset(methods) for uri, methods in dict(needs_options).items()}
+
+
+def _options_wrapper(handler, methods):
+    def wrapped_handler(request, *args, **kwargs):
+        nonlocal methods
+        return handler(request, methods)
+
+    return wrapped_handler
+
+
+async def options_handler(request, methods) -> response.HTTPResponse:
+    resp = response.empty()
+    _add_cors_headers(request, resp, methods)
+    return resp
+
+
+def setup_options(app: Sanic, _):
+    app.router.reset()
+    needs_options = _compile_routes_needing_options(app.router.routes_all)
+    for uri, methods in needs_options.items():
+        app.add_route(
+            _options_wrapper(options_handler, methods),
+            uri,
+            methods=["OPTIONS"],
+        )
+    app.router.finalize()

api/obs/api/db.py

@@ -34,8 +34,9 @@ from sqlalchemy import (
     select,
     text,
     literal,
+    Text,
 )
-from sqlalchemy.dialects.postgresql import HSTORE, UUID
+from sqlalchemy.dialects.postgresql import UUID
 
 
 log = logging.getLogger(__name__)
@@ -107,6 +108,28 @@ class Geometry(UserDefinedType):
         return func.ST_AsGeoJSON(func.ST_Transform(col, 4326), type_=self)
 
 
+class LineString(UserDefinedType):
+    def get_col_spec(self):
+        return "geometry(LineString, 3857)"
+
+    def bind_expression(self, bindvalue):
+        return func.ST_GeomFromGeoJSON(bindvalue, type_=self)
+
+    def column_expression(self, col):
+        return func.ST_AsGeoJSON(func.ST_Transform(col, 4326), type_=self)
+
+
+class GeometryGeometry(UserDefinedType):
+    def get_col_spec(self):
+        return "geometry(GEOMETRY, 3857)"
+
+    def bind_expression(self, bindvalue):
+        return func.ST_GeomFromGeoJSON(bindvalue, type_=self)
+
+    def column_expression(self, col):
+        return func.ST_AsGeoJSON(func.ST_Transform(col, 4326), type_=self)
+
+
 class OvertakingEvent(Base):
     __tablename__ = "overtaking_event"
     __table_args__ = (Index("road_segment", "way_id", "direction_reversed"),)
@@ -134,12 +157,23 @@ class OvertakingEvent(Base):
 
 class Road(Base):
     __tablename__ = "road"
-    way_id = Column(BIGINT, primary_key=True, index=True)
+    way_id = Column(BIGINT, primary_key=True, index=True, autoincrement=False)
     zone = Column(ZoneType)
-    name = Column(String)
+    name = Column(Text)
-    geometry = Column(Geometry)
+    geometry = Column(LineString)
     directionality = Column(Integer)
     oneway = Column(Boolean)
+    import_group = Column(String)
+
+    __table_args__ = (
+        # We keep the index name as osm2pgsql created it, way back when.
+        Index(
+            "road_geometry_idx",
+            "geometry",
+            postgresql_using="gist",
+            postgresql_with={"fillfactor": 100},
+        ),
+    )
 
     def to_dict(self):
         return {
@@ -166,6 +200,12 @@ class RoadUsage(Base):
     def __repr__(self):
         return f"<RoadUsage {self.id}>"
 
+    def __hash__(self):
+        return int(self.hex_hash, 16)
+
+    def __eq__(self, other):
+        return self.hex_hash == other.hex_hash
+
 
 NOW = text("NOW()")
 
@@ -221,6 +261,12 @@ class Track(Base):
         Integer, ForeignKey("user.id", ondelete="CASCADE"), nullable=False
     )
 
+    user_device_id = Column(
+        Integer,
+        ForeignKey("user_device.id", ondelete="RESTRICT"),
+        nullable=True,
+    )
+
     # Statistics... maybe we'll drop some of this if we can easily compute them from SQL
     recorded_at = Column(DateTime)
     recorded_until = Column(DateTime)
@@ -253,6 +299,7 @@ class Track(Base):
         if for_user_id is not None and for_user_id == self.author_id:
             result["uploadedByUserAgent"] = self.uploaded_by_user_agent
             result["originalFileName"] = self.original_file_name
+            result["userDeviceId"] = self.user_device_id
 
         if self.author:
             result["author"] = self.author.to_dict(for_user_id=for_user_id)
@@ -362,7 +409,7 @@ class User(Base):
     api_key = Column(String)
 
     # This user can be matched by the email address from the auth service
-    # instead of having to match by `sub`. If a matching user logs in, the
+    # instead of having to match by `sub`. If  a matching user logs in, the
     # `sub` is updated to the new sub and this flag is disabled. This is for
     # migrating *to* the external authentication scheme.
     match_by_username_email = Column(Boolean, server_default=false())
@@ -409,6 +456,28 @@ class User(Base):
         self.username = new_name
 
 
+class UserDevice(Base):
+    __tablename__ = "user_device"
+    id = Column(Integer, autoincrement=True, primary_key=True)
+    user_id = Column(Integer, ForeignKey("user.id", ondelete="CASCADE"))
+    identifier = Column(String, nullable=False)
+    display_name = Column(String, nullable=True)
+
+    __table_args__ = (
+        Index("user_id_identifier", "user_id", "identifier", unique=True),
+    )
+
+    def to_dict(self, for_user_id=None):
+        if for_user_id != self.user_id:
+            return {}
+
+        return {
+            "id": self.id,
+            "identifier": self.identifier,
+            "displayName": self.display_name,
+        }
+
+
 class Comment(Base):
     __tablename__ = "comment"
     id = Column(Integer, autoincrement=True, primary_key=True)
@@ -432,6 +501,26 @@ class Comment(Base):
         }
 
 
+class Region(Base):
+    __tablename__ = "region"
+
+    id = Column(String(24), primary_key=True, index=True)
+    name = Column(Text)
+    geometry = Column(GeometryGeometry)
+    admin_level = Column(Integer, index=True)
+    import_group = Column(String)
+
+    __table_args__ = (
+        # We keep the index name as osm2pgsql created it, way back when.
+        Index(
+            "region_geometry_idx",
+            "geometry",
+            postgresql_using="gist",
+            postgresql_with={"fillfactor": 100},
+        ),
+    )
+
+
 Comment.author = relationship("User", back_populates="authored_comments")
 User.authored_comments = relationship(
     "Comment",
@@ -458,6 +547,14 @@ Track.overtaking_events = relationship(
     passive_deletes=True,
 )
 
+Track.user_device = relationship("UserDevice", back_populates="tracks")
+UserDevice.tracks = relationship(
+    "Track",
+    order_by=Track.created_at,
+    back_populates="user_device",
+    passive_deletes=False,
+)
+
 
 # 0..4 Night, 4..10 Morning, 10..14 Noon, 14..18 Afternoon, 18..22 Evening, 22..00 Night
 # Two hour intervals

api/obs/api/process.py

@@ -8,7 +8,7 @@ import pytz
 from os.path import join
 from datetime import datetime
 
-from sqlalchemy import delete, select
+from sqlalchemy import delete, func, select, and_
 from sqlalchemy.orm import joinedload
 
 from obs.face.importer import ImportMeasurementsCsv
@@ -25,9 +25,9 @@ from obs.face.filter import (
     RequiredFieldsFilter,
 )
 
-from obs.face.osm import DataSource, DatabaseTileSource, OverpassTileSource
+from obs.face.osm import DataSource, DatabaseTileSource
 
-from obs.api.db import OvertakingEvent, RoadUsage, Track, make_session
+from obs.api.db import OvertakingEvent, RoadUsage, Track, UserDevice, make_session
 from obs.api.app import app
 
 log = logging.getLogger(__name__)
@@ -39,12 +39,7 @@ def get_data_source():
     mode, the OverpassTileSource is used to fetch data on demand. In normal
     mode, the roads database is used.
     """
-    if app.config.LEAN_MODE:
+    return DataSource(DatabaseTileSource())
-        tile_source = OverpassTileSource(cache_dir=app.config.OBS_FACE_CACHE_DIR)
-    else:
-        tile_source = DatabaseTileSource()
-
-    return DataSource(tile_source)
 
 
 async def process_tracks_loop(delay):
@@ -144,10 +139,11 @@ async def process_track(session, track, data_source):
         os.makedirs(output_dir, exist_ok=True)
 
         log.info("Annotating and filtering CSV file")
-        imported_data, statistics = ImportMeasurementsCsv().read(
+        imported_data, statistics, track_metadata = ImportMeasurementsCsv().read(
             original_file_path,
             user_id="dummy",  # TODO: user username or id or nothing?
             dataset_id=Track.slug,  # TODO: use track id or slug or nothing?
+            return_metadata=True,
         )
 
         annotator = AnnotateMeasurements(
@@ -217,6 +213,36 @@ async def process_track(session, track, data_source):
         await clear_track_data(session, track)
         await session.commit()
 
+        device_identifier = track_metadata.get("DeviceId")
+        if device_identifier:
+            if isinstance(device_identifier, list):
+                device_identifier = device_identifier[0]
+
+            log.info("Finding or creating device %s", device_identifier)
+            user_device = (
+                await session.execute(
+                    select(UserDevice).where(
+                        and_(
+                            UserDevice.user_id == track.author_id,
+                            UserDevice.identifier == device_identifier,
+                        )
+                    )
+                )
+            ).scalar()
+
+            log.debug("user_device is %s", user_device)
+
+            if not user_device:
+                user_device = UserDevice(
+                    user_id=track.author_id, identifier=device_identifier
+                )
+                log.debug("Create new device for this user")
+                session.add(user_device)
+
+            track.user_device = user_device
+        else:
+            log.info("No DeviceId in track metadata.")
+
         log.info("Import events into database...")
         await import_overtaking_events(session, track, overtaking_events)
 
@@ -280,11 +306,16 @@ async def import_overtaking_events(session, track, overtaking_events):
             hex_hash=hex_hash,
             way_id=m.get("OSM_way_id"),
             direction_reversed=m.get("OSM_way_orientation", 0) < 0,
-            geometry=json.dumps(
+            geometry=func.ST_Transform(
-                {
+                func.ST_GeomFromGeoJSON(
-                    "type": "Point",
+                    json.dumps(
-                    "coordinates": [m["longitude"], m["latitude"]],
+                        {
-                }
+                            "type": "Point",
+                            "coordinates": [m["longitude"], m["latitude"]],
+                        }
+                    )
+                ),
+                3857,
             ),
             latitude=m["latitude"],
             longitude=m["longitude"],

api/obs/api/routes/exports.py

@@ -3,15 +3,17 @@ from enum import Enum
 from contextlib import contextmanager
 import zipfile
 import io
+import re
 from sqlite3 import connect
 
 import shapefile
 from obs.api.db import OvertakingEvent
-from sqlalchemy import select, func
+from sqlalchemy import select, func, text
 from sanic.response import raw
 from sanic.exceptions import InvalidUsage
 
 from obs.api.app import api, json as json_response
+from obs.api.utils import use_request_semaphore
 
 
 class ExportFormat(str, Enum):
@@ -26,7 +28,7 @@ def parse_bounding_box(input_string):
             func.ST_Point(left, bottom),
             func.ST_Point(right, top),
         ),
-        3857,
+        4326,
     )
 
 
@@ -38,11 +40,11 @@ PROJECTION_4326 = (
 
 
 @contextmanager
-def shapefile_zip():
+def shapefile_zip(shape_type=shapefile.POINT, basename="events"):
     zip_buffer = io.BytesIO()
     shp, shx, dbf = (io.BytesIO() for _ in range(3))
     writer = shapefile.Writer(
-        shp=shp, shx=shx, dbf=dbf, shapeType=shapefile.POINT, encoding="utf8"
+        shp=shp, shx=shx, dbf=dbf, shapeType=shape_type, encoding="utf8"
     )
 
     yield writer, zip_buffer
@@ -51,67 +53,140 @@ def shapefile_zip():
     writer.close()
 
     zip_file = zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED, False)
-    zip_file.writestr("events.shp", shp.getbuffer())
+    zip_file.writestr(f"{basename}.shp", shp.getbuffer())
-    zip_file.writestr("events.shx", shx.getbuffer())
+    zip_file.writestr(f"{basename}.shx", shx.getbuffer())
-    zip_file.writestr("events.dbf", dbf.getbuffer())
+    zip_file.writestr(f"{basename}.dbf", dbf.getbuffer())
-    zip_file.writestr("events.prj", PROJECTION_4326)
+    zip_file.writestr(f"{basename}.prj", PROJECTION_4326)
     zip_file.close()
 
 
 @api.get(r"/export/events")
 async def export_events(req):
-    bbox = req.ctx.get_single_arg(
+    async with use_request_semaphore(req, "export_semaphore", timeout=30):
-        "bbox", default="-180,-90,180,90", convert=parse_bounding_box
+        bbox = req.ctx.get_single_arg(
-    )
+            "bbox", default="-180,-90,180,90", convert=parse_bounding_box
-    fmt = req.ctx.get_single_arg("fmt", convert=ExportFormat)
+        )
+        fmt = req.ctx.get_single_arg("fmt", convert=ExportFormat)
 
-    events = await req.ctx.db.stream_scalars(
+        events = await req.ctx.db.stream_scalars(
-        select(OvertakingEvent).where(OvertakingEvent.geometry.bool_op("&&")(bbox))
+            select(OvertakingEvent).where(
-    )
+                OvertakingEvent.geometry.bool_op("&&")(func.ST_Transform(bbox, 3857))
+            )
+        )
 
-    if fmt == ExportFormat.SHAPEFILE:
+        if fmt == ExportFormat.SHAPEFILE:
-        with shapefile_zip() as (writer, zip_buffer):
+            with shapefile_zip(basename="events") as (writer, zip_buffer):
-            writer.field("distance_overtaker", "N", decimal=4)
+                writer.field("distance_overtaker", "N", decimal=4)
-            writer.field("distance_stationary", "N", decimal=4)
+                writer.field("distance_stationary", "N", decimal=4)
-            writer.field("way_id", "N", decimal=0)
+                writer.field("way_id", "N", decimal=0)
-            writer.field("direction", "N", decimal=0)
+                writer.field("direction", "N", decimal=0)
-            writer.field("course", "N", decimal=4)
+                writer.field("course", "N", decimal=4)
-            writer.field("speed", "N", decimal=4)
+                writer.field("speed", "N", decimal=4)
 
+                async for event in events:
+                    writer.point(event.longitude, event.latitude)
+                    writer.record(
+                        distance_overtaker=event.distance_overtaker,
+                        distance_stationary=event.distance_stationary,
+                        direction=-1 if event.direction_reversed else 1,
+                        way_id=event.way_id,
+                        course=event.course,
+                        speed=event.speed,
+                        # "time"=event.time,
+                    )
+
+            return raw(zip_buffer.getbuffer())
+
+        if fmt == ExportFormat.GEOJSON:
+            features = []
             async for event in events:
-                writer.point(event.longitude, event.latitude)
+                features.append(
-                writer.record(
+                    {
-                    distance_overtaker=event.distance_overtaker,
+                        "type": "Feature",
-                    distance_stationary=event.distance_stationary,
+                        "geometry": json.loads(event.geometry),
-                    direction=-1 if event.direction_reversed else 1,
+                        "properties": {
-                    way_id=event.way_id,
+                            "distance_overtaker": event.distance_overtaker,
-                    course=event.course,
+                            "distance_stationary": event.distance_stationary,
-                    speed=event.speed,
+                            "direction": -1 if event.direction_reversed else 1,
-                    # "time"=event.time,
+                            "way_id": event.way_id,
+                            "course": event.course,
+                            "speed": event.speed,
+                            "time": event.time,
+                        },
+                    }
                 )
 
-        return raw(zip_buffer.getbuffer())
+            geojson = {"type": "FeatureCollection", "features": features}
+            return json_response(geojson)
 
-    if fmt == ExportFormat.GEOJSON:
+        raise InvalidUsage("unknown export format")
-        features = []
+
-        async for event in events:
+
-            features.append(
+@api.get(r"/export/segments")
-                {
+async def export_segments(req):
-                    "type": "Feature",
+    async with use_request_semaphore(req, "export_semaphore", timeout=30):
-                    "geometry": json.loads(event.geometry),
+        bbox = req.ctx.get_single_arg(
-                    "properties": {
+            "bbox", default="-180,-90,180,90"
-                        "distance_overtaker": event.distance_overtaker,
+        )
-                        "distance_stationary": event.distance_stationary,
+        assert re.match(r"(-?\d+\.?\d+,?){4}", bbox)
-                        "direction": -1 if event.direction_reversed else 1,
+        fmt = req.ctx.get_single_arg("fmt", convert=ExportFormat)
-                        "way_id": event.way_id,
+        segments = await req.ctx.db.stream(
-                        "course": event.course,
+            text(
-                        "speed": event.speed,
+                f"select ST_AsGeoJSON(ST_Transform(geometry,4326)) AS geometry, way_id, distance_overtaker_mean, distance_overtaker_min,distance_overtaker_max,distance_overtaker_median,overtaking_event_count,usage_count,direction,zone,offset_direction,distance_overtaker_array from layer_obs_roads(ST_Transform(ST_MakeEnvelope({bbox},4326),3857),11,NULL,'1900-01-01'::timestamp,'2100-01-01'::timestamp) WHERE usage_count>0"
-                        "time": event.time,
-                    },
-                }
             )
+        )
 
-        geojson = {"type": "FeatureCollection", "features": features}
+        if fmt == ExportFormat.SHAPEFILE:
-        return json_response(geojson)
+            with shapefile_zip(shape_type=3, basename="segments") as (writer, zip_buffer):
+                writer.field("distance_overtaker_mean", "N", decimal=4)
+                writer.field("distance_overtaker_max", "N", decimal=4)
+                writer.field("distance_overtaker_min", "N", decimal=4)
+                writer.field("distance_overtaker_median", "N", decimal=4)
+                writer.field("overtaking_event_count", "N", decimal=4)
+                writer.field("usage_count", "N", decimal=4)
+                writer.field("way_id", "N", decimal=0)
+                writer.field("direction", "N", decimal=0)
+                writer.field("zone", "C")
 
-    raise InvalidUsage("unknown export format")
+                async for segment in segments:
+                    geom = json.loads(segment.st_asgeojson)
+                    writer.line([geom["coordinates"]])
+                    writer.record(
+                        distance_overtaker_mean=segment.distance_overtaker_mean,
+                        distance_overtaker_median=segment.distance_overtaker_median,
+                        distance_overtaker_max=segment.distance_overtaker_max,
+                        distance_overtaker_min=segment.distance_overtaker_min,
+                        usage_count=segment.usage_count,
+                        overtaking_event_count=segment.overtaking_event_count,
+                        direction=segment.direction,
+                        way_id=segment.way_id,
+                        zone=segment.zone,
+                    )
+
+            return raw(zip_buffer.getbuffer())
+
+        if fmt == ExportFormat.GEOJSON:
+            features = []
+            async for segment in segments:
+                features.append(
+                    {
+                        "type": "Feature",
+                        "geometry": json.loads(segment.geometry),
+                        "properties": {
+                            "distance_overtaker_mean": segment.distance_overtaker_mean,
+                            "distance_overtaker_max": segment.distance_overtaker_max,
+                            "distance_overtaker_median": segment.distance_overtaker_median,
+                            "overtaking_event_count": segment.overtaking_event_count,
+                            "usage_count": segment.usage_count,
+                            "distance_overtaker_array": segment.distance_overtaker_array,
+                            "direction": segment.direction,
+                            "way_id": segment.way_id,
+                            "zone": segment.zone,
+                        },
+                    }
+                )
+
+            geojson = {"type": "FeatureCollection", "features": features}
+            return json_response(geojson)
+
+        raise InvalidUsage("unknown export format")

api/obs/api/routes/frontend.py

@@ -14,22 +14,18 @@ if app.config.FRONTEND_CONFIG:
             **req.app.config.FRONTEND_CONFIG,
             "apiUrl": f"{req.ctx.api_url}/api",
             "loginUrl": f"{req.ctx.api_url}/login",
-            "obsMapSource": (
+            "obsMapSource": {
-                None
+                "type": "vector",
-                if app.config.LEAN_MODE
+                "tiles": [
-                else {
+                    req.ctx.api_url
-                    "type": "vector",
+                    + req.app.url_for("tiles", zoom="000", x="111", y="222.pbf")
-                    "tiles": [
+                    .replace("000", "{z}")
-                        req.ctx.api_url
+                    .replace("111", "{x}")
-                        + req.app.url_for("tiles", zoom="000", x="111", y="222.pbf")
+                    .replace("222", "{y}")
-                        .replace("000", "{z}")
+                ],
-                        .replace("111", "{x}")
+                "minzoom": 0,
-                        .replace("222", "{y}")
+                "maxzoom": 14,
-                    ],
+            },
-                    "minzoom": 12,
-                    "maxzoom": 14,
-                }
-            ),
         }
 
         return response.json(result)

api/obs/api/routes/login.py

@@ -170,4 +170,4 @@ async def logout(req):
     auth_req = client.construct_EndSessionRequest(state=session["state"])
     logout_url = auth_req.request(client.end_session_endpoint)
 
-    return redirect(logout_url + f"&redirect_uri={req.ctx.api_url}/logout")
+    return redirect(logout_url + f"&post_logout_redirect_uri={req.ctx.api_url}/logout")

api/obs/api/routes/mapdetails.py

@@ -18,14 +18,16 @@ round_speed = partial(round_to, multiples=0.1)
 
 log = logging.getLogger(__name__)
 
-def get_bearing(a, b):
+
+def get_bearing(b, a):
     # longitude, latitude
     dL = b[0] - a[0]
     X = numpy.cos(b[1]) * numpy.sin(dL)
     Y = numpy.cos(a[1]) * numpy.sin(b[1]) - numpy.sin(a[1]) * numpy.cos(
         b[1]
     ) * numpy.cos(dL)
-    return numpy.arctan2(X, Y)
+    return numpy.arctan2(Y, X) + 0.5 * math.pi
+
 
 # Bins for histogram on overtaker distances. 0, 0.25, ... 2.25, infinity
 DISTANCE_BINS = numpy.arange(0, 2.5, 0.25).tolist() + [float('inf')]
@@ -82,11 +84,11 @@ async def mapdetails_road(req):
     arrays = numpy.array(arrays).T
 
     if len(arrays) == 0:
-        arrays = numpy.array([[], [], [], []], dtype=numpy.float)
+        arrays = numpy.array([[], [], [], []], dtype=float)
 
     data, mask = arrays[:-1], arrays[-1]
     data = data.astype(numpy.float64)
-    mask = mask.astype(numpy.bool)
+    mask = mask.astype(bool)
 
     def partition(arr, cond):
         return arr[:, cond], arr[:, ~cond]

api/obs/api/routes/stats.py

@@ -4,12 +4,12 @@ from typing import Optional
 from operator import and_
 from functools import reduce
 
-from sqlalchemy import select, func
+from sqlalchemy import distinct, select, func, desc
 
 from sanic.response import json
 
 from obs.api.app import api
-from obs.api.db import Track, OvertakingEvent, User
+from obs.api.db import Track, OvertakingEvent, User, Region, UserDevice
 from obs.api.utils import round_to
 
 
@@ -92,6 +92,14 @@ async def stats(req):
             .where(track_condition)
         )
     ).scalar()
+    device_count = (
+        await req.ctx.db.execute(
+            select(func.count(distinct(UserDevice.id)))
+            .select_from(UserDevice)
+            .join(Track.user_device)
+            .where(track_condition)
+        )
+    ).scalar()
 
     result = {
         "numEvents": event_count,
@@ -100,6 +108,7 @@ async def stats(req):
         "trackDuration": round_to(track_duration or 0, TRACK_DURATION_ROUNDING),
         "publicTrackCount": public_track_count,
         "trackCount": track_count,
+        "deviceCount": device_count,
     }
 
     return json(result)
@@ -167,3 +176,31 @@ async def stats(req):
 #     });
 #   }),
 # );
+
+
+@api.route("/stats/regions")
+async def stats(req):
+    query = (
+        select(
+            [
+                Region.id,
+                Region.name,
+                func.count(OvertakingEvent.id).label("overtaking_event_count"),
+            ]
+        )
+        .select_from(Region)
+        .join(
+            OvertakingEvent,
+            func.ST_Within(OvertakingEvent.geometry, Region.geometry),
+        )
+        .group_by(
+            Region.id,
+            Region.name,
+            Region.geometry,
+        )
+        .having(func.count(OvertakingEvent.id) > 0)
+        .order_by(desc("overtaking_event_count"))
+    )
+
+    regions = list(map(dict, (await req.ctx.db.execute(query)).all()))
+    return json(regions)

api/obs/api/routes/tiles.py

@@ -7,10 +7,10 @@ import dateutil.parser
 from sanic.exceptions import Forbidden, InvalidUsage
 from sanic.response import raw
 
-from sqlalchemy import select, text
+from sqlalchemy import text
-from sqlalchemy.sql.expression import table, column
 
 from obs.api.app import app
+from obs.api.utils import use_request_semaphore
 
 
 def get_tile(filename, zoom, x, y):
@@ -87,24 +87,25 @@ def get_filter_options(
 
 @app.route(r"/tiles/<zoom:int>/<x:int>/<y:(\d+)\.pbf>")
 async def tiles(req, zoom: int, x: int, y: str):
-    if app.config.get("TILES_FILE"):
+    async with use_request_semaphore(req, "tile_semaphore"):
-        tile = get_tile(req.app.config.TILES_FILE, int(zoom), int(x), int(y))
+        if app.config.get("TILES_FILE"):
+            tile = get_tile(req.app.config.TILES_FILE, int(zoom), int(x), int(y))
 
-    else:
+        else:
-        user_id, start, end = get_filter_options(req)
+            user_id, start, end = get_filter_options(req)
 
-        tile = await req.ctx.db.scalar(
+            tile = await req.ctx.db.scalar(
-            text(
+                text(
-                f"select data from getmvt(:zoom, :x, :y, :user_id, :min_time, :max_time) as b(data, key);"
+                    f"select data from getmvt(:zoom, :x, :y, :user_id, :min_time, :max_time) as b(data, key);"
-            ).bindparams(
+                ).bindparams(
-                zoom=int(zoom),
+                    zoom=int(zoom),
-                x=int(x),
+                    x=int(x),
-                y=int(y),
+                    y=int(y),
-                user_id=user_id,
+                    user_id=user_id,
-                min_time=start,
+                    min_time=start,
-                max_time=end,
+                    max_time=end,
+                )
             )
-        )
 
     gzip = "gzip" in req.headers["accept-encoding"]
 

api/obs/api/routes/tracks.py

@@ -1,16 +1,18 @@
 import logging
 import re
+from datetime import date
 from json import load as jsonload
 from os.path import join, exists, isfile
 
-from sqlalchemy import select, func
+from sanic.exceptions import InvalidUsage, NotFound, Forbidden
+from sanic.response import file_stream, empty
+from slugify import slugify
+from sqlalchemy import select, func, and_
 from sqlalchemy.orm import joinedload
 
-from obs.api.db import Track, User, Comment, DuplicateTrackFileError
 from obs.api.app import api, require_auth, read_api_key, json
-
+from obs.api.db import Track, Comment, DuplicateTrackFileError
-from sanic.response import file_stream, empty
+from obs.api.utils import tar_of_tracks
-from sanic.exceptions import InvalidUsage, NotFound, Forbidden
 
 log = logging.getLogger(__name__)
 
@@ -23,8 +25,8 @@ def normalize_user_agent(user_agent):
     return m[0] if m else None
 
 
-async def _return_tracks(req, extend_query, limit, offset):
+async def _return_tracks(req, extend_query, limit, offset, order_by=None):
-    if limit <= 0 or limit > 100:
+    if limit <= 0 or limit > 1000:
         raise InvalidUsage("invalid limit")
 
     if offset < 0:
@@ -39,7 +41,7 @@ async def _return_tracks(req, extend_query, limit, offset):
         extend_query(select(Track).options(joinedload(Track.author)))
         .limit(limit)
         .offset(offset)
-        .order_by(Track.created_at.desc())
+        .order_by(order_by if order_by is not None else Track.created_at)
     )
 
     tracks = (await req.ctx.db.execute(query)).scalars()
@@ -76,16 +78,101 @@ async def get_tracks(req):
     return await _return_tracks(req, extend_query, limit, offset)
 
 
+def parse_boolean(s):
+    if s is None:
+        return None
+
+    s = s.lower()
+    if s in ("true", "1", "yes", "y", "t"):
+        return True
+    if s in ("false", "0", "no", "n", "f"):
+        return False
+
+    raise ValueError("invalid value for boolean")
+
+
 @api.get("/tracks/feed")
 @require_auth
 async def get_feed(req):
     limit = req.ctx.get_single_arg("limit", default=20, convert=int)
     offset = req.ctx.get_single_arg("offset", default=0, convert=int)
+    user_device_id = req.ctx.get_single_arg("user_device_id", default=None, convert=int)
+
+    order_by_columns = {
+        "recordedAt": Track.recorded_at,
+        "title": Track.title,
+        "visibility": Track.public,
+        "length": Track.length,
+        "duration": Track.duration,
+        "user_device_id": Track.user_device_id,
+    }
+    order_by = req.ctx.get_single_arg(
+        "order_by", default=None, convert=order_by_columns.get
+    )
+
+    reversed_ = req.ctx.get_single_arg("reversed", convert=parse_boolean, default=False)
+    if reversed_:
+        order_by = order_by.desc()
+
+    public = req.ctx.get_single_arg("public", convert=parse_boolean, default=None)
 
     def extend_query(q):
-        return q.where(Track.author_id == req.ctx.user.id)
+        q = q.where(Track.author_id == req.ctx.user.id)
 
-    return await _return_tracks(req, extend_query, limit, offset)
+        if user_device_id is not None:
+            q = q.where(Track.user_device_id == user_device_id)
+
+        if public is not None:
+            q = q.where(Track.public == public)
+
+        return q
+
+    return await _return_tracks(req, extend_query, limit, offset, order_by)
+
+
+@api.post("/tracks/bulk")
+@require_auth
+async def tracks_bulk_action(req):
+    body = req.json
+    action = body["action"]
+    track_slugs = body["tracks"]
+
+    if action not in ("delete", "makePublic", "makePrivate", "reprocess", "download"):
+        raise InvalidUsage("invalid action")
+
+    query = select(Track).where(
+        and_(Track.author_id == req.ctx.user.id, Track.slug.in_(track_slugs))
+    )
+
+    files = set()
+
+    for track in (await req.ctx.db.execute(query)).scalars():
+        if action == "delete":
+            await req.ctx.db.delete(track)
+        elif action == "makePublic":
+            if not track.public:
+                track.queue_processing()
+            track.public = True
+        elif action == "makePrivate":
+            if track.public:
+                track.queue_processing()
+            track.public = False
+        elif action == "reprocess":
+            track.queue_processing()
+        elif action == "download":
+            files.add(track.get_original_file_path(req.app.config))
+
+    await req.ctx.db.commit()
+
+    if action == "download":
+        username_slug = slugify(req.ctx.user.username, separator="-")
+        date_str = date.today().isoformat()
+        file_basename = f"tracks_{username_slug}_{date_str}"
+
+        await tar_of_tracks(req, files, file_basename)
+        return
+
+    return empty()
 
 
 @api.post("/tracks")

api/obs/api/routes/users.py

@@ -1,9 +1,11 @@
 import logging
 
 from sanic.response import json
-from sanic.exceptions import InvalidUsage
+from sanic.exceptions import InvalidUsage, Forbidden, NotFound
+from sqlalchemy import and_, select
 
 from obs.api.app import api, require_auth
+from obs.api.db import UserDevice
 
 log = logging.getLogger(__name__)
 
@@ -28,6 +30,48 @@ async def get_user(req):
     return json(user_to_json(req.ctx.user) if req.ctx.user else None)
 
 
+@api.get("/user/devices")
+async def get_user_devices(req):
+    if not req.ctx.user:
+        raise Forbidden()
+
+    query = (
+        select(UserDevice)
+        .where(UserDevice.user_id == req.ctx.user.id)
+        .order_by(UserDevice.id)
+    )
+
+    devices = (await req.ctx.db.execute(query)).scalars()
+
+    return json([device.to_dict(req.ctx.user.id) for device in devices])
+
+
+@api.put("/user/devices/<device_id:int>")
+async def put_user_device(req, device_id):
+    if not req.ctx.user:
+        raise Forbidden()
+
+    body = req.json
+
+    query = (
+        select(UserDevice)
+        .where(and_(UserDevice.user_id == req.ctx.user.id, UserDevice.id == device_id))
+        .limit(1)
+    )
+
+    device = (await req.ctx.db.execute(query)).scalar()
+
+    if device is None:
+        raise NotFound()
+
+    new_name = body.get("displayName", "").strip()
+    if new_name and device.display_name != new_name:
+        device.display_name = new_name
+        await req.ctx.db.commit()
+
+    return json(device.to_dict())
+
+
 @api.put("/user")
 @require_auth
 async def put_user(req):

api/obs/api/utils.py

@@ -1,6 +1,15 @@
+import asyncio
+from contextlib import asynccontextmanager
 from datetime import datetime
+import logging
+from os.path import commonpath, join, relpath
+import queue
+import tarfile
+
 import dateutil.parser
-from sanic.exceptions import InvalidUsage
+from sanic.exceptions import InvalidUsage, ServiceUnavailable
+
+log = logging.getLogger(__name__)
 
 RAISE = object()
 
@@ -30,3 +39,124 @@ def round_to(value: float, multiples: float) -> float:
     if value is None:
         return None
     return round(value / multiples) * multiples
+
+
+def chunk_list(lst, n):
+    for s in range(0, len(lst), n):
+        yield lst[s : s + n]
+
+
+class chunk:
+    def __init__(self, iterable, n):
+        self.iterable = iterable
+        self.n = n
+
+    def __iter__(self):
+        if isinstance(self.iterable, list):
+            yield from chunk_list(self.iterable, self.n)
+            return
+
+        it = iter(self.iterable)
+        while True:
+            current = []
+            try:
+                for _ in range(self.n):
+                    current.append(next(it))
+                yield current
+            except StopIteration:
+                if current:
+                    yield current
+                break
+
+    async def __aiter__(self):
+        if hasattr(self.iterable, "__iter__"):
+            for item in self:
+                yield item
+            return
+
+        it = self.iterable.__aiter__()
+        while True:
+            current = []
+            try:
+                for _ in range(self.n):
+                    current.append(await it.__anext__())
+                yield current
+            except StopAsyncIteration:
+                if len(current):
+                    yield current
+                break
+
+
+async def tar_of_tracks(req, files, file_basename="tracks"):
+    response = await req.respond(
+        content_type="application/x-gtar",
+        headers={
+            "content-disposition": f'attachment; filename="{file_basename}.tar.bz2"'
+        },
+    )
+
+    helper = StreamerHelper(response)
+
+    tar = tarfile.open(name=None, fileobj=helper, mode="w|bz2", bufsize=256 * 512)
+
+    root = commonpath(list(files))
+    for fname in files:
+        log.info("Write file to tar: %s", fname)
+        with open(fname, "rb") as fobj:
+            tarinfo = tar.gettarinfo(fname)
+            tarinfo.name = join(file_basename, relpath(fname, root))
+            tar.addfile(tarinfo, fobj)
+            await helper.send_all()
+    tar.close()
+    await helper.send_all()
+
+    await response.eof()
+
+
+class StreamerHelper:
+    def __init__(self, response):
+        self.response = response
+        self.towrite = queue.Queue()
+
+    def write(self, data):
+        self.towrite.put(data)
+
+    async def send_all(self):
+        while True:
+            try:
+                tosend = self.towrite.get(block=False)
+                await self.response.send(tosend)
+            except queue.Empty:
+                break
+
+
+@asynccontextmanager
+async def use_request_semaphore(req, semaphore_name, timeout=10):
+    """
+    If configured, acquire a semaphore for the map tile request and release it
+    after the context has finished.
+
+    If the semaphore cannot be acquired within the timeout, issue a 503 Service
+    Unavailable error response that describes that the database is overloaded,
+    so users know what the problem is.
+
+    Operates as a noop when the tile semaphore is not enabled.
+    """
+    semaphore = getattr(req.app.ctx, semaphore_name, None)
+
+    if semaphore is None:
+        yield
+        return
+
+    try:
+        await asyncio.wait_for(semaphore.acquire(), timeout)
+
+        try:
+            yield
+        finally:
+            semaphore.release()
+
+    except asyncio.TimeoutError:
+        raise ServiceUnavailable(
+            "Too many requests, database overloaded. Please retry later."
+        )

api/obs/bin/openbikesensor_api.py

@@ -58,7 +58,7 @@ def main():
         port=app.config.PORT,
         debug=debug,
         auto_reload=app.config.get("AUTO_RELOAD", debug),
-        # access_log=False,
+        access_log=True,
     )
 
 

api/requirements.txt

@@ -1,14 +1,22 @@
 coloredlogs~=15.0.1
-sanic~=22.6.0
+sanic==22.6.2
-oic~=1.3.0
+oic~=1.5.0
 sanic-session~=0.8.0
-sanic-cors~=2.0.1
 python-slugify~=6.1.2
-motor~=3.0.0
+motor~=3.1.1
 pyyaml<6
 -e git+https://github.com/openmaptiles/openmaptiles-tools#egg=openmaptiles-tools
-sqlparse~=0.4.2
+sqlparse~=0.4.3
-sqlalchemy[asyncio]~=1.4.39
+sqlalchemy[asyncio]~=1.4.46
-asyncpg~=0.24.0
+asyncpg~=0.27.0
 pyshp~=2.3.1
-alembic~=1.7.7
+alembic~=1.9.4
+stream-zip~=0.0.50
+msgpack~=1.0.5
+osmium~=3.6.0
+psycopg~=3.1.8
+shapely~=2.0.1
+pyproj~=3.4.1
+aiohttp~=3.8.1
+# sanic requires websocets and chockes on >=10 in 2022.6.2
+websockets<11

api/scripts

@@ -1 +1 @@
-Subproject commit 8e9395fd3cd0f1e83b4413546bc2d3cb0c726738
+Subproject commit f513117e275be20008afa1e1fd2499698313a81d

api/setup.py

@@ -11,19 +11,19 @@ setup(
     package_data={},
     install_requires=[
         "coloredlogs~=15.0.1",
-        "sanic>=21.9.3,<22.7.0",
+        "sanic==22.6.2",
         "oic>=1.3.0, <2",
         "sanic-session~=0.8.0",
-        "sanic-cors~=2.0.1",
         "python-slugify>=5.0.2,<6.2.0",
-        "motor>=2.5.1,<3.1.0",
+        "motor>=2.5.1,<3.1.2",
         "pyyaml<6",
-        "sqlparse~=0.4.2",
+        "sqlparse~=0.4.3",
         "openmaptiles-tools",  # install from git
         "pyshp>=2.2,<2.4",
-        "sqlalchemy[asyncio]~=1.4.25",
+        "sqlalchemy[asyncio]~=1.4.46",
-        "asyncpg~=0.24.0",
+        "asyncpg~=0.27.0",
-        "alembic~=1.7.7",
+        "alembic~=1.9.4",
+        "stream-zip~=0.0.50",
     ],
     entry_points={
         "console_scripts": [

api/tools/import_osm.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+
+from dataclasses import dataclass
+import asyncio
+from os.path import basename, splitext
+import sys
+import logging
+
+import msgpack
+import psycopg
+
+from obs.api.app import app
+from obs.api.utils import chunk
+
+log = logging.getLogger(__name__)
+
+
+ROAD_BUFFER = 1000
+AREA_BUFFER = 100
+
+
+@dataclass
+class Road:
+    way_id: int
+    name: str
+    zone: str
+    directionality: int
+    oneway: int
+    geometry: bytes
+
+
+def read_file(filename):
+    """
+    Reads a file iteratively, yielding
+    appear. Those may be mixed.
+    """
+
+    with open(filename, "rb") as f:
+        unpacker = msgpack.Unpacker(f)
+        try:
+            while True:
+                type_id, *data = unpacker.unpack()
+
+                if type_id == b"\x01":
+                    yield Road(*data)
+
+        except msgpack.OutOfData:
+            pass
+
+
+async def import_osm(connection, filename, import_group=None):
+    if import_group is None:
+        import_group = splitext(basename(filename))[0]
+
+    # Pass 1: Find IDs only
+    road_ids = []
+    for item in read_file(filename):
+        road_ids.append(item.way_id)
+
+    async with connection.cursor() as cursor:
+        log.info("Pass 1: Delete previously imported data")
+
+        log.debug("Delete import group %s", import_group)
+        await cursor.execute(
+            "DELETE FROM road WHERE import_group = %s", (import_group,)
+        )
+
+        log.debug("Delete roads by way_id")
+        for ids in chunk(road_ids, 10000):
+            await cursor.execute("DELETE FROM road WHERE way_id = ANY(%s)", (ids,))
+
+        # Pass 2: Import
+        log.info("Pass 2: Import roads")
+        amount = 0
+        for items in chunk(read_file(filename), 10000):
+            amount += 10000
+            log.info(f"...{amount}/{len(road_ids)} ({100*amount/len(road_ids)}%)")
+            async with cursor.copy(
+                "COPY road (way_id, name, zone, directionality, oneway, geometry, import_group) FROM STDIN"
+            ) as copy:
+                for item in items:
+                    await copy.write_row(
+                        (
+                            item.way_id,
+                            item.name,
+                            item.zone,
+                            item.directionality,
+                            item.oneway,
+                            bytes.hex(item.geometry),
+                            import_group,
+                        )
+                    )
+
+
+async def main():
+    logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s")
+
+    url = app.config.POSTGRES_URL
+    url = url.replace("+asyncpg", "")
+
+    async with await psycopg.AsyncConnection.connect(url) as connection:
+        for filename in sys.argv[1:]:
+            log.debug("Loading file: %s", filename)
+            await import_osm(connection, filename)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

api/tools/import_regions.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+"""
+This script downloads and/or imports regions for statistical analysis into the
+PostGIS database. The regions are sourced from:
+
+* EU countries are covered by
+  [NUTS](https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units/nuts).
+"""
+
+import tempfile
+from dataclasses import dataclass
+import json
+import asyncio
+from os.path import basename, splitext
+import sys
+import logging
+from typing import Optional
+
+import aiohttp
+import psycopg
+
+from obs.api.app import app
+from obs.api.utils import chunk
+
+log = logging.getLogger(__name__)
+
+NUTS_URL = "https://gisco-services.ec.europa.eu/distribution/v2/nuts/geojson/NUTS_RG_01M_2021_3857.geojson"
+
+from pyproj import Transformer
+
+project = Transformer.from_crs("EPSG:4326", "EPSG:3857", always_xy=True).transform
+from shapely.ops import transform
+from shapely.geometry import shape
+import shapely.wkb as wkb
+
+
+async def import_nuts(
+    connection, filename=None, level: int = 3, import_group: Optional[str] = None
+):
+    if import_group is None:
+        import_group = f"nuts{level}"
+
+    if filename:
+        log.info("Load NUTS from file")
+        with open(filename) as f:
+            data = json.load(f)
+    else:
+        log.info("Download NUTS regions from europa.eu")
+        async with aiohttp.ClientSession() as session:
+            async with session.get(NUTS_URL) as resp:
+                data = await resp.json(content_type=None)
+
+    async with connection.cursor() as cursor:
+        log.info(
+            "Delete previously imported regions with import group %s", import_group
+        )
+        await cursor.execute(
+            "DELETE FROM region WHERE import_group = %s", (import_group,)
+        )
+
+        log.info("Import regions")
+        async with cursor.copy(
+            "COPY region (id, name, geometry, import_group) FROM STDIN"
+        ) as copy:
+            for feature in data["features"]:
+                if feature["properties"]["LEVL_CODE"] == level:
+                    geometry = shape(feature["geometry"])
+                    # geometry = transform(project, geometry)
+                    geometry = wkb.dumps(geometry)
+                    geometry = bytes.hex(geometry)
+                    await copy.write_row(
+                        (
+                            feature["properties"]["NUTS_ID"],
+                            feature["properties"]["NUTS_NAME"],
+                            geometry,
+                            import_group,
+                        )
+                    )
+
+
+async def main():
+    logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s")
+
+    url = app.config.POSTGRES_URL
+    url = url.replace("+asyncpg", "")
+
+    async with await psycopg.AsyncConnection.connect(url) as connection:
+        await import_nuts(connection, sys.argv[1] if len(sys.argv) > 1 else None)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

api/tools/reimport_tracks.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+import logging
+import asyncio
+
+from sqlalchemy import text
+
+from obs.api.app import app
+from obs.api.db import connect_db, make_session
+
+log = logging.getLogger(__name__)
+
+async def main():
+    logging.basicConfig(level=logging.DEBUG, format="%(levelname)s: %(message)s")
+    await reimport_tracks()
+
+
+async def reimport_tracks():
+
+    async with connect_db(
+        app.config.POSTGRES_URL,
+        app.config.POSTGRES_POOL_SIZE,
+        app.config.POSTGRES_MAX_OVERFLOW,
+    ):
+        async with make_session() as session:
+            await session.execute(text("UPDATE track SET processing_status = 'queued';"))
+            await session.commit()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

api/tools/transform_osm.py

@@ -0,0 +1,181 @@
+#!/usr/bin/env python3
+
+import sys
+import re
+import msgpack
+
+import osmium
+import shapely.wkb as wkb
+from shapely.ops import transform
+
+HIGHWAY_TYPES = {
+    "trunk",
+    "primary",
+    "secondary",
+    "tertiary",
+    "unclassified",
+    "residential",
+    "trunk_link",
+    "primary_link",
+    "secondary_link",
+    "tertiary_link",
+    "living_street",
+    "service",
+    "track",
+    "road",
+}
+ZONE_TYPES = {
+    "urban",
+    "rural",
+    "motorway",
+}
+URBAN_TYPES = {
+    "residential",
+    "living_street",
+    "road",
+}
+MOTORWAY_TYPES = {
+    "motorway",
+    "motorway_link",
+}
+
+ADMIN_LEVEL_MIN = 2
+ADMIN_LEVEL_MAX = 8
+MINSPEED_RURAL = 60
+
+ONEWAY_YES = {"yes", "true", "1"}
+ONEWAY_REVERSE = {"reverse", "-1"}
+
+
+def parse_number(tag):
+    if not tag:
+        return None
+
+    match = re.search(r"[0-9]+", tag)
+    if not match:
+        return None
+
+    digits = match.group(0)
+    try:
+        return int(digits)
+    except ValueError:
+        return None
+
+
+def determine_zone(tags):
+    highway = tags.get("highway")
+    zone = tags.get("zone:traffic")
+
+    if zone is not None:
+        if "rural" in zone:
+            return "rural"
+
+        if "motorway" in zone:
+            return "motorway"
+
+        return "urban"
+
+    # From here on we are guessing based on other tags
+
+    if highway in URBAN_TYPES:
+        return "urban"
+
+    if highway in MOTORWAY_TYPES:
+        return "motorway"
+
+    maxspeed_source = tags.get("source:maxspeed")
+    if maxspeed_source and "rural" in maxspeed_source:
+        return "rural"
+    if maxspeed_source and "urban" in maxspeed_source:
+        return "urban"
+
+    for key in ["maxspeed", "maxspeed:forward", "maxspeed:backward"]:
+        maxspeed = parse_number(tags.get(key))
+        if maxspeed is not None and maxspeed > MINSPEED_RURAL:
+            return "rural"
+
+    # default to urban if we have no idea
+    return "urban"
+
+
+def determine_direction(tags, zone):
+    if (
+        tags.get("oneway") in ONEWAY_YES
+        or tags.get("junction") == "roundabout"
+        or zone == "motorway"
+    ):
+        return 1, True
+
+    if tags.get("oneway") in ONEWAY_REVERSE:
+        return -1, True
+
+    return 0, False
+
+
+class StreamPacker:
+    def __init__(self, stream, *args, **kwargs):
+        self.stream = stream
+        self.packer = msgpack.Packer(*args, autoreset=False, **kwargs)
+
+    def _write_out(self):
+        if hasattr(self.packer, "getbuffer"):
+            chunk = self.packer.getbuffer()
+        else:
+            chunk = self.packer.bytes()
+
+        self.stream.write(chunk)
+        self.packer.reset()
+
+    def pack(self, *args, **kwargs):
+        self.packer.pack(*args, **kwargs)
+        self._write_out()
+
+    def pack_array_header(self, *args, **kwargs):
+        self.packer.pack_array_header(*args, **kwargs)
+        self._write_out()
+
+    def pack_map_header(self, *args, **kwargs):
+        self.packer.pack_map_header(*args, **kwargs)
+        self._write_out()
+
+    def pack_map_pairs(self, *args, **kwargs):
+        self.packer.pack_map_pairs(*args, **kwargs)
+        self._write_out()
+
+
+# A global factory that creates WKB from a osmium geometry
+wkbfab = osmium.geom.WKBFactory()
+
+from pyproj import Transformer
+
+project = Transformer.from_crs("EPSG:4326", "EPSG:3857", always_xy=True).transform
+
+
+class OSMHandler(osmium.SimpleHandler):
+    def __init__(self, packer):
+        self.packer = packer
+        super().__init__()
+
+    def way(self, way):
+        tags = way.tags
+
+        highway = tags.get("highway")
+        if not highway or highway not in HIGHWAY_TYPES:
+            return
+
+        zone = determine_zone(tags)
+        directionality, oneway = determine_direction(tags, zone)
+        name = tags.get("name")
+
+        geometry = wkb.loads(wkbfab.create_linestring(way), hex=True)
+        geometry = transform(project, geometry)
+        geometry = wkb.dumps(geometry)
+        self.packer.pack(
+            [b"\x01", way.id, name, zone, directionality, oneway, geometry]
+        )
+
+
+with open(sys.argv[2], "wb") as fout:
+    packer = StreamPacker(fout)
+    osmhandler = OSMHandler(packer)
+    osmhandler.apply_file(sys.argv[1], locations=True)

api/tools/upgrade.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
-import logging
 import asyncio
-from alembic.config import Config
+import logging
-from alembic import command
-from os.path import join, dirname
 
 log = logging.getLogger(__name__)
 
 from prepare_sql_tiles import prepare_sql_tiles, _run
 
+from import_regions import main as import_nuts
+
+from reimport_tracks import main as reimport_tracks
+
 
 async def _migrate():
     await _run("alembic upgrade head")
@@ -20,7 +21,11 @@ async def main():
     await _migrate()
     log.info("Preparing SQL tiles...")
     await prepare_sql_tiles()
-    log.info("Upgraded")
+    log.info("Importing nuts regions...")
+    await import_nuts()
+    log.info("Nuts regions imported, scheduling reimport of tracks")
+    await reimport_tracks()
+
 
 
 if __name__ == "__main__":

deployment/config/config.py

@@ -1,35 +1,30 @@
 # Bind address of the server
-#HOST = "127.0.0.1"
+# HOST = "127.0.0.1"
-#PORT = 3000
+# PORT = 3000
 
 # Extended log output, but slower
 DEBUG = False
 VERBOSE = DEBUG
-AUTO_RESTART = DEBUG
+AUTO_RELOAD = DEBUG
-
-# Turn on lean mode to simplify the setup. Lots of features will be
-# unavailable, but you will not need to manage OpenStreetMap data. Please make
-# sure to configure the OBS_FACE_CACHE_DIR correctly for lean mode.
-LEAN_MODE = False
 
 # Required to encrypt or sign sessions, cookies, tokens, etc.
-#SECRET = "!!!<<<CHANGEME>>>!!!"
+# SECRET = "!!!<<<CHANGEME>>>!!!"
 
 # Connection to the database
-#POSTGRES_URL = "postgresql+asyncpg://user:pass@host/dbname"
+# POSTGRES_URL = "postgresql+asyncpg://user:pass@host/dbname"
-#POSTGRES_POOL_SIZE = 20
+# POSTGRES_POOL_SIZE = 20
-#POSTGRES_MAX_OVERFLOW = 2 * POSTGRES_POOL_SIZE
+# POSTGRES_MAX_OVERFLOW = 2 * POSTGRES_POOL_SIZE
 
 # URL to the keycloak realm, as reachable by the API service. This is not
 # necessarily its publicly reachable URL, keycloak advertises that iself.
-#KEYCLOAK_URL = "http://localhost:1234/auth/realms/obs/"
+# KEYCLOAK_URL = "http://localhost:1234/auth/realms/obs/"
 
 # Auth client credentials
-#KEYCLOAK_CLIENT_ID = "portal"
+# KEYCLOAK_CLIENT_ID = "portal"
-#KEYCLOAK_CLIENT_SECRET = "00000000-0000-0000-0000-000000000000"
+# KEYCLOAK_CLIENT_SECRET = "00000000-0000-0000-0000-000000000000"
 
 # Whether the API should run the worker loop, or a dedicated worker is used
-#DEDICATED_WORKER = True
+# DEDICATED_WORKER = True
 
 # The root of the frontend. Needed for redirecting after login, and for CORS.
 # Set to None if frontend is served by the API.

deployment/docker-compose.yaml

@@ -14,7 +14,7 @@ services:
   ############################################################
 
   postgres:
-    image: "openmaptiles/postgis:6.0"
+    image: "openmaptiles/postgis:7.0"
     environment:
       - POSTGRES_DB=${OBS_POSTGRES_DB}
       - POSTGRES_USER=${OBS_POSTGRES_USER}
@@ -136,7 +136,7 @@ services:
       - "traefik.docker.network=gateway"
 
   postgres-keycloak:
-    image: postgres:13.3
+    image: postgres:15
     restart: always
     networks:
       - backend

docker-compose.yaml

@@ -8,7 +8,7 @@ version: '3'
 
 services:
   postgres:
-    image: "openmaptiles/postgis:6.0"
+    image: "openmaptiles/postgis:7.0"
     environment:
       POSTGRES_USER: obs
       POSTGRES_PASSWORD: obs
@@ -20,6 +20,7 @@ services:
 
   api:
     image: openbikesensor-api
+    tty: true
     build:
       context: ./api/
       dockerfile: Dockerfile
@@ -35,6 +36,8 @@ services:
       - ./tile-generator/data/:/tiles
       - ./api/migrations:/opt/obs/api/migrations
       - ./api/alembic.ini:/opt/obs/api/alembic.ini
+      - ./local/pbf:/pbf
+      - ./local/obsdata:/obsdata
     depends_on:
       - postgres
       - keycloak
@@ -46,6 +49,7 @@ services:
 
   worker:
     image: openbikesensor-api
+    tty: true
     build:
       context: ./api/
       dockerfile: Dockerfile

docs/lean-mode.md

@@ -1,57 +0,0 @@
-# Lean mode
-
-The application can be configured in "lean mode" through the `LEAN_MODE`
-setting in `config.py`. A lean installation is easier to set up, as a few steps
-can be skipped. However, the performance of the application will degrade in
-lean mode, and lots of advanced features will not be available.
-
-Lean mode is meant as an entrypoint to get started with collecting data,
-without the hassle of importing and maintaining OpenStreetMap data.
-
-## Disabled features in lean mode
-
-* No map tiles are generated.
-* The frontend will not show an overview map, only per-track maps.
-* The `roads` database table is not used, neither for processing tracks, nor
-  for generating map tiles.
-* The API will not generate auxiliary information for display on the
-  (nonexistent) map, such as per-road statistics.
-
-## Switch to/from lean mode 
-
-To enable lean mode, set the following in your `config.py` (or in
-`config.overrides.py`, especially in development setups):
-
-```python
-LEAN_MODE = True
-```
-
-To disable lean mode, set it to `False` instead.
-
-For lean mode, it is important that the config variable `OBS_FACE_CACHE_DIR` is
-properly set, or that you are happy with its default value of using
-`$DATA_DIR/obs-face-cache`.
-
-When turning off lean mode, make sure to fill your `roads` table properly, as
-otherwise the track processing will not work. When turning on lean mode, you
-may truncate the `roads` table to save space, but you don't need to, it simply
-becomes unused.
-
-## Benefits
-
-* When using lean mode, you can skip the import of OpenStreetMap data during
-  setup, and you also do not need to keep it updated. 
-* People can already start uploading data and the data is also processed,
-  giving you as a maintainer more time to set up the full application, if you
-  want to.
-
-## Drawbacks
-
-* Lean mode is less performant when processing tracks.
-* Lean mode track processing depends on the Overpass API data source, which may
-  be slow, unavailable, or rate limiting the requests, so processing may fail.
-  We use caching to prevent some issues, but as we depend on a third party
-  service here that is accessed for free and that generates a lot of server
-  load, we really can't ask for much. If you frequently run into issues, the
-  best bet is to manage OSM data yourself and turn off lean mode.
-* Of course some features are missing.

docs/osm-import.md

@@ -0,0 +1,103 @@
+# Importing OpenStreetMap data
+
+The application requires a lot of data from the OpenStreetMap to work.
+
+The required information is stored in the PostgreSQL database and used when
+processing tracks, as well as for vector tile generation. The process applies
+to both development and production setups. For development, you should choose a
+small area for testing, such as your local county or city, to keep the amount
+of data small. For production use you have to import the whole region you are
+serving.
+
+## General pipeline overview
+
+1. Download OpenStreetMap data as one or more `.osm.pbf` files.
+2. Transform this data to generate geometry data for all roads and regions, so
+   we don't need to look up nodes separately. This step requires a lot of CPU
+   and memory, so it can be done "offline" on a high power machine.
+3. Import the transformed data into the PostgreSQL/PostGIS database.
+
+## Community hosted transformed data
+
+Since the first two steps are the same for everybody, the community will soon
+provide a service where relatively up-to-date transformed data can be
+downloaded for direct import. Stay tuned.
+
+## Download data
+
+[GeoFabrik](https://download.geofabrik.de) kindly hosts extracts of the
+OpenStreetMap planet by region. Download all regions you're interested in from
+there in `.osm.pbf` format, with the tool of your choice, e. g.:
+
+```bash
+wget -P local/pbf/ https://download.geofabrik.de/europe/germany/baden-wuerttemberg-latest.osm.pbf 
+```
+
+## Transform data
+
+To transform downloaded data, you can either use the docker image from a
+development or production environment, or locally install the API into your
+python environment. Then run the `api/tools/transform_osm.py` script on the data.
+
+```bash
+api/tools/transform_osm.py baden-wuerttemberg-latest.osm.pbf baden-wuerttemberg-latest.msgpack
+```
+
+In dockerized setups, make sure to mount your data somewhere in the container
+and also mount a directory where the result can be written. The development
+setup takes care of this, so you can use:
+
+```bash
+docker-compose run --rm api tools/transform_osm.py \
+  /pbf/baden-wuerttemberg-latest.osm.pbf /obsdata/baden-wuerttemberg-latest.msgpack
+```
+
+Repeat this command for every file you want to transform.
+
+## Import transformed data
+
+The command for importing looks like this:
+
+```bash
+api/tools/import_osm.py baden-wuerttemberg-latest.msgpack
+```
+
+This tool reads your application config from `config.py`, so set that up first
+as if you were setting up your application.
+
+In dockerized setups, make sure to mount your data somewhere in the container.
+Again, the development setup takes care of this, so you can use:
+
+```bash
+docker-compose run --rm api tools/import_osm.py \
+  /obsdata/baden-wuerttemberg-latest.msgpack
+```
+
+The transform process should take a few seconds to minutes, depending on the area
+size. You can run the process multiple times, with the same or different area
+files, to import or update the data. You can update only one region and leave
+the others as they are, or add more filenames to the command line to
+bulk-import data.
+
+## How this works
+
+* The transformation is done with a python script that uses
+  [pyosmium](https://osmcode.org/pyosmium/) to read the `.osm.pbf` file. This
+  script then filters the data for only the required objects (such as road
+  segments and administrative areas), and extracts the interesting information
+  from those objects.
+* The node geolocations are looked up to generate a geometry for each object.
+  This requires a lot of memory to run efficiently.
+* The geometry is projected to [Web Mercator](https://epsg.io/3857) in this
+  step to avoid continous transformation when tiles are generated later. Most
+  operations will work fine in this projection. Projection is done with the
+  [pyproj](https://pypi.org/project/pyproj/) library.
+* The output is written to a binary file in a very simple format using
+  [msgpack](https://github.com/msgpack/msgpack-python), which is way more
+  efficient that (Geo-)JSON for example. This format is stremable, so the
+  generated file is never fully written or read into memory.
+* The import script reads the msgpack file and sends it to the database using
+  [psycopg](https://www.psycopg.org/). This is done because it supports
+  PostgreSQL's `COPY FROM` statement, which enables much faster writes to the
+  database that a traditionional `INSERT VALUES`. The file is streamed directly
+  to the database, so it is never read into memory.

docs/production-deployment.md

@@ -55,12 +55,7 @@ git clone --recursive https://github.com/openbikesensor/portal source/
 ```bash
 mkdir -p /opt/openbikesensor/config
 cd /opt/openbikesensor/
-
+cp -r source/deployment/config source/deployment/docker-compose.yaml source/deployment/.env .
-cp source/deployment/examples/docker-compose.yaml docker-compose.yaml
-cp source/deployment/examples/.env .env
-
-cp source/deployment/examples/traefik.toml config/traefik.toml
-cp source/deployment/examples/config.py config/config.py
 ```
 
 ### Create a Docker network
@@ -224,18 +219,6 @@ docker-compose build portal
 
 *Hint*: This may take up to 10 minutes. In the future, we will provide a prebuild image.
 
-#### Download OpenStreetMap maps
-
-Download the area(s) you would like to import from 
-[GeoFabrik](https://download.geofabrik.de) into `data/pbf`, for example:
-
-```bash
-cd /opt/openbikesensor/
-wget https://download.geofabrik.de/europe/germany/schleswig-holstein-latest.osm.pbf -P data/pbf
-```
-
-*Hint*: Start with a small region/city, since the import can take some hours for huge areas.
-
 #### Prepare database
 
 Run the following scripts to prepare the database:
@@ -248,13 +231,7 @@ For more details, see [README.md](../README.md) under "Prepare database".
 
 #### Import OpenStreetMap data
 
-Run the following script, to import the OSM data:
+Follow [these instructions](./osm-import.md).
-
-```
-docker-compose run --rm portal tools/osm2pgsql.sh
-```
-
-For more details. see [README.md](../README.md) under "Import OpenStreetMap data".
 
 
 #### Configure portal
@@ -320,7 +297,7 @@ You should see smth. like:
 
 When you click on *My Tracks*, you should see it on a map.
 
-#### Configre the map position
+#### Configure the map position
 
 Open the tab *Map** an zoom to the desired position. The URL contains the corresponding GPS position,
 for example:
@@ -341,10 +318,6 @@ docker-compose restart portal
 The tab *Map* should be the selected map section now.
 When you uploaded some tracks, you map should show a colors overlay on the streets.
 
-#### Verify osm2pgsql
-
-If you zoom in the tab *Map* at the imported region/city, you should see dark grey lines on the streets.
-
 ## Miscellaneous
 
 ### Logs

frontend/config.example.json

@@ -12,7 +12,7 @@
   "obsMapSource": {
     "type": "vector",
     "tiles": ["https://portal.example.com/tiles/{z}/{x}/{y}.pbf"],
-    "minzoom": 12,
+    "minzoom": 0,
     "maxzoom": 14
   }
 }

frontend/src/App.module.less

@@ -120,6 +120,15 @@
   }
 }
 
+@media @mobile {
+  .menu.menu {
+    > :global(.ui.container) {
+      height: @menuHeightMobile;
+      align-items: stretch;
+    }
+  }
+}
+
 .banner {
   padding: 8px;
   z-index: 100;

frontend/src/App.tsx

@@ -1,19 +1,27 @@
-import React from 'react'
+import React from "react";
-import classnames from 'classnames'
+import classnames from "classnames";
-import {connect} from 'react-redux'
+import { connect } from "react-redux";
-import {List, Grid, Container, Menu, Header, Dropdown} from 'semantic-ui-react'
+import {
-import {BrowserRouter as Router, Switch, Route, Link} from 'react-router-dom'
+  List,
-import {useObservable} from 'rxjs-hooks'
+  Grid,
-import {from} from 'rxjs'
+  Container,
-import {pluck} from 'rxjs/operators'
+  Menu,
-import {Helmet} from "react-helmet";
+  Header,
-import {useTranslation} from 'react-i18next'
+  Dropdown,
+} from "semantic-ui-react";
+import { BrowserRouter as Router, Switch, Route, Link } from "react-router-dom";
+import { useObservable } from "rxjs-hooks";
+import { from } from "rxjs";
+import { pluck } from "rxjs/operators";
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";
 
-import {useConfig} from 'config'
+import { useConfig } from "config";
-import styles from './App.module.less'
+import styles from "./App.module.less";
-import {AVAILABLE_LOCALES, setLocale} from 'i18n'
+import { AVAILABLE_LOCALES, setLocale } from "i18n";
 
 import {
+  AcknowledgementsPage,
   ExportPage,
   HomePage,
   LoginRedirectPage,
@@ -25,50 +33,61 @@ import {
   TrackPage,
   TracksPage,
   UploadPage,
-} from 'pages'
+  MyTracksPage,
-import {Avatar, LoginButton} from 'components'
+} from "pages";
-import api from 'api'
+import { Avatar, LoginButton } from "components";
+import api from "api";
 
 // This component removes the "navigate" prop before rendering a Menu.Item,
 // which is a workaround for an annoying warning that is somehow caused by the
 // <Link /> and <Menu.Item /> combination.
-function MenuItemForLink({navigate, ...props}) {
+function MenuItemForLink({ navigate, ...props }) {
   return (
     <Menu.Item
       {...props}
       onClick={(e) => {
-        e.preventDefault()
+        e.preventDefault();
-        navigate()
+        navigate();
       }}
     />
-  )
+  );
 }
-function DropdownItemForLink({navigate, ...props}) {
+function DropdownItemForLink({ navigate, ...props }) {
   return (
     <Dropdown.Item
       {...props}
       onClick={(e) => {
-        e.preventDefault()
+        e.preventDefault();
-        navigate()
+        navigate();
       }}
     />
-  )
+  );
 }
 
-function Banner({text, style = 'warning'}: {text: string; style: 'warning' | 'info'}) {
+function Banner({
-  return <div className={classnames(styles.banner, styles[style])}>{text}</div>
+  text,
+  style = "warning",
+}: {
+  text: string;
+  style: "warning" | "info";
+}) {
+  return <div className={classnames(styles.banner, styles[style])}>{text}</div>;
 }
 
-const App = connect((state) => ({login: state.login}))(function App({login}) {
+const App = connect((state) => ({ login: state.login }))(function App({
-  const {t} = useTranslation()
+  login,
-  const config = useConfig()
+}) {
-  const apiVersion = useObservable(() => from(api.get('/info')).pipe(pluck('version')))
+  const { t } = useTranslation();
+  const config = useConfig();
+  const apiVersion = useObservable(() =>
+    from(api.get("/info")).pipe(pluck("version"))
+  );
 
-  const hasMap = Boolean(config?.obsMapSource)
+  const hasMap = Boolean(config?.obsMapSource);
 
   React.useEffect(() => {
-    api.loadUser()
+    api.loadUser();
-  }, [])
+  }, []);
 
   return config ? (
     <Router basename={config.basename}>
@@ -77,38 +96,61 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
         <title>OpenBikeSensor Portal</title>
       </Helmet>
       {config?.banner && <Banner {...config.banner} />}
-      <Menu className={styles.menu}>
+      <Menu className={styles.menu} stackable>
         <Container>
-          <Link to="/" component={MenuItemForLink} header className={styles.pageTitle}>
+          <Link
+            to="/"
+            component={MenuItemForLink}
+            header
+            className={styles.pageTitle}
+          >
             OpenBikeSensor
           </Link>
 
           {hasMap && (
-          <Link component={MenuItemForLink} to="/map" as="a">
+            <Link component={MenuItemForLink} to="/map" as="a">
-            {t('App.menu.map')}
+              {t("App.menu.map")}
-          </Link>
+            </Link>
           )}
 
           <Link component={MenuItemForLink} to="/tracks" as="a">
-            {t('App.menu.tracks')}
+            {t("App.menu.tracks")}
           </Link>
 
           <Link component={MenuItemForLink} to="/export" as="a">
-            {t('App.menu.export')}
+            {t("App.menu.export")}
           </Link>
 
           <Menu.Menu position="right">
             {login ? (
               <>
                 <Link component={MenuItemForLink} to="/my/tracks" as="a">
-                  {t('App.menu.myTracks')}
+                  {t("App.menu.myTracks")}
                 </Link>
-                <Dropdown item trigger={<Avatar user={login} className={styles.avatar} />}>
+                <Dropdown
+                  item
+                  trigger={<Avatar user={login} className={styles.avatar} />}
+                >
                   <Dropdown.Menu>
-                    <Link to="/upload" component={DropdownItemForLink} icon="cloud upload" text={t('App.menu.uploadTracks')} />
+                    <Link
-                    <Link to="/settings" component={DropdownItemForLink} icon="cog" text={t('App.menu.settings')}/>
+                      to="/upload"
+                      component={DropdownItemForLink}
+                      icon="cloud upload"
+                      text={t("App.menu.uploadTracks")}
+                    />
+                    <Link
+                      to="/settings"
+                      component={DropdownItemForLink}
+                      icon="cog"
+                      text={t("App.menu.settings")}
+                    />
                     <Dropdown.Divider />
-                    <Link to="/logout" component={DropdownItemForLink} icon="sign-out" text={t('App.menu.logout')} />
+                    <Link
+                      to="/logout"
+                      component={DropdownItemForLink}
+                      icon="sign-out"
+                      text={t("App.menu.logout")}
+                    />
                   </Dropdown.Menu>
                 </Dropdown>
               </>
@@ -125,14 +167,16 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
         <Route path="/" exact>
           <HomePage />
         </Route>
-        {hasMap && <Route path="/map" exact>
+        {hasMap && (
-          <MapPage />
+          <Route path="/map" exact>
-        </Route>}
+            <MapPage />
+          </Route>
+        )}
         <Route path="/tracks" exact>
           <TracksPage />
         </Route>
         <Route path="/my/tracks" exact>
-          <TracksPage privateTracks />
+          <MyTracksPage />
         </Route>
         <Route path={`/tracks/:slug`} exact>
           <TrackPage />
@@ -143,6 +187,9 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
         <Route path="/export" exact>
           <ExportPage />
         </Route>
+        <Route path="/acknowledgements" exact>
+          <AcknowledgementsPage />
+        </Route>
         <Route path="/redirect" exact>
           <LoginRedirectPage />
         </Route>
@@ -169,12 +216,14 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
           <Grid columns={4} stackable>
             <Grid.Row>
               <Grid.Column>
-                <Header as="h5">
+                <Header as="h5">{t("App.footer.aboutTheProject")}</Header>
-                  {t('App.footer.aboutTheProject')}
-                </Header>
                 <List>
                   <List.Item>
-                    <a href="https://openbikesensor.org/" target="_blank" rel="noreferrer">
+                    <a
+                      href="https://openbikesensor.org/"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
                       openbikesensor.org
                     </a>
                   </List.Item>
@@ -182,68 +231,96 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
               </Grid.Column>
 
               <Grid.Column>
-                <Header as="h5">
+                <Header as="h5">{t("App.footer.getInvolved")}</Header>
-                  {t('App.footer.getInvolved')}
-                </Header>
                 <List>
                   <List.Item>
-                    <a href="https://forum.openbikesensor.org/" target="_blank" rel="noreferrer">
+                    <a
-                      {t('App.footer.getHelpInForum')}
+                      href="https://forum.openbikesensor.org/"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("App.footer.getHelpInForum")}
                     </a>
                   </List.Item>
                   <List.Item>
-                    <a href="https://github.com/openbikesensor/portal/issues/new" target="_blank" rel="noreferrer">
+                    <a
-                      {t('App.footer.reportAnIssue')}
+                      href="https://github.com/openbikesensor/portal/issues/new"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("App.footer.reportAnIssue")}
                     </a>
                   </List.Item>
                   <List.Item>
-                    <a href="https://github.com/openbikesensor/portal" target="_blank" rel="noreferrer">
+                    <a
-                      {t('App.footer.development')}
+                      href="https://github.com/openbikesensor/portal"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("App.footer.development")}
                     </a>
                   </List.Item>
                 </List>
               </Grid.Column>
 
               <Grid.Column>
-                <Header as="h5">
+                <Header as="h5">{t("App.footer.thisInstallation")}</Header>
-                  {t('App.footer.thisInstallation')}
-                </Header>
                 <List>
                   <List.Item>
-                    <a href={config?.privacyPolicyUrl} target="_blank" rel="noreferrer">
+                    <a
-                      {t('App.footer.privacyPolicy')}
+                      href={config?.privacyPolicyUrl}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("App.footer.privacyPolicy")}
                     </a>
                   </List.Item>
                   <List.Item>
-                    <a href={config?.imprintUrl} target="_blank" rel="noreferrer">
+                    <a
-                      {t('App.footer.imprint')}
+                      href={config?.imprintUrl}
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {t("App.footer.imprint")}
                     </a>
                   </List.Item>
-                  { config?.termsUrl &&
+                  {config?.termsUrl && (
-                      <List.Item>
+                    <List.Item>
-                          <a href={config?.termsUrl} target="_blank" rel="noreferrer">
+                      <a
-                               {t('App.footer.terms')}
+                        href={config?.termsUrl}
-                           </a>
+                        target="_blank"
-                       </List.Item>
+                        rel="noreferrer"
-                   }
+                      >
+                        {t("App.footer.terms")}
+                      </a>
+                    </List.Item>
+                  )}
                   <List.Item>
                     <a
                       href={`https://github.com/openbikesensor/portal${
-                        apiVersion ? `/releases/tag/${apiVersion}` : ''
+                        apiVersion ? `/releases/tag/${apiVersion}` : ""
                       }`}
                       target="_blank"
                       rel="noreferrer"
                     >
-                      {apiVersion ? t('App.footer.version', {apiVersion}) : t('App.footer.versionLoading')}
+                      {apiVersion
+                        ? t("App.footer.version", { apiVersion })
+                        : t("App.footer.versionLoading")}
                     </a>
                   </List.Item>
                 </List>
               </Grid.Column>
 
               <Grid.Column>
-                <Header as="h5">{t('App.footer.changeLanguage')}</Header>
+                <Header as="h5">{t("App.footer.changeLanguage")}</Header>
                 <List>
-                    {AVAILABLE_LOCALES.map(locale => <List.Item key={locale}><a onClick={() => setLocale(locale)}>{t(`locales.${locale}`)}</a></List.Item>)}
+                  {AVAILABLE_LOCALES.map((locale) => (
+                    <List.Item key={locale}>
+                      <a onClick={() => setLocale(locale)}>
+                        {t(`locales.${locale}`)}
+                      </a>
+                    </List.Item>
+                  ))}
                 </List>
               </Grid.Column>
             </Grid.Row>
@@ -251,7 +328,7 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
         </Container>
       </div>
     </Router>
-  ) : null
+  ) : null;
-})
+});
 
-export default App
+export default App;

frontend/src/components/ColorMapLegend.tsx

@@ -59,7 +59,7 @@ export function DiscreteColorMapLegend({map}: {map: ColorMap}) {
   )
 }
 
-export default function ColorMapLegend({map, twoTicks = false}: {map: ColorMap, twoTicks?: boolean}) {
+export default function ColorMapLegend({map, twoTicks = false, digits=2}: {map: ColorMap, twoTicks?: boolean, digits?: number}) {
   const min = map[0][0]
   const max = map[map.length - 1][0]
   const normalizeValue = (v) => (v - min) / (max - min)
@@ -81,7 +81,7 @@ export default function ColorMapLegend({map, twoTicks = false}: {map: ColorMap,
       </svg>
       {tickValues.map(([value]) => (
         <span className={styles.tick} key={value} style={{left: normalizeValue(value) * 100 + '%'}}>
-          {value.toFixed(2)}
+          {value.toFixed(digits)}
         </span>
       ))}
     </div>

frontend/src/components/Map/index.tsx

@@ -1,75 +1,70 @@
-import React, { useState, useCallback, useMemo, useEffect } from "react";
+import React, {useState, useCallback, useMemo, useEffect} from 'react'
-import classnames from "classnames";
+import classnames from 'classnames'
-import { connect } from "react-redux";
+import {connect} from 'react-redux'
-import _ from "lodash";
+import _ from 'lodash'
-import ReactMapGl, {
+import ReactMapGl, {WebMercatorViewport, ScaleControl, NavigationControl, AttributionControl} from 'react-map-gl'
-  WebMercatorViewport,
+import turfBbox from '@turf/bbox'
-  ScaleControl,
+import {useHistory, useLocation} from 'react-router-dom'
-  NavigationControl,
-  AttributionControl,
-} from "react-map-gl";
-import turfBbox from "@turf/bbox";
-import { useHistory, useLocation } from "react-router-dom";
 
-import { useConfig } from "config";
+import {useConfig} from 'config'
 
-import { useCallbackRef } from "../../utils";
+import {useCallbackRef} from '../../utils'
-import { baseMapStyles } from "../../mapstyles";
+import {baseMapStyles} from '../../mapstyles'
 
-import styles from "./styles.module.less";
+import styles from './styles.module.less'
 
 interface Viewport {
-  longitude: number;
+  longitude: number
-  latitude: number;
+  latitude: number
-  zoom: number;
+  zoom: number
 }
-const EMPTY_VIEWPORT: Viewport = { longitude: 0, latitude: 0, zoom: 0 };
+const EMPTY_VIEWPORT: Viewport = {longitude: 0, latitude: 0, zoom: 0}
 
 export const withBaseMapStyle = connect((state) => ({
-  baseMapStyle: state.mapConfig?.baseMap?.style ?? "positron",
+  baseMapStyle: state.mapConfig?.baseMap?.style ?? 'positron',
-}));
+}))
 
 function parseHash(v: string): Viewport | null {
-  if (!v) return null;
+  if (!v) return null
-  const m = v.match(/^#([0-9\.]+)\/([0-9\.\-]+)\/([0-9\.\-]+)$/);
+  const m = v.match(/^#([0-9\.]+)\/([0-9\.\-]+)\/([0-9\.\-]+)$/)
-  if (!m) return null;
+  if (!m) return null
   return {
     zoom: Number.parseFloat(m[1]),
     latitude: Number.parseFloat(m[2]),
     longitude: Number.parseFloat(m[3]),
-  };
+  }
 }
 
 function buildHash(v: Viewport): string {
-  return `${v.zoom.toFixed(2)}/${v.latitude}/${v.longitude}`;
+  return `${v.zoom.toFixed(2)}/${v.latitude}/${v.longitude}`
 }
 
 const setViewportToHash = _.debounce((history, viewport) => {
   history.replace({
     hash: buildHash(viewport),
-  });
+  })
-}, 200);
+}, 200)
 
 function useViewportFromUrl(): [Viewport | null, (v: Viewport) => void] {
-  const history = useHistory();
+  const history = useHistory()
-  const location = useLocation();
+  const location = useLocation()
 
-  const [cachedValue, setCachedValue] = useState(parseHash(location.hash));
+  const [cachedValue, setCachedValue] = useState(parseHash(location.hash))
 
   // when the location hash changes, set the new value to the cache
   useEffect(() => {
-    setCachedValue(parseHash(location.hash));
+    setCachedValue(parseHash(location.hash))
-  }, [location.hash]);
+  }, [location.hash])
 
   const setter = useCallback(
     (v) => {
-      setCachedValue(v);
+      setCachedValue(v)
-      setViewportToHash(history, v);
+      setViewportToHash(history, v)
     },
     [history]
-  );
+  )
 
-  return [cachedValue || EMPTY_VIEWPORT, setter];
+  return [cachedValue || EMPTY_VIEWPORT, setter]
 }
 
 function Map({
@@ -78,57 +73,54 @@ function Map({
   boundsFromJson,
   baseMapStyle,
   hasToolbar,
+  onViewportChange,
   ...props
 }: {
-  viewportFromUrl?: boolean;
+  viewportFromUrl?: boolean
-  children: React.ReactNode;
+  children: React.ReactNode
-  boundsFromJson: GeoJSON.Geometry;
+  boundsFromJson: GeoJSON.Geometry
-  baseMapStyle: string;
+  baseMapStyle: string
-  hasToolbar?: boolean;
+  hasToolbar?: boolean
+  onViewportChange: (viewport: Viewport) => void
 }) {
-  const [viewportState, setViewportState] = useState(EMPTY_VIEWPORT);
+  const [viewportState, setViewportState] = useState(EMPTY_VIEWPORT)
-  const [viewportUrl, setViewportUrl] = useViewportFromUrl();
+  const [viewportUrl, setViewportUrl] = useViewportFromUrl()
 
-  const [viewport, setViewport] = viewportFromUrl
+  const [viewport, setViewport_] = viewportFromUrl ? [viewportUrl, setViewportUrl] : [viewportState, setViewportState]
-    ? [viewportUrl, setViewportUrl]
+  const setViewport = useCallback(
-    : [viewportState, setViewportState];
+    (viewport: Viewport) => {
+      setViewport_(viewport)
+      onViewportChange?.(viewport)
+    },
+    [setViewport_, onViewportChange]
+  )
 
-  const config = useConfig();
+  const config = useConfig()
   useEffect(() => {
-    if (
+    if (config?.mapHome && viewport?.latitude === 0 && viewport?.longitude === 0 && !boundsFromJson) {
-      config?.mapHome &&
+      setViewport(config.mapHome)
-      viewport?.latitude === 0 &&
-      viewport?.longitude === 0 &&
-      !boundsFromJson
-    ) {
-      setViewport(config.mapHome);
     }
-  }, [config, boundsFromJson]);
+  }, [config, boundsFromJson])
 
   const mapSourceHosts = useMemo(
-    () =>
+    () => _.uniq(config?.obsMapSource?.tiles?.map((tileUrl: string) => new URL(tileUrl).host) ?? []),
-      _.uniq(
-        config?.obsMapSource?.tiles?.map(
-          (tileUrl: string) => new URL(tileUrl).host
-        ) ?? []
-      ),
     [config?.obsMapSource]
-  );
+  )
 
   const transformRequest = useCallbackRef((url, resourceType) => {
-    if (resourceType === "Tile" && mapSourceHosts.includes(new URL(url).host)) {
+    if (resourceType === 'Tile' && mapSourceHosts.includes(new URL(url).host)) {
       return {
         url,
-        credentials: "include",
+        credentials: 'include',
-      };
+      }
     }
-  });
+  })
 
   useEffect(() => {
     if (boundsFromJson) {
-      const bbox = turfBbox(boundsFromJson);
+      const bbox = turfBbox(boundsFromJson)
       if (bbox.every((v) => Math.abs(v) !== Infinity)) {
-        const [minX, minY, maxX, maxY] = bbox;
+        const [minX, minY, maxX, maxY] = bbox
         const vp = new WebMercatorViewport({
           width: 1000,
           height: 800,
@@ -141,11 +133,11 @@ function Map({
             padding: 20,
             offset: [0, -100],
           }
-        );
+        )
-        setViewport(_.pick(vp, ["zoom", "latitude", "longitude"]));
+        setViewport(_.pick(vp, ['zoom', 'latitude', 'longitude']))
       }
     }
-  }, [boundsFromJson]);
+  }, [boundsFromJson])
 
   return (
     <ReactMapGl
@@ -153,23 +145,19 @@ function Map({
       width="100%"
       height="100%"
       onViewportChange={setViewport}
-      {...{ transformRequest }}
+      {...{transformRequest}}
       {...viewport}
       {...props}
       className={classnames(styles.map, props.className)}
       attributionControl={false}
     >
-      <AttributionControl style={{ top: 0, right: 0 }} />
+      <AttributionControl style={{top: 0, right: 0}} />
-      <NavigationControl style={{ left: 16, top: hasToolbar ? 64 : 16 }} />
+      <NavigationControl style={{left: 16, top: hasToolbar ? 64 : 16}} />
-      <ScaleControl
+      <ScaleControl maxWidth={200} unit="metric" style={{left: 16, bottom: 16}} />
-        maxWidth={200}
-        unit="metric"
-        style={{ left: 16, bottom: 16 }}
-      />
 
       {children}
     </ReactMapGl>
-  );
+  )
 }
 
-export default withBaseMapStyle(Map);
+export default withBaseMapStyle(Map)

frontend/src/components/RegionStats/index.tsx

@@ -0,0 +1,73 @@
+import React, {useState, useCallback} from 'react'
+import {pickBy} from 'lodash'
+import {Loader, Statistic, Pagination, Segment, Header, Menu, Table, Icon} from 'semantic-ui-react'
+import {useObservable} from 'rxjs-hooks'
+import {of, from, concat, combineLatest} from 'rxjs'
+import {map, switchMap, distinctUntilChanged} from 'rxjs/operators'
+import {Duration, DateTime} from 'luxon'
+
+import api from 'api'
+import {useTranslation} from 'react-i18next'
+
+function formatDuration(seconds) {
+  return (
+    Duration.fromMillis((seconds ?? 0) * 1000)
+      .as('hours')
+      .toFixed(1) + ' h'
+  )
+}
+
+export default function Stats() {
+  const {t} = useTranslation()
+  const [page, setPage] = useState(1)
+  const PER_PAGE = 10
+  const stats = useObservable(
+    () => of(null).pipe(switchMap(() => concat(of(null), from(api.get('/stats/regions'))))),
+    null
+  )
+
+  const pageCount = stats ? Math.ceil(stats.length / PER_PAGE) : 1
+
+  return (
+    <>
+      <Header as="h2">{t('RegionStats.title')}</Header>
+
+      <div>
+        <Loader active={stats == null} />
+
+        <Table celled>
+          <Table.Header>
+            <Table.Row>
+              <Table.HeaderCell> {t('RegionStats.regionName')}</Table.HeaderCell>
+              <Table.HeaderCell>{t('RegionStats.eventCount')}</Table.HeaderCell>
+            </Table.Row>
+          </Table.Header>
+
+          <Table.Body>
+            {stats?.slice((page - 1) * PER_PAGE, page * PER_PAGE)?.map((area) => (
+              <Table.Row key={area.id}>
+                <Table.Cell>{area.name}</Table.Cell>
+                <Table.Cell>{area.overtaking_event_count}</Table.Cell>
+              </Table.Row>
+            ))}
+          </Table.Body>
+
+          {pageCount > 1 && (
+            <Table.Footer>
+              <Table.Row>
+                <Table.HeaderCell colSpan="2">
+                  <Pagination
+                    floated="right"
+                    activePage={page}
+                    totalPages={pageCount}
+                    onPageChange={(e, data) => setPage(data.activePage as number)}
+                  />
+                </Table.HeaderCell>
+              </Table.Row>
+            </Table.Footer>
+          )}
+        </Table>
+      </div>
+    </>
+  )
+}

frontend/src/components/Stats/index.tsx

@@ -1,118 +1,152 @@
-import React, {useState, useCallback} from 'react'
+import React, { useState, useCallback } from "react";
-import {pickBy} from 'lodash'
+import { pickBy } from "lodash";
-import {Loader, Statistic, Segment, Header, Menu} from 'semantic-ui-react'
+import { Loader, Statistic, Segment, Header, Menu } from "semantic-ui-react";
-import {useObservable} from 'rxjs-hooks'
+import { useObservable } from "rxjs-hooks";
-import {of, from, concat, combineLatest} from 'rxjs'
+import { of, from, concat, combineLatest } from "rxjs";
-import {map, switchMap, distinctUntilChanged} from 'rxjs/operators'
+import { map, switchMap, distinctUntilChanged } from "rxjs/operators";
-import {Duration, DateTime} from 'luxon'
+import { Duration, DateTime } from "luxon";
-import {useTranslation} from 'react-i18next'
+import { useTranslation } from "react-i18next";
 
-import api from 'api'
+import api from "api";
 
 function formatDuration(seconds) {
   return (
     Duration.fromMillis((seconds ?? 0) * 1000)
-      .as('hours')
+      .as("hours")
-      .toFixed(1) + ' h'
+      .toFixed(1) + " h"
-  )
+  );
 }
 
-export default function Stats({user = null}: {user?: null | string}) {
+export default function Stats({ user = null }: { user?: null | string }) {
-  const {t} = useTranslation()
+  const { t } = useTranslation();
-  const [timeframe, setTimeframe] = useState('all_time')
+  const [timeframe, setTimeframe] = useState("all_time");
-  const onClick = useCallback((_e, {name}) => setTimeframe(name), [setTimeframe])
+  const onClick = useCallback(
+    (_e, { name }) => setTimeframe(name),
+    [setTimeframe]
+  );
 
   const stats = useObservable(
     (_$, inputs$) => {
       const timeframe$ = inputs$.pipe(
         map((inputs) => inputs[0]),
         distinctUntilChanged()
-      )
+      );
 
       const user$ = inputs$.pipe(
         map((inputs) => inputs[1]),
         distinctUntilChanged()
-      )
+      );
 
       return combineLatest(timeframe$, user$).pipe(
         map(([timeframe_, user_]) => {
-          const now = DateTime.now()
+          const now = DateTime.now();
 
-          let start, end
+          let start, end;
 
           switch (timeframe_) {
-            case 'this_month':
+            case "this_month":
-              start = now.startOf('month')
+              start = now.startOf("month");
-              end = now.endOf('month')
+              end = now.endOf("month");
-              break
+              break;
 
-            case 'this_year':
+            case "this_year":
-              start = now.startOf('year')
+              start = now.startOf("year");
-              end = now.endOf('year')
+              end = now.endOf("year");
-              break
+              break;
           }
 
           return pickBy({
             start: start?.toISODate(),
             end: end?.toISODate(),
             user: user_,
-          })
+          });
         }),
-        switchMap((query) => concat(of(null), from(api.get('/stats', {query}))))
+        switchMap((query) =>
-      )
+          concat(of(null), from(api.get("/stats", { query })))
+        )
+      );
     },
     null,
     [timeframe, user]
-  )
+  );
 
-  const placeholder = t('Stats.placeholder')
+  const placeholder = t("Stats.placeholder");
 
   return (
     <>
-      <Header as="h2">{user ? t('Stats.titleUser') : t('Stats.title')}</Header>
-
       <div>
         <Segment attached="top">
           <Loader active={stats == null} />
           <Statistic.Group widths={2} size="tiny">
             <Statistic>
-              <Statistic.Value>{stats ? `${Number(stats?.trackLength / 1000).toFixed(1)} km` : placeholder}</Statistic.Value>
+              <Statistic.Value>
-              <Statistic.Label>{t('Stats.totalTrackLength')}</Statistic.Label>
+                {stats
+                  ? `${Number(stats?.trackLength / 1000).toFixed(1)} km`
+                  : placeholder}
+              </Statistic.Value>
+              <Statistic.Label>{t("Stats.totalTrackLength")}</Statistic.Label>
             </Statistic>
             <Statistic>
-              <Statistic.Value>{stats ? formatDuration(stats?.trackDuration) : placeholder}</Statistic.Value>
+              <Statistic.Value>
-              <Statistic.Label>{t('Stats.timeRecorded')}</Statistic.Label>
+                {stats ? formatDuration(stats?.trackDuration) : placeholder}
+              </Statistic.Value>
+              <Statistic.Label>{t("Stats.timeRecorded")}</Statistic.Label>
             </Statistic>
             <Statistic>
-              <Statistic.Value>{stats?.numEvents ?? placeholder}</Statistic.Value>
+              <Statistic.Value>
-              <Statistic.Label>{t('Stats.eventsConfirmed')}</Statistic.Label>
+                {stats?.numEvents ?? placeholder}
+              </Statistic.Value>
+              <Statistic.Label>{t("Stats.eventsConfirmed")}</Statistic.Label>
             </Statistic>
-            {user ? (
+            <Statistic>
-              <Statistic>
+              <Statistic.Value>
-                <Statistic.Value>{stats?.trackCount ?? placeholder}</Statistic.Value>
+                {stats?.trackCount ?? placeholder}
-                <Statistic.Label>{t('Stats.tracksRecorded')}</Statistic.Label>
+              </Statistic.Value>
-              </Statistic>
+              <Statistic.Label>{t("Stats.tracksRecorded")}</Statistic.Label>
-            ) : (
+            </Statistic>
-              <Statistic>
+            {!user && (
-                <Statistic.Value>{stats?.userCount ?? placeholder}</Statistic.Value>
+              <>
-                <Statistic.Label>{t('Stats.membersJoined')}</Statistic.Label>
+                <Statistic>
-              </Statistic>
+                  <Statistic.Value>
+                    {stats?.userCount ?? placeholder}
+                  </Statistic.Value>
+                  <Statistic.Label>{t("Stats.membersJoined")}</Statistic.Label>
+                </Statistic>
+                <Statistic>
+                  <Statistic.Value>
+                    {stats?.deviceCount ?? placeholder}
+                  </Statistic.Value>
+                  <Statistic.Label>{t("Stats.deviceCount")}</Statistic.Label>
+                </Statistic>
+              </>
             )}
           </Statistic.Group>
         </Segment>
 
         <Menu widths={3} attached="bottom" size="small">
-          <Menu.Item name="this_month" active={timeframe === 'this_month'} onClick={onClick}>
+          <Menu.Item
-            {t('Stats.thisMonth')}
+            name="this_month"
+            active={timeframe === "this_month"}
+            onClick={onClick}
+          >
+            {t("Stats.thisMonth")}
           </Menu.Item>
-          <Menu.Item name="this_year" active={timeframe === 'this_year'} onClick={onClick}>
+          <Menu.Item
-            {t('Stats.thisYear')}
+            name="this_year"
+            active={timeframe === "this_year"}
+            onClick={onClick}
+          >
+            {t("Stats.thisYear")}
           </Menu.Item>
-          <Menu.Item name="all_time" active={timeframe === 'all_time'} onClick={onClick}>
+          <Menu.Item
-            {t('Stats.allTime')}
+            name="all_time"
+            active={timeframe === "all_time"}
+            onClick={onClick}
+          >
+            {t("Stats.allTime")}
           </Menu.Item>
         </Menu>
       </div>
     </>
-  )
+  );
 }

frontend/src/components/index.js

@@ -1,4 +1,5 @@
 export {default as Avatar} from './Avatar'
+export {default as Chart} from './Chart'
 export {default as ColorMapLegend, DiscreteColorMapLegend} from './ColorMapLegend'
 export {default as FileDrop} from './FileDrop'
 export {default as FileUploadField} from './FileUploadField'
@@ -6,7 +7,7 @@ export {default as FormattedDate} from './FormattedDate'
 export {default as LoginButton} from './LoginButton'
 export {default as Map} from './Map'
 export {default as Page} from './Page'
+export {default as RegionStats} from './RegionStats'
 export {default as Stats} from './Stats'
 export {default as StripMarkdown} from './StripMarkdown'
-export {default as Chart} from './Chart'
 export {default as Visibility} from './Visibility'

frontend/src/mapstyles/index.js

@@ -1,135 +1,209 @@
-import _ from 'lodash'
+import _ from "lodash";
-import produce from 'immer'
+import produce from "immer";
 
-import bright from './bright.json'
+import bright from "./bright.json";
-import positron from './positron.json'
+import positron from "./positron.json";
 
-import viridisBase from 'colormap/res/res/viridis'
+import viridisBase from "colormap/res/res/viridis";
 
-export {bright, positron}
+export { bright, positron };
-export const baseMapStyles = {bright, positron}
+export const baseMapStyles = { bright, positron };
 
 function simplifyColormap(colormap, maxCount = 16) {
-  const result = []
+  const result = [];
-  const step = Math.ceil(colormap.length / maxCount)
+  const step = Math.ceil(colormap.length / maxCount);
   for (let i = 0; i < colormap.length; i += step) {
-    result.push(colormap[i])
+    result.push(colormap[i]);
   }
-  return result
+  return result;
 }
 
 function rgbArrayToColor(arr) {
-  return ['rgb', ...arr.map((v) => Math.round(v * 255))]
+  return ["rgb", ...arr.map((v) => Math.round(v * 255))];
 }
 
 function rgbArrayToHtml(arr) {
-  return "#" + arr.map((v) => Math.round(v * 255).toString(16)).map(v => (v.length == 1 ? '0' : '') + v).join('')
+  return (
+    "#" +
+    arr
+      .map((v) => Math.round(v * 255).toString(16))
+      .map((v) => (v.length == 1 ? "0" : "") + v)
+      .join("")
+  );
 }
 
 export function colormapToScale(colormap, value, min, max) {
   return [
-    'interpolate-hcl',
+    "interpolate-hcl",
-    ['linear'],
+    ["linear"],
     value,
-    ...colormap.flatMap((v, i, a) => [(i / (a.length - 1)) * (max - min) + min, v]),
+    ...colormap.flatMap((v, i, a) => [
-  ]
+      (i / (a.length - 1)) * (max - min) + min,
+      v,
+    ]),
+  ];
 }
 
-export const viridis = simplifyColormap(viridisBase.map(rgbArrayToColor), 20)
+export const viridis = simplifyColormap(viridisBase.map(rgbArrayToColor), 20);
-export const viridisSimpleHtml = simplifyColormap(viridisBase.map(rgbArrayToHtml), 10)
+export const viridisSimpleHtml = simplifyColormap(
-export const grayscale = ['#FFFFFF', '#000000']
+  viridisBase.map(rgbArrayToHtml),
-export const reds = [
+  10
-  'rgba( 255, 0, 0, 0)',
+);
-  'rgba( 255, 0, 0, 255)',
+export const grayscale = ["#FFFFFF", "#000000"];
-]
+export const reds = ["rgba( 255, 0, 0, 0)", "rgba( 255, 0, 0, 255)"];
 
-export function colorByCount(attribute = 'event_count', maxCount, colormap = viridis) {
+export function colorByCount(
-  return colormapToScale(colormap, ['case', isValidAttribute(attribute), ['get', attribute], 0], 0, maxCount)
+  attribute = "event_count",
+  maxCount,
+  colormap = viridis
+) {
+  return colormapToScale(
+    colormap,
+    ["case", isValidAttribute(attribute), ["get", attribute], 0],
+    0,
+    maxCount
+  );
 }
 
-var steps = {'rural': [1.6,1.8,2.0,2.2],
+var steps = { rural: [1.6, 1.8, 2.0, 2.2], urban: [1.1, 1.3, 1.5, 1.7] };
-             'urban': [1.1,1.3,1.5,1.7]}
 
 export function isValidAttribute(attribute) {
-  if (attribute.endsWith('zone')) {
+  if (attribute.endsWith("zone")) {
-    return ['in', ['get', attribute], ['literal', ['rural', 'urban']]]
+    return ["in", ["get", attribute], ["literal", ["rural", "urban"]]];
   }
-  return ['to-boolean', ['get', attribute]]
+  return ["to-boolean", ["get", attribute]];
 }
 
 export function borderByZone() {
-  return ["match", ['get', 'zone'],
+  return ["match", ["get", "zone"], "rural", "cyan", "urban", "blue", "purple"];
-  "rural", "cyan",
-  "urban", "blue",
-  "purple"
-  ]
 }
 
-export function colorByDistance(attribute = 'distance_overtaker_mean', fallback = '#ABC', zone='urban') {
+export function colorByDistance(
-
+  attribute = "distance_overtaker_mean",
+  fallback = "#ABC",
+  zone = "urban"
+) {
   return [
-    'case',
+    "case",
-    ['!', isValidAttribute(attribute)],
+    ["!", isValidAttribute(attribute)],
     fallback,
-    ["match", ['get', 'zone'], "rural",
     [
-      'step',
+      "match",
-      ['get', attribute],
+      ["get", "zone"],
-      'rgba(150, 0, 0, 1)',
+      "rural",
-      steps['rural'][0],
+      [
-      'rgba(255, 0, 0, 1)',
+        "step",
-      steps['rural'][1],
+        ["get", attribute],
-      'rgba(255, 220, 0, 1)',
+        "rgba(150, 0, 0, 1)",
-      steps['rural'][2],
+        steps["rural"][0],
-      'rgba(67, 200, 0, 1)',
+        "rgba(255, 0, 0, 1)",
-      steps['rural'][3],
+        steps["rural"][1],
-      'rgba(67, 150, 0, 1)',
+        "rgba(255, 220, 0, 1)",
-    ], "urban",
+        steps["rural"][2],
-    [
+        "rgba(67, 200, 0, 1)",
-      'step',
+        steps["rural"][3],
-      ['get', attribute],
+        "rgba(67, 150, 0, 1)",
-      'rgba(150, 0, 0, 1)',
+      ],
-      steps['urban'][0],
+      "urban",
-      'rgba(255, 0, 0, 1)',
+      [
-      steps['urban'][1],
+        "step",
-      'rgba(255, 220, 0, 1)',
+        ["get", attribute],
-      steps['urban'][2],
+        "rgba(150, 0, 0, 1)",
-      'rgba(67, 200, 0, 1)',
+        steps["urban"][0],
-      steps['urban'][3],
+        "rgba(255, 0, 0, 1)",
-      'rgba(67, 150, 0, 1)',
+        steps["urban"][1],
+        "rgba(255, 220, 0, 1)",
+        steps["urban"][2],
+        "rgba(67, 200, 0, 1)",
+        steps["urban"][3],
+        "rgba(67, 150, 0, 1)",
+      ],
+      [
+        "step",
+        ["get", attribute],
+        "rgba(150, 0, 0, 1)",
+        steps["urban"][0],
+        "rgba(255, 0, 0, 1)",
+        steps["urban"][1],
+        "rgba(255, 220, 0, 1)",
+        steps["urban"][2],
+        "rgba(67, 200, 0, 1)",
+        steps["urban"][3],
+        "rgba(67, 150, 0, 1)",
+      ],
     ],
-    [
+  ];
-      'step',
-      ['get', attribute],
-      'rgba(150, 0, 0, 1)',
-      steps['urban'][0],
-      'rgba(255, 0, 0, 1)',
-      steps['urban'][1],
-      'rgba(255, 220, 0, 1)',
-      steps['urban'][2],
-      'rgba(67, 200, 0, 1)',
-      steps['urban'][3],
-      'rgba(67, 150, 0, 1)',
-    ]
-    ]
-  ]
 }
 
 export const trackLayer = {
-  type: 'line',
+  type: "line",
   paint: {
-    'line-width': ['interpolate', ['linear'], ['zoom'], 14, 2, 17, 5],
+    "line-width": ["interpolate", ["linear"], ["zoom"], 14, 2, 17, 5],
-    'line-color': '#F06292',
+    "line-color": "#F06292",
-    'line-opacity': 0.6,
+    "line-opacity": 0.6,
   },
-}
+};
 
-export const trackLayerRaw = produce(trackLayer, draft => {
+export const getRegionLayers = (
+  adminLevel = 6,
+  baseColor = "#00897B",
+  maxValue = 5000
+) => [
+  {
+    id: "region",
+    type: "fill",
+    source: "obs",
+    "source-layer": "obs_regions",
+    minzoom: 0,
+    maxzoom: 10,
+    // filter: [">", "overtaking_event_count", 0],
+    paint: {
+      "fill-color": baseColor,
+      "fill-antialias": true,
+      "fill-opacity": [
+        "interpolate",
+        ["linear"],
+        ["log10", ["max",["get", "overtaking_event_count"],1]],
+        0,
+        0,
+        Math.log10(maxValue),
+        0.9,
+      ],
+    },
+  },
+  {
+    id: "region-border",
+    type: "line",
+    source: "obs",
+    "source-layer": "obs_regions",
+    minzoom: 0,
+    maxzoom: 10,
+    // filter: [">", "overtaking_event_count", 0],
+    paint: {
+      "line-width": [
+        "interpolate",
+        ["linear"],
+        ["log10", ["max",["get", "overtaking_event_count"],1]],
+        0,
+        0.2,
+        Math.log10(maxValue),
+        1.5,
+      ],
+      "line-color": baseColor,
+    },
+    layout: {
+      "line-join": "round",
+      "line-cap": "round",
+    },
+  },
+];
+
+export const trackLayerRaw = produce(trackLayer, (draft) => {
   // draft.paint['line-color'] = '#81D4FA'
-  draft.paint['line-width'][4] = 1
+  draft.paint["line-width"][4] = 1;
-  draft.paint['line-width'][6] = 2
+  draft.paint["line-width"][6] = 2;
-  draft.paint['line-dasharray'] = [3, 3]
+  draft.paint["line-dasharray"] = [3, 3];
-  delete draft.paint['line-opacity']
+  delete draft.paint["line-opacity"];
-})
+});
 
-export const basemap = positron
+export const basemap = positron;

frontend/src/pages/AcknowledgementsPage.tsx

@@ -0,0 +1,18 @@
+import React from "react";
+import { Header } from "semantic-ui-react";
+import { useTranslation } from "react-i18next";
+import Markdown from "react-markdown";
+
+import { Page } from "components";
+
+export default function AcknowledgementsPage() {
+  const { t } = useTranslation();
+  const title = t("AcknowledgementsPage.title");
+
+  return (
+    <Page title={title}>
+      <Header as="h2">{title}</Header>
+      <Markdown>{t("AcknowledgementsPage.information")}</Markdown>
+    </Page>
+  );
+}

frontend/src/pages/ExportPage/index.tsx

@@ -104,7 +104,7 @@ const BoundingBoxSelector = React.forwardRef(
   }
 );
 
-const MODES = ["events"];
+const MODES = ["events", "segments"];
 const FORMATS = ["geojson", "shapefile"];
 
 export default function ExportPage() {
@@ -112,7 +112,6 @@ export default function ExportPage() {
   const [bbox, setBbox] = useState("8.294678,49.651182,9.059601,50.108249");
   const [fmt, setFmt] = useState("geojson");
   const config = useConfig();
-  const exportUrl = `${config?.apiUrl}/export/events?bbox=${bbox}&fmt=${fmt}`;
   const { t } = useTranslation();
   return (
     <Page title="Export">
@@ -163,7 +162,7 @@ export default function ExportPage() {
         <Button
           primary
           as="a"
-          href={exportUrl}
+          href={`${config?.apiUrl}/export/${mode}?bbox=${bbox}&fmt=${fmt}`}
           target="_blank"
           rel="noreferrer noopener"
         >

frontend/src/pages/HomePage.tsx

@@ -6,7 +6,7 @@ import {map, switchMap} from 'rxjs/operators'
 import {useTranslation} from 'react-i18next'
 
 import api from 'api'
-import {Stats, Page} from 'components'
+import {RegionStats, Stats, Page} from 'components'
 import type {Track} from 'types'
 
 import {TrackListItem, NoPublicTracksMessage} from './TracksPage'
@@ -46,9 +46,10 @@ export default function HomePage() {
         <Grid.Row>
           <Grid.Column width={8}>
             <Stats />
+            <MostRecentTrack />
           </Grid.Column>
           <Grid.Column width={8}>
-            <MostRecentTrack />
+            <RegionStats />
           </Grid.Column>
         </Grid.Row>
       </Grid>

frontend/src/pages/MapPage/LayerSidebar.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import _ from "lodash";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import {
   List,
   Select,
@@ -19,6 +20,7 @@ import {
 } from "reducers/mapConfig";
 import { colorByDistance, colorByCount, viridisSimpleHtml } from "mapstyles";
 import { ColorMapLegend, DiscreteColorMapLegend } from "components";
+import styles from "./styles.module.less";
 
 const BASEMAP_STYLE_OPTIONS = ["positron", "bright"];
 
@@ -50,6 +52,7 @@ function LayerSidebar({
     baseMap: { style },
     obsRoads: { show: showRoads, showUntagged, attribute, maxCount },
     obsEvents: { show: showEvents },
+    obsRegions: { show: showRegions },
     filters: {
       currentUser: filtersCurrentUser,
       dateMode,
@@ -59,6 +62,15 @@ function LayerSidebar({
     },
   } = mapConfig;
 
+  const openStreetMapCopyright = (
+    <List.Item className={styles.copyright}>
+      {t("MapPage.sidebar.copyright.openStreetMap")}{" "}
+      <Link to="/acknowledgements">
+        {t("MapPage.sidebar.copyright.learnMore")}
+      </Link>
+    </List.Item>
+  );
+
   return (
     <div>
       <List relaxed>
@@ -76,6 +88,44 @@ function LayerSidebar({
             }
           />
         </List.Item>
+        {openStreetMapCopyright}
+        <Divider />
+        <List.Item>
+          <Checkbox
+            toggle
+            size="small"
+            id="obsRegions.show"
+            style={{ float: "right" }}
+            checked={showRegions}
+            onChange={() => setMapConfigFlag("obsRegions.show", !showRegions)}
+          />
+          <label htmlFor="obsRegions.show">
+            <Header as="h4">{t("MapPage.sidebar.obsRegions.title")}</Header>
+          </label>
+        </List.Item>
+        {showRegions && (
+          <>
+            <List.Item>
+              {t("MapPage.sidebar.obsRegions.colorByEventCount")}
+            </List.Item>
+            <List.Item>
+              <ColorMapLegend
+                twoTicks
+                map={[
+                  [0, "#00897B00"],
+                  [5000, "#00897BFF"],
+                ]}
+                digits={0}
+              />
+            </List.Item>
+            <List.Item className={styles.copyright}>
+              {t("MapPage.sidebar.copyright.boundaries")}{" "}
+              <Link to="/acknowledgements">
+                {t("MapPage.sidebar.copyright.learnMore")}
+              </Link>
+            </List.Item>
+          </>
+        )}
         <Divider />
         <List.Item>
           <Checkbox
@@ -184,6 +234,7 @@ function LayerSidebar({
                 </List.Item>
               </>
             )}
+            {openStreetMapCopyright}
           </>
         )}
         <Divider />

frontend/src/pages/MapPage/RegionInfo.tsx

@@ -0,0 +1,31 @@
+import React from 'react'
+import {createPortal} from 'react-dom'
+import {useTranslation} from 'react-i18next'
+import {List, Header, Icon, Button} from 'semantic-ui-react'
+
+import styles from './styles.module.less'
+
+export default function RegionInfo({region, mapInfoPortal, onClose}) {
+  const {t} = useTranslation()
+  const content = (
+    <>
+      <div className={styles.closeHeader}>
+        <Header as="h3">{region.properties.name || t('MapPage.regionInfo.unnamedRegion')}</Header>
+        <Button primary icon onClick={onClose}>
+          <Icon name="close" />
+        </Button>
+      </div>
+
+      <List>
+        <List.Item>
+          <List.Header>{t('MapPage.regionInfo.eventCount')}</List.Header>
+          <List.Content>{region.properties.overtaking_event_count ?? 0}</List.Content>
+        </List.Item>
+      </List>
+    </>
+  )
+
+  return content && mapInfoPortal
+    ? createPortal(<div className={styles.mapInfoBox}>{content}</div>, mapInfoPortal)
+    : null
+}

frontend/src/pages/MapPage/RoadInfo.tsx

@@ -1,74 +1,57 @@
-import React, { useState, useCallback } from "react";
+import React, {useState, useCallback} from 'react'
-import _ from "lodash";
+import {createPortal} from 'react-dom'
-import {
+import _ from 'lodash'
-  Segment,
+import {Segment, Menu, Header, Label, Icon, Table, Message, Button} from 'semantic-ui-react'
-  Menu,
+import {Layer, Source} from 'react-map-gl'
-  Header,
+import {of, from, concat} from 'rxjs'
-  Label,
+import {useObservable} from 'rxjs-hooks'
-  Icon,
+import {switchMap, distinctUntilChanged} from 'rxjs/operators'
-  Table,
+import {Chart} from 'components'
-  Message,
+import {pairwise} from 'utils'
-  Button,
+import {useTranslation} from 'react-i18next'
-} from "semantic-ui-react";
-import { Layer, Source } from "react-map-gl";
-import { of, from, concat } from "rxjs";
-import { useObservable } from "rxjs-hooks";
-import { switchMap, distinctUntilChanged } from "rxjs/operators";
-import { Chart } from "components";
-import { pairwise } from "utils";
-import { useTranslation } from "react-i18next";
 
-import type { Location } from "types";
+import type {Location} from 'types'
-import api from "api";
+import api from 'api'
-import { colorByDistance, borderByZone } from "mapstyles";
+import {colorByDistance, borderByZone} from 'mapstyles'
 
-import styles from "./styles.module.less";
+import styles from './styles.module.less'
 
 function selectFromColorMap(colormap, value) {
-  let last = null;
+  let last = null
   for (let i = 0; i < colormap.length; i += 2) {
     if (colormap[i + 1] > value) {
-      return colormap[i];
+      return colormap[i]
     }
   }
-  return colormap[colormap.length - 1];
+  return colormap[colormap.length - 1]
 }
 
 const UNITS = {
-  distanceOvertaker: "m",
+  distanceOvertaker: 'm',
-  distanceStationary: "m",
+  distanceStationary: 'm',
-  speed: "km/h",
+  speed: 'km/h',
-};
+}
-const ZONE_COLORS = { urban: "blue", rural: "cyan", motorway: "purple" };
+const ZONE_COLORS = {urban: 'blue', rural: 'cyan', motorway: 'purple'}
-const CARDINAL_DIRECTIONS = [
+const CARDINAL_DIRECTIONS = ['north', 'northEast', 'east', 'southEast', 'south', 'southWest', 'west', 'northWest']
-  "north",
-  "northEast",
-  "east",
-  "southEast",
-  "south",
-  "southWest",
-  "west",
-  "northWest",
-];
 const getCardinalDirection = (t, bearing) => {
   if (bearing == null) {
-    return t("MapPage.roadInfo.cardinalDirections.unknown");
+    return t('MapPage.roadInfo.cardinalDirections.unknown')
   } else {
-    const n = CARDINAL_DIRECTIONS.length;
+    const n = CARDINAL_DIRECTIONS.length
-    const i = Math.floor(((bearing / 360.0) * n + 0.5) % n);
+    const i = Math.floor(((bearing / 360.0) * n + 0.5) % n)
-    const name = CARDINAL_DIRECTIONS[i];
+    const name = CARDINAL_DIRECTIONS[i]
-    return t(`MapPage.roadInfo.cardinalDirections.${name}`);
+    return t(`MapPage.roadInfo.cardinalDirections.${name}`)
   }
-};
+}
 
-function RoadStatsTable({ data }) {
+function RoadStatsTable({data}) {
-  const { t } = useTranslation();
+  const {t} = useTranslation()
   return (
     <Table size="small" compact>
       <Table.Header>
         <Table.Row>
           <Table.HeaderCell textAlign="right"></Table.HeaderCell>
-          {["distanceOvertaker", "distanceStationary", "speed"].map((prop) => (
+          {['distanceOvertaker', 'distanceStationary', 'speed'].map((prop) => (
             <Table.HeaderCell key={prop} textAlign="right">
               {t(`MapPage.roadInfo.${prop}`)}
             </Table.HeaderCell>
@@ -76,58 +59,52 @@ function RoadStatsTable({ data }) {
         </Table.Row>
       </Table.Header>
       <Table.Body>
-        {["count", "min", "median", "max", "mean"].map((stat) => (
+        {['count', 'min', 'median', 'max', 'mean'].map((stat) => (
           <Table.Row key={stat}>
             <Table.Cell> {t(`MapPage.roadInfo.${stat}`)}</Table.Cell>
-            {["distanceOvertaker", "distanceStationary", "speed"].map(
+            {['distanceOvertaker', 'distanceStationary', 'speed'].map((prop) => (
-              (prop) => (
+              <Table.Cell key={prop} textAlign="right">
-                <Table.Cell key={prop} textAlign="right">
+                {(data[prop]?.statistics?.[stat] * (prop === `speed` && stat != 'count' ? 3.6 : 1)).toFixed(
-                  {(
+                  stat === 'count' ? 0 : 2
-                    data[prop]?.statistics?.[stat] *
+                )}
-                    (prop === `speed` && stat != "count" ? 3.6 : 1)
+                {stat !== 'count' && ` ${UNITS[prop]}`}
-                  ).toFixed(stat === "count" ? 0 : 2)}
+              </Table.Cell>
-                  {stat !== "count" && ` ${UNITS[prop]}`}
+            ))}
-                </Table.Cell>
-              )
-            )}
           </Table.Row>
         ))}
       </Table.Body>
     </Table>
-  );
+  )
 }
 
-function HistogramChart({ bins, counts, zone }) {
+function HistogramChart({bins, counts, zone}) {
-  const diff = bins[1] - bins[0];
+  const diff = bins[1] - bins[0]
-  const colortype = zone === "rural" ? 3 : 5;
+  const colortype = zone === 'rural' ? 3 : 5
   const data = _.zip(
     bins.slice(0, bins.length - 1).map((v) => v + diff / 2),
     counts
   ).map((value) => ({
     value,
     itemStyle: {
-      color: selectFromColorMap(
+      color: selectFromColorMap(colorByDistance()[3][colortype].slice(2), value[0]),
-        colorByDistance()[3][colortype].slice(2),
-        value[0]
-      ),
     },
-  }));
+  }))
 
   return (
     <Chart
-      style={{ height: 240 }}
+      style={{height: 240}}
       option={{
-        grid: { top: 30, bottom: 30, right: 30, left: 30 },
+        grid: {top: 30, bottom: 30, right: 30, left: 30},
         xAxis: {
-          type: "value",
+          type: 'value',
-          axisLabel: { formatter: (v) => `${Math.round(v * 100)} cm` },
+          axisLabel: {formatter: (v) => `${Math.round(v * 100)} cm`},
           min: 0,
           max: 2.5,
         },
         yAxis: {},
         series: [
           {
-            type: "bar",
+            type: 'bar',
             data,
 
             barMaxWidth: 20,
@@ -135,142 +112,120 @@ function HistogramChart({ bins, counts, zone }) {
         ],
       }}
     />
-  );
+  )
+}
+
+interface ArrayStats {
+  statistics: {
+    count: number
+    mean: number
+    min: number
+    max: number
+    median: number
+  }
+  histogram: {
+    bins: number[]
+    counts: number[]
+  }
+  values: number[]
+}
+
+export interface RoadDirectionInfo {
+  bearing: number
+  distanceOvertaker: ArrayStats
+  distanceStationary: ArrayStats
+  speed: ArrayStats
+}
+
+export interface RoadInfoType {
+  road: {
+    way_id: number
+    zone: 'urban' | 'rural' | null
+    name: string
+    directionality: -1 | 0 | 1
+    oneway: boolean
+    geometry: Object
+  }
+  forwards: RoadDirectionInfo
+  backwards: RoadDirectionInfo
 }
 
 export default function RoadInfo({
-  clickLocation,
+  roadInfo: info,
   hasFilters,
   onClose,
+  mapInfoPortal,
 }: {
-  clickLocation: Location | null;
+  roadInfo: RoadInfoType
-  hasFilters: boolean;
+  hasFilters: boolean
-  onClose: () => void;
+  onClose: () => void
+  mapInfoPortal: HTMLElement
 }) {
-  const { t } = useTranslation();
+  const {t} = useTranslation()
-  const [direction, setDirection] = useState("forwards");
+  const [direction, setDirection] = useState('forwards')
 
   const onClickDirection = useCallback(
-    (e, { name }) => {
+    (e, {name}) => {
-      e.preventDefault();
+      e.preventDefault()
-      e.stopPropagation();
+      e.stopPropagation()
-      setDirection(name);
+      setDirection(name)
     },
     [setDirection]
-  );
+  )
 
-  const info = useObservable(
+  // TODO: change based on left-hand/right-hand traffic
-    (_$, inputs$) =>
+  const offsetDirection = info.road.oneway ? 0 : direction === 'forwards' ? 1 : -1
-      inputs$.pipe(
-        distinctUntilChanged(_.isEqual),
-        switchMap(([location]) =>
-          location
-            ? concat(
-                of(null),
-                from(
-                  api.get("/mapdetails/road", {
-                    query: {
-                      ...location,
-                      radius: 100,
-                    },
-                  })
-                )
-              )
-            : of(null)
-        )
-      ),
-    null,
-    [clickLocation]
-  );
 
-  if (!clickLocation) {
+  const content = (
-    return null;
+    <>
-  }
+      <div className={styles.closeHeader}>
+        <Header as="h3">{info?.road.name || t('MapPage.roadInfo.unnamedWay')}</Header>
+        <Button primary icon onClick={onClose}>
+          <Icon name="close" />
+        </Button>
+      </div>
 
-  const loading = info == null;
+      {hasFilters && (
+        <Message info icon>
+          <Icon name="info circle" small />
+          <Message.Content>{t('MapPage.roadInfo.hintFiltersNotApplied')}</Message.Content>
+        </Message>
+      )}
 
-  const offsetDirection = info?.road?.oneway
+      {info?.road.zone && (
-    ? 0
+        <Label size="small" color={ZONE_COLORS[info?.road.zone]}>
-    : direction === "forwards"
+          {t(`general.zone.${info.road.zone}`)}
-    ? 1
+        </Label>
-    : -1; // TODO: change based on left-hand/right-hand traffic
+      )}
 
-  const content =
+      {info?.road.oneway && (
-    !loading && !info.road ? (
+        <Label size="small" color="blue">
-      "No road found."
+          <Icon name="long arrow alternate right" fitted /> {t('MapPage.roadInfo.oneway')}
-    ) : (
+        </Label>
-      <>
+      )}
-        <Header as="h3">
-          {loading
-            ? "..."
-            : info?.road.name || t("MapPage.roadInfo.unnamedWay")}
 
-          <Button
+      {info?.road.oneway ? null : (
-            style={{ float: "right" }}
+        <Menu size="tiny" pointing>
-            onClick={onClose}
+          <Menu.Item header>{t('MapPage.roadInfo.direction')}</Menu.Item>
-            title={t("MapPage.roadInfo.closeTooltip")}
+          <Menu.Item name="forwards" active={direction === 'forwards'} onClick={onClickDirection}>
-            size="small"
+            {getCardinalDirection(t, info?.forwards?.bearing)}
-            icon="close"
+          </Menu.Item>
-            basic
+          <Menu.Item name="backwards" active={direction === 'backwards'} onClick={onClickDirection}>
-          />
+            {getCardinalDirection(t, info?.backwards?.bearing)}
-        </Header>
+          </Menu.Item>
+        </Menu>
+      )}
 
-        {hasFilters && (
+      {info?.[direction] && <RoadStatsTable data={info[direction]} />}
-          <Message info icon>
-            <Icon name="info circle" small />
-            <Message.Content>
-              {t("MapPage.roadInfo.hintFiltersNotApplied")}
-            </Message.Content>
-          </Message>
-        )}
 
-        {info?.road.zone && (
+      {info?.[direction]?.distanceOvertaker?.histogram && (
-          <Label size="small" color={ZONE_COLORS[info?.road.zone]}>
+        <>
-            {t(`general.zone.${info.road.zone}`)}
+          <Header as="h5">{t('MapPage.roadInfo.overtakerDistanceDistribution')}</Header>
-          </Label>
+          <HistogramChart {...info[direction]?.distanceOvertaker?.histogram} />
-        )}
+        </>
-
+      )}
-        {info?.road.oneway && (
+    </>
-          <Label size="small" color="blue">
+  )
-            <Icon name="long arrow alternate right" fitted />{" "}
-            {t("MapPage.roadInfo.oneway")}
-          </Label>
-        )}
-
-        {info?.road.oneway ? null : (
-          <Menu size="tiny" fluid secondary>
-            <Menu.Item header>{t("MapPage.roadInfo.direction")}</Menu.Item>
-            <Menu.Item
-              name="forwards"
-              active={direction === "forwards"}
-              onClick={onClickDirection}
-            >
-              {getCardinalDirection(t, info?.forwards?.bearing)}
-            </Menu.Item>
-            <Menu.Item
-              name="backwards"
-              active={direction === "backwards"}
-              onClick={onClickDirection}
-            >
-              {getCardinalDirection(t, info?.backwards?.bearing)}
-            </Menu.Item>
-          </Menu>
-        )}
-
-        {info?.[direction] && <RoadStatsTable data={info[direction]} />}
-
-        {info?.[direction]?.distanceOvertaker?.histogram && (
-          <>
-            <Header as="h5">
-              {t("MapPage.roadInfo.overtakerDistanceDistribution")}
-            </Header>
-            <HistogramChart
-              {...info[direction]?.distanceOvertaker?.histogram}
-            />
-          </>
-        )}
-      </>
-    );
 
   return (
     <>
@@ -280,22 +235,14 @@ export default function RoadInfo({
             id="route"
             type="line"
             paint={{
-              "line-width": [
+              'line-width': ['interpolate', ['linear'], ['zoom'], 14, 6, 17, 12],
-                "interpolate",
+              'line-color': '#18FFFF',
-                ["linear"],
+              'line-opacity': 0.5,
-                ["zoom"],
-                14,
-                6,
-                17,
-                12,
-              ],
-              "line-color": "#18FFFF",
-              "line-opacity": 0.5,
               ...{
-                "line-offset": [
+                'line-offset': [
-                  "interpolate",
+                  'interpolate',
-                  ["exponential", 1.5],
+                  ['exponential', 1.5],
-                  ["zoom"],
+                  ['zoom'],
                   12,
                   offsetDirection,
                   19,
@@ -307,11 +254,7 @@ export default function RoadInfo({
         </Source>
       )}
 
-      {content && (
+      {content && mapInfoPortal && createPortal(<div className={styles.mapInfoBox}>{content}</div>, mapInfoPortal)}
-        <div className={styles.mapInfoBox}>
-          <Segment loading={loading}>{content}</Segment>
-        </div>
-      )}
     </>
-  );
+  )
 }

frontend/src/pages/MapPage/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo } from "react";
+import React, { useState, useCallback, useMemo, useRef } from "react";
 import _ from "lodash";
 import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
@@ -6,19 +6,21 @@ import { Layer, Source } from "react-map-gl";
 import produce from "immer";
 import classNames from "classnames";
 
+import api from "api";
 import type { Location } from "types";
 import { Page, Map } from "components";
 import { useConfig } from "config";
 import {
   colorByDistance,
   colorByCount,
+  getRegionLayers,
   borderByZone,
-  reds,
   isValidAttribute,
 } from "mapstyles";
 import { useMapConfig } from "reducers/mapConfig";
 
-import RoadInfo from "./RoadInfo";
+import RoadInfo, { RoadInfoType } from "./RoadInfo";
+import RegionInfo from "./RegionInfo";
 import LayerSidebar from "./LayerSidebar";
 import styles from "./styles.module.less";
 
@@ -27,6 +29,7 @@ const untaggedRoadsLayer = {
   type: "line",
   source: "obs",
   "source-layer": "obs_roads",
+  minzoom: 12,
   filter: ["!", ["to-boolean", ["get", "distance_overtaker_mean"]]],
   layout: {
     "line-cap": "round",
@@ -35,7 +38,7 @@ const untaggedRoadsLayer = {
   paint: {
     "line-width": ["interpolate", ["exponential", 1.5], ["zoom"], 12, 2, 17, 2],
     "line-color": "#ABC",
-    "line-opacity": ["interpolate", ["linear"], ["zoom"], 14, 0, 15, 1],
+    // "line-opacity": ["interpolate", ["linear"], ["zoom"], 14, 0, 15, 1],
     "line-offset": [
       "interpolate",
       ["exponential", 1.5],
@@ -46,10 +49,9 @@ const untaggedRoadsLayer = {
       ["*", ["get", "offset_direction"], 8],
     ],
   },
-  minzoom: 12,
 };
 
-const getUntaggedRoadsLayer = (colorAttribute, maxCount) =>
+const getUntaggedRoadsLayer = (colorAttribute) =>
   produce(untaggedRoadsLayer, (draft) => {
     draft.filter = ["!", isValidAttribute(colorAttribute)];
   });
@@ -58,6 +60,7 @@ const getRoadsLayer = (colorAttribute, maxCount) =>
   produce(untaggedRoadsLayer, (draft) => {
     draft.id = "obs_roads_normal";
     draft.filter = isValidAttribute(colorAttribute);
+    draft.minzoom = 10;
     draft.paint["line-width"][6] = 6; // scale bigger on zoom
     draft.paint["line-color"] = colorAttribute.startsWith("distance_")
       ? colorByDistance(colorAttribute)
@@ -66,8 +69,8 @@ const getRoadsLayer = (colorAttribute, maxCount) =>
       : colorAttribute.endsWith("zone")
       ? borderByZone()
       : "#DDD";
-    draft.paint["line-opacity"][3] = 12;
+    // draft.paint["line-opacity"][3] = 12;
-    draft.paint["line-opacity"][5] = 13;
+    // draft.paint["line-opacity"][5] = 13;
   });
 
 const getEventsLayer = () => ({
@@ -77,9 +80,10 @@ const getEventsLayer = () => ({
   "source-layer": "obs_events",
   paint: {
     "circle-radius": ["interpolate", ["linear"], ["zoom"], 14, 3, 17, 8],
+    "circle-opacity": ["interpolate",["linear"],["zoom"],8,0.1,9,0.3,10,0.5,11,1],
     "circle-color": colorByDistance("distance_overtaker"),
   },
-  minzoom: 11,
+  minzoom: 8,
 });
 
 const getEventsTextLayer = () => ({
@@ -110,14 +114,39 @@ const getEventsTextLayer = () => ({
   },
 });
 
+interface RegionInfo {
+  properties: {
+    admin_level: number;
+    name: string;
+    overtaking_event_count: number;
+  };
+}
+
+type Details =
+  | { type: "road"; road: RoadInfoType }
+  | { type: "region"; region: RegionInfo };
+
 function MapPage({ login }) {
   const { obsMapSource, banner } = useConfig() || {};
-  const [clickLocation, setClickLocation] = useState<Location | null>(null);
+  const [details, setDetails] = useState<null | Details>(null);
+
+  const onCloseDetails = useCallback(() => setDetails(null), [setDetails]);
 
   const mapConfig = useMapConfig();
 
+  const viewportRef = useRef();
+  const mapInfoPortal = useRef();
+
+  const onViewportChange = useCallback(
+    (viewport) => {
+      viewportRef.current = viewport;
+    },
+    [viewportRef]
+  );
+
   const onClick = useCallback(
-    (e) => {
+    async (e) => {
+      // check if we clicked inside the mapInfoBox, if so, early exit
       let node = e.target;
       while (node) {
         if (
@@ -130,13 +159,28 @@ function MapPage({ login }) {
         node = node.parentNode;
       }
 
-      setClickLocation({ longitude: e.lngLat[0], latitude: e.lngLat[1] });
+      const { zoom } = viewportRef.current;
+
+      if (zoom < 10) {
+        const clickedRegion = e.features?.find(
+          (f) => f.source === "obs" && f.sourceLayer === "obs_regions"
+        );
+        setDetails(
+          clickedRegion ? { type: "region", region: clickedRegion } : null
+        );
+      } else {
+        const road = await api.get("/mapdetails/road", {
+          query: {
+            longitude: e.lngLat[0],
+            latitude: e.lngLat[1],
+            radius: 100,
+          },
+        });
+        setDetails(road?.road ? { type: "road", road } : null);
+      }
     },
-    [setClickLocation]
+    [setDetails]
   );
-  const onCloseRoadInfo = useCallback(() => {
-    setClickLocation(null);
-  }, [setClickLocation]);
 
   const [layerSidebar, setLayerSidebar] = useState(true);
 
@@ -162,8 +206,14 @@ function MapPage({ login }) {
     layers.push(roadsLayer);
   }
 
+  const regionLayers = useMemo(() => getRegionLayers(), []);
+  if (mapConfig.obsRegions.show) {
+    layers.push(...regionLayers);
+  }
+
   const eventsLayer = useMemo(() => getEventsLayer(), []);
   const eventsTextLayer = useMemo(() => getEventsTextLayer(), []);
+
   if (mapConfig.obsEvents.show) {
     layers.push(eventsLayer);
     layers.push(eventsTextLayer);
@@ -221,6 +271,7 @@ function MapPage({ login }) {
           styles.mapContainer,
           banner ? styles.hasBanner : null
         )}
+        ref={mapInfoPortal}
       >
         {layerSidebar && (
           <div className={styles.mapSidebar}>
@@ -228,7 +279,12 @@ function MapPage({ login }) {
           </div>
         )}
         <div className={styles.map}>
-          <Map viewportFromUrl onClick={onClick} hasToolbar>
+          <Map
+            viewportFromUrl
+            onClick={onClick}
+            hasToolbar
+            onViewportChange={onViewportChange}
+          >
             <div className={styles.mapToolbar}>
               <Button
                 primary
@@ -243,9 +299,22 @@ function MapPage({ login }) {
               ))}
             </Source>
 
-            <RoadInfo
+            {details?.type === "road" && details?.road?.road && (
-              {...{ clickLocation, hasFilters, onClose: onCloseRoadInfo }}
+              <RoadInfo
-            />
+                roadInfo={details.road}
+                mapInfoPortal={mapInfoPortal.current}
+                onClose={onCloseDetails}
+                {...{ hasFilters }}
+              />
+            )}
+
+            {details?.type === "region" && details?.region && (
+              <RegionInfo
+                region={details.region}
+                mapInfoPortal={mapInfoPortal.current}
+                onClose={onCloseDetails}
+              />
+            )}
           </Map>
         </div>
       </div>

frontend/src/pages/MapPage/styles.module.less

@@ -21,15 +21,22 @@
 
 .map {
   flex: 1 1 0;
+  overflow: hidden;
 }
 
 .mapInfoBox {
-  position: absolute;
-  right: 16px;
-  top: 32px;
-  max-height: 100%;
   width: 36rem;
   overflow: auto;
+  border-left: 1px solid @borderColor;
+  background: white;
+  padding: 16px;
+}
+
+.copyright {
+  color: #888;
+  font-size: 0.8em;
+  line-height: 1.4;
+  margin-block-start: 1em;
 }
 
 .mapToolbar {
@@ -37,3 +44,35 @@
   left: 16px;
   top: 16px;
 }
+
+.closeHeader {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+
+
+@media @mobile {
+  .mapContainer {
+    height: auto;
+    min-height: calc(100vh - @menuHeightMobile);
+    &.hasBanner {
+      height: calc(100vh - @menuHeightMobile - 50px);
+    }
+    flex-direction: column;
+  }
+
+  .map {
+    height: 60vh;
+  }
+
+  .mapSidebar {
+    width: auto;
+    height: auto;
+  }
+
+  .mapInfoBox {
+    width: auto;
+    height: auto;
+  }
+}

frontend/src/pages/MyTracksPage.tsx

@@ -0,0 +1,429 @@
+import React, { useCallback, useMemo, useState } from "react";
+import { connect } from "react-redux";
+import {
+  Accordion,
+  Button,
+  Checkbox,
+  Confirm,
+  Header,
+  Icon,
+  Item,
+  List,
+  Loader,
+  Dropdown,
+  SemanticCOLORS,
+  SemanticICONS,
+  Table,
+} from "semantic-ui-react";
+import { useObservable } from "rxjs-hooks";
+import { Link } from "react-router-dom";
+import { of, from, concat, BehaviorSubject, combineLatest } from "rxjs";
+import { map, switchMap, distinctUntilChanged } from "rxjs/operators";
+import _ from "lodash";
+import { useTranslation } from "react-i18next";
+
+import type { ProcessingStatus, Track, UserDevice } from "types";
+import { Page, FormattedDate, Visibility } from "components";
+import api from "api";
+import { useCallbackRef, formatDistance, formatDuration } from "utils";
+
+import download from "downloadjs";
+
+const COLOR_BY_STATUS: Record<ProcessingStatus, SemanticCOLORS> = {
+  error: "red",
+  complete: "green",
+  created: "grey",
+  queued: "orange",
+  processing: "orange",
+};
+
+const ICON_BY_STATUS: Record<ProcessingStatus, SemanticICONS> = {
+  error: "warning sign",
+  complete: "check circle outline",
+  created: "bolt",
+  queued: "bolt",
+  processing: "bolt",
+};
+
+function ProcessingStatusLabel({ status }: { status: ProcessingStatus }) {
+  const { t } = useTranslation();
+  return (
+    <span title={t(`TracksPage.processing.${status}`)}>
+      <Icon color={COLOR_BY_STATUS[status]} name={ICON_BY_STATUS[status]} />
+    </span>
+  );
+}
+
+function SortableHeader({
+  children,
+  setOrderBy,
+  orderBy,
+  reversed,
+  setReversed,
+  name,
+  ...props
+}) {
+  const toggleSort = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    if (orderBy === name) {
+      if (!reversed) {
+        setReversed(true);
+      } else {
+        setReversed(false);
+        setOrderBy(null);
+      }
+    } else {
+      setReversed(false);
+      setOrderBy(name);
+    }
+  };
+
+  let icon =
+    orderBy === name ? (reversed ? "sort descending" : "sort ascending") : null;
+
+  return (
+    <Table.HeaderCell {...props}>
+      <div onClick={toggleSort}>
+        {children}
+        <Icon name={icon} />
+      </div>
+    </Table.HeaderCell>
+  );
+}
+
+type Filters = {
+  userDeviceId?: null | number;
+  visibility?: null | boolean;
+};
+
+function TrackFilters({
+  filters,
+  setFilters,
+  deviceNames,
+}: {
+  filters: Filters;
+  setFilters: (f: Filters) => void;
+  deviceNames: null | Record<number, string>;
+}) {
+  return (
+    <List horizontal>
+      <List.Item>
+        <List.Header>Device</List.Header>
+        <Dropdown
+          selection
+          clearable
+          options={[
+            { value: 0, key: "__none__", text: "All my devices" },
+            ..._.sortBy(Object.entries(deviceNames ?? {}), 1).map(
+              ([deviceId, deviceName]: [string, string]) => ({
+                value: Number(deviceId),
+                key: deviceId,
+                text: deviceName,
+              })
+            ),
+          ]}
+          value={filters?.userDeviceId ?? 0}
+          onChange={(_e, { value }) =>
+            setFilters({ ...filters, userDeviceId: (value as number) || null })
+          }
+        />
+      </List.Item>
+
+      <List.Item>
+        <List.Header>Visibility</List.Header>
+        <Dropdown
+          selection
+          clearable
+          options={[
+            { value: "none", key: "any", text: "Any" },
+            { value: true, key: "public", text: "Public" },
+            { value: false, key: "private", text: "Private" },
+          ]}
+          value={filters?.visibility ?? "none"}
+          onChange={(_e, { value }) =>
+            setFilters({
+              ...filters,
+              visibility: value === "none" ? null : (value as boolean),
+            })
+          }
+        />
+      </List.Item>
+    </List>
+  );
+}
+
+function TracksTable({ title }) {
+  const [orderBy, setOrderBy] = useState("recordedAt");
+  const [reversed, setReversed] = useState(false);
+  const [showFilters, setShowFilters] = useState(false);
+  const [filters, setFilters] = useState<Filters>({});
+  const [selectedTracks, setSelectedTracks] = useState<Record<string, boolean>>(
+    {}
+  );
+
+  const toggleTrackSelection = useCallbackRef(
+    (slug: string, selected?: boolean) => {
+      const newSelected = selected ?? !selectedTracks[slug];
+      setSelectedTracks(
+        _.pickBy({ ...selectedTracks, [slug]: newSelected }, _.identity)
+      );
+    }
+  );
+
+  const query = _.pickBy(
+    {
+      limit: 1000,
+      offset: 0,
+      order_by: orderBy,
+      reversed: reversed ? "true" : "false",
+      user_device_id: filters?.userDeviceId,
+      public: filters?.visibility,
+    },
+    (x) => x != null
+  );
+
+  const forceUpdate$ = useMemo(() => new BehaviorSubject(null), []);
+  const tracks: Track[] | null = useObservable(
+    (_$, inputs$) =>
+      combineLatest([
+        inputs$.pipe(
+          map(([query]) => query),
+          distinctUntilChanged(_.isEqual)
+        ),
+        forceUpdate$,
+      ]).pipe(
+        switchMap(([query]) =>
+          concat(
+            of(null),
+            from(api.get("/tracks/feed", { query }).then((r) => r.tracks))
+          )
+        )
+      ),
+    null,
+    [query]
+  );
+
+  const deviceNames: null | Record<number, string> = useObservable(() =>
+    from(api.get("/user/devices")).pipe(
+      map((response: UserDevice[]) =>
+        Object.fromEntries(
+          response.map((device) => [
+            device.id,
+            device.displayName || device.identifier,
+          ])
+        )
+      )
+    )
+  );
+
+  const { t } = useTranslation();
+
+  const p = { orderBy, setOrderBy, reversed, setReversed };
+
+  const selectedCount = Object.keys(selectedTracks).length;
+  const noneSelected = selectedCount === 0;
+  const allSelected = selectedCount === tracks?.length;
+  const selectAll = () => {
+    setSelectedTracks(
+      Object.fromEntries(tracks?.map((t) => [t.slug, true]) ?? [])
+    );
+  };
+  const selectNone = () => {
+    setSelectedTracks({});
+  };
+
+  const bulkAction = async (action: string) => {
+    const response = await api.post("/tracks/bulk", {
+      body: {
+        action,
+        tracks: Object.keys(selectedTracks),
+      },
+      returnResponse: true,
+    });
+    if (action === "download") {
+      const contentType =
+        response.headers.get("content-type") ?? "application/x-gtar";
+
+      const filename =
+        response.headers
+          .get("content-disposition")
+          ?.match(/filename="([^"]+)"/)?.[1] ?? "tracks.tar.bz2";
+      download(await response.blob(), filename, contentType);
+    }
+
+    setShowBulkDelete(false);
+    setSelectedTracks({});
+    forceUpdate$.next(null);
+  };
+  const [showBulkDelete, setShowBulkDelete] = useState(false);
+
+  return (
+    <>
+      <div style={{ float: "right" }}>
+        <Dropdown disabled={noneSelected} text="Bulk actions" floating button>
+          <Dropdown.Menu>
+            <Dropdown.Header>
+              Selection of {selectedCount} tracks
+            </Dropdown.Header>
+            <Dropdown.Item onClick={() => bulkAction("makePrivate")}>
+              Make private
+            </Dropdown.Item>
+            <Dropdown.Item onClick={() => bulkAction("makePublic")}>
+              Make public
+            </Dropdown.Item>
+            <Dropdown.Item onClick={() => bulkAction("reprocess")}>
+              Reprocess
+            </Dropdown.Item>
+            <Dropdown.Item onClick={() => bulkAction("download")}>
+              Download
+            </Dropdown.Item>
+            <Dropdown.Item onClick={() => setShowBulkDelete(true)}>
+              Delete
+            </Dropdown.Item>
+          </Dropdown.Menu>
+        </Dropdown>
+        <Link component={UploadButton} to="/upload" />
+      </div>
+
+      <Header as="h1">{title}</Header>
+      <div style={{ clear: "both" }}>
+        <Loader content={t("general.loading")} active={tracks == null} />
+
+        <Accordion>
+          <Accordion.Title
+            active={showFilters}
+            index={0}
+            onClick={() => setShowFilters(!showFilters)}
+          >
+            <Icon name="dropdown" />
+            Filters
+          </Accordion.Title>
+          <Accordion.Content active={showFilters}>
+            <TrackFilters {...{ filters, setFilters, deviceNames }} />
+          </Accordion.Content>
+        </Accordion>
+
+        <Confirm
+          open={showBulkDelete}
+          onCancel={() => setShowBulkDelete(false)}
+          onConfirm={() => bulkAction("delete")}
+          content={`Are you sure you want to delete ${selectedCount} tracks?`}
+          confirmButton={t("general.delete")}
+          cancelButton={t("general.cancel")}
+        />
+
+        <Table compact>
+          <Table.Header>
+            <Table.Row>
+              <Table.HeaderCell>
+                <Checkbox
+                  checked={allSelected}
+                  indeterminate={!allSelected && !noneSelected}
+                  onClick={() => (noneSelected ? selectAll() : selectNone())}
+                />
+              </Table.HeaderCell>
+
+              <SortableHeader {...p} name="title">
+                Title
+              </SortableHeader>
+              <SortableHeader {...p} name="recordedAt">
+                Recorded at
+              </SortableHeader>
+              <SortableHeader {...p} name="visibility">
+                Visibility
+              </SortableHeader>
+              <SortableHeader {...p} name="length" textAlign="right">
+                Length
+              </SortableHeader>
+              <SortableHeader {...p} name="duration" textAlign="right">
+                Duration
+              </SortableHeader>
+              <SortableHeader {...p} name="user_device_id">
+                Device
+              </SortableHeader>
+            </Table.Row>
+          </Table.Header>
+
+          <Table.Body>
+            {tracks?.map((track: Track) => (
+              <Table.Row key={track.slug}>
+                <Table.Cell>
+                  <Checkbox
+                    onClick={(e) => toggleTrackSelection(track.slug)}
+                    checked={selectedTracks[track.slug] ?? false}
+                  />
+                </Table.Cell>
+                <Table.Cell>
+                  {track.processingStatus == null ? null : (
+                    <ProcessingStatusLabel status={track.processingStatus} />
+                  )}
+                  <Item.Header as={Link} to={`/tracks/${track.slug}`}>
+                    {track.title || t("general.unnamedTrack")}
+                  </Item.Header>
+                </Table.Cell>
+
+                <Table.Cell>
+                  <FormattedDate date={track.recordedAt} />
+                </Table.Cell>
+
+                <Table.Cell>
+                  {track.public == null ? null : (
+                    <Visibility public={track.public} />
+                  )}
+                </Table.Cell>
+
+                <Table.Cell textAlign="right">
+                  {formatDistance(track.length)}
+                </Table.Cell>
+
+                <Table.Cell textAlign="right">
+                  {formatDuration(track.duration)}
+                </Table.Cell>
+
+                <Table.Cell>
+                  {track.userDeviceId
+                    ? deviceNames?.[track.userDeviceId] ?? "..."
+                    : null}
+                </Table.Cell>
+              </Table.Row>
+            ))}
+          </Table.Body>
+        </Table>
+      </div>
+    </>
+  );
+}
+
+function UploadButton({ navigate, ...props }) {
+  const { t } = useTranslation();
+  const onClick = useCallback(
+    (e) => {
+      e.preventDefault();
+      navigate();
+    },
+    [navigate]
+  );
+  return (
+    <Button onClick={onClick} {...props} color="green">
+      {t("TracksPage.upload")}
+    </Button>
+  );
+}
+
+const MyTracksPage = connect((state) => ({ login: (state as any).login }))(
+  function MyTracksPage({ login }) {
+    const { t } = useTranslation();
+
+    const title = t("TracksPage.titleUser");
+
+    return (
+      <Page title={title}>
+        <TracksTable {...{ title }} />
+      </Page>
+    );
+  }
+);
+
+export default MyTracksPage;

frontend/src/pages/SettingsPage.tsx

@@ -1,227 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import {
-  Message,
-  Icon,
-  Grid,
-  Form,
-  Button,
-  TextArea,
-  Ref,
-  Input,
-  Header,
-  Divider,
-  Popup,
-} from "semantic-ui-react";
-import { useForm } from "react-hook-form";
-import Markdown from "react-markdown";
-import { useTranslation } from "react-i18next";
-
-import { setLogin } from "reducers/login";
-import { Page, Stats } from "components";
-import api from "api";
-import { findInput } from "utils";
-import { useConfig } from "config";
-
-const SettingsPage = connect((state) => ({ login: state.login }), { setLogin })(
-  function SettingsPage({ login, setLogin }) {
-    const { t } = useTranslation();
-    const { register, handleSubmit } = useForm();
-    const [loading, setLoading] = React.useState(false);
-    const [errors, setErrors] = React.useState(null);
-
-    const onSave = React.useCallback(
-      async (changes) => {
-        setLoading(true);
-        setErrors(null);
-        try {
-          const response = await api.put("/user", { body: changes });
-          setLogin(response);
-        } catch (err) {
-          setErrors(err.errors);
-        } finally {
-          setLoading(false);
-        }
-      },
-      [setLoading, setLogin, setErrors]
-    );
-
-    const onGenerateNewKey = React.useCallback(async () => {
-      setLoading(true);
-      setErrors(null);
-      try {
-        const response = await api.put("/user", {
-          body: { updateApiKey: true },
-        });
-        setLogin(response);
-      } catch (err) {
-        setErrors(err.errors);
-      } finally {
-        setLoading(false);
-      }
-    }, [setLoading, setLogin, setErrors]);
-
-    return (
-      <Page title={t("SettingsPage.title")}>
-        <Grid centered relaxed divided stackable>
-          <Grid.Row>
-            <Grid.Column width={8}>
-              <Header as="h2">{t("SettingsPage.profile.title")}</Header>
-
-              <Form onSubmit={handleSubmit(onSave)} loading={loading}>
-                <Form.Field error={errors?.username}>
-                  <label>{t("SettingsPage.profile.username.label")}</label>
-                  <Ref innerRef={findInput(register)}>
-                    <Input
-                      name="username"
-                      defaultValue={login.username}
-                      disabled
-                    />
-                  </Ref>
-                  <small>{t("SettingsPage.profile.username.hint")}</small>
-                </Form.Field>
-
-                <Message info visible>
-                  {t("SettingsPage.profile.publicNotice")}
-                </Message>
-
-                <Form.Field error={errors?.displayName}>
-                  <label>{t("SettingsPage.profile.displayName.label")}</label>
-                  <Ref innerRef={findInput(register)}>
-                    <Input
-                      name="displayName"
-                      defaultValue={login.displayName}
-                      placeholder={login.username}
-                    />
-                  </Ref>
-                  <small>
-                    {t("SettingsPage.profile.displayName.fallbackNotice")}
-                  </small>
-                </Form.Field>
-
-                <Form.Field error={errors?.bio}>
-                  <label>{t("SettingsPage.profile.bio.label")}</label>
-                  <Ref innerRef={register}>
-                    <TextArea name="bio" rows={4} defaultValue={login.bio} />
-                  </Ref>
-                </Form.Field>
-                <Form.Field error={errors?.image}>
-                  <label>{t("SettingsPage.profile.avatarUrl.label")}</label>
-                  <Ref innerRef={findInput(register)}>
-                    <Input name="image" defaultValue={login.image} />
-                  </Ref>
-                </Form.Field>
-
-                <Button type="submit" primary>
-                  {t("general.save")}
-                </Button>
-              </Form>
-            </Grid.Column>
-            <Grid.Column width={6}>
-              <ApiKeyDialog {...{ login, onGenerateNewKey }} />
-
-              <Divider />
-
-              <Stats user={login.id} />
-            </Grid.Column>
-          </Grid.Row>
-        </Grid>
-      </Page>
-    );
-  }
-);
-
-function CopyInput({ value, ...props }) {
-  const { t } = useTranslation();
-  const [success, setSuccess] = React.useState(null);
-  const onClick = async () => {
-    try {
-      await window.navigator?.clipboard?.writeText(value);
-      setSuccess(true);
-    } catch (err) {
-      setSuccess(false);
-    } finally {
-      setTimeout(() => {
-        setSuccess(null);
-      }, 2000);
-    }
-  };
-
-  return (
-    <Popup
-      trigger={
-        <Input
-          {...props}
-          value={value}
-          fluid
-          action={{ icon: "copy", onClick }}
-        />
-      }
-      position="top right"
-      open={success != null}
-      content={success ? t("general.copied") : t("general.copyError")}
-    />
-  );
-}
-
-const selectField = findInput((ref) => ref?.select());
-
-function ApiKeyDialog({ login, onGenerateNewKey }) {
-  const { t } = useTranslation();
-  const config = useConfig();
-  const [show, setShow] = React.useState(false);
-  const onClick = React.useCallback(
-    (e) => {
-      e.preventDefault();
-      setShow(true);
-    },
-    [setShow]
-  );
-
-  const onGenerateNewKeyInner = React.useCallback(
-    (e) => {
-      e.preventDefault();
-      onGenerateNewKey();
-    },
-    [onGenerateNewKey]
-  );
-
-  return (
-    <>
-      <Header as="h2">{t("SettingsPage.apiKey.title")}</Header>
-      <Markdown>{t("SettingsPage.apiKey.description")}</Markdown>
-      <div style={{ minHeight: 40, marginBottom: 16 }}>
-        {show ? (
-          login.apiKey ? (
-            <Ref innerRef={selectField}>
-              <CopyInput
-                label={t("SettingsPage.apiKey.key.label")}
-                value={login.apiKey}
-              />
-            </Ref>
-          ) : (
-            <Message warning content={t("SettingsPage.apiKey.key.empty")} />
-          )
-        ) : (
-          <Button onClick={onClick}>
-            <Icon name="lock" /> {t("SettingsPage.apiKey.key.show")}
-          </Button>
-        )}
-      </div>
-      <Markdown>{t("SettingsPage.apiKey.urlDescription")}</Markdown>
-      <div style={{ marginBottom: 16 }}>
-        <CopyInput
-          label={t("SettingsPage.apiKey.url.label")}
-          value={config?.apiUrl?.replace(/\/api$/, "") ?? "..."}
-        />
-      </div>
-      <Markdown>{t("SettingsPage.apiKey.generateDescription")}</Markdown>
-      <p></p>
-      <Button onClick={onGenerateNewKeyInner}>
-        {t("SettingsPage.apiKey.generate")}
-      </Button>
-    </>
-  );
-}
-
-export default SettingsPage;

frontend/src/pages/SettingsPage/ApiKeySettings.tsx

@@ -0,0 +1,125 @@
+import React from "react";
+import { connect } from "react-redux";
+import {
+  Message,
+  Icon,
+  Button,
+  Ref,
+  Input,
+  Segment,
+  Popup,
+} from "semantic-ui-react";
+import Markdown from "react-markdown";
+import { useTranslation } from "react-i18next";
+
+import { setLogin } from "reducers/login";
+import api from "api";
+import { findInput } from "utils";
+import { useConfig } from "config";
+
+function CopyInput({ value, ...props }) {
+  const { t } = useTranslation();
+  const [success, setSuccess] = React.useState(null);
+  const onClick = async () => {
+    try {
+      await window.navigator?.clipboard?.writeText(value);
+      setSuccess(true);
+    } catch (err) {
+      setSuccess(false);
+    } finally {
+      setTimeout(() => {
+        setSuccess(null);
+      }, 2000);
+    }
+  };
+
+  return (
+    <Popup
+      trigger={
+        <Input
+          {...props}
+          value={value}
+          fluid
+          action={{ icon: "copy", onClick }}
+        />
+      }
+      position="top right"
+      open={success != null}
+      content={success ? t("general.copied") : t("general.copyError")}
+    />
+  );
+}
+
+const selectField = findInput((ref) => ref?.select());
+
+const ApiKeySettings = connect((state) => ({ login: state.login }), {
+  setLogin,
+})(function ApiKeySettings({ login, setLogin, setErrors }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = React.useState(false);
+  const config = useConfig();
+  const [show, setShow] = React.useState(false);
+  const onClick = React.useCallback(
+    (e) => {
+      e.preventDefault();
+      setShow(true);
+    },
+    [setShow]
+  );
+
+  const onGenerateNewKey = React.useCallback(
+    async (e) => {
+      e.preventDefault();
+      setLoading(true);
+      try {
+        const response = await api.put("/user", {
+          body: { updateApiKey: true },
+        });
+        setLogin(response);
+      } catch (err) {
+        setErrors(err.errors);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [setLoading, setLogin, setErrors]
+  );
+
+  return (
+    <Segment style={{ maxWidth: 600, margin: "24px auto" }}>
+      <Markdown>{t("SettingsPage.apiKey.description")}</Markdown>
+      <div style={{ minHeight: 40, marginBottom: 16 }}>
+        {show ? (
+          login.apiKey ? (
+            <Ref innerRef={selectField}>
+              <CopyInput
+                label={t("SettingsPage.apiKey.key.label")}
+                value={login.apiKey}
+              />
+            </Ref>
+          ) : (
+            <Message warning content={t("SettingsPage.apiKey.key.empty")} />
+          )
+        ) : (
+          <Button onClick={onClick}>
+            <Icon name="lock" /> {t("SettingsPage.apiKey.key.show")}
+          </Button>
+        )}
+      </div>
+      <Markdown>{t("SettingsPage.apiKey.urlDescription")}</Markdown>
+      <div style={{ marginBottom: 16 }}>
+        <CopyInput
+          label={t("SettingsPage.apiKey.url.label")}
+          value={config?.apiUrl?.replace(/\/api$/, "") ?? "..."}
+        />
+      </div>
+      <Markdown>{t("SettingsPage.apiKey.generateDescription")}</Markdown>
+      <p></p>
+      <Button onClick={onGenerateNewKey}>
+        {t("SettingsPage.apiKey.generate")}
+      </Button>
+    </Segment>
+  );
+});
+
+export default ApiKeySettings;

frontend/src/pages/SettingsPage/DeviceList.tsx

@@ -0,0 +1,126 @@
+import React, {useCallback, useMemo, useRef} from 'react'
+import {useObservable} from 'rxjs-hooks'
+import {concat, from, of, Subject} from 'rxjs'
+import {Table, Button, Input} from 'semantic-ui-react'
+import {useTranslation} from 'react-i18next'
+
+import api from 'api'
+import {UserDevice} from 'types'
+import {startWith, switchMap} from 'rxjs/operators'
+
+function EditField({value, onEdit}) {
+  const [editing, setEditing] = React.useState(false)
+  const [tempValue, setTempValue] = React.useState(value)
+  const timeoutRef = useRef<null | number>(null)
+
+  const cancelTimeout = useCallback(() => {
+    if (timeoutRef.current != null) {
+      clearTimeout(timeoutRef.current)
+      timeoutRef.current = null
+    }
+  }, [timeoutRef])
+
+  const abort = useCallback(() => {
+    cancelTimeout()
+    setEditing(false)
+    setTempValue(value)
+  }, [setEditing, setTempValue, value, cancelTimeout])
+
+  const confirm = useCallback(() => {
+    cancelTimeout()
+    setEditing(false)
+    onEdit(tempValue)
+  }, [setEditing, onEdit, tempValue, cancelTimeout])
+
+  React.useEffect(() => {
+    if (value !== tempValue) {
+      setTempValue(value)
+    }
+  }, [value])
+
+  if (editing) {
+    return (
+      <>
+        <Input
+          value={tempValue}
+          onChange={(e) => setTempValue(e.target.value)}
+          onBlur={(e) => {
+            timeoutRef.current = setTimeout(abort, 20)
+          }}
+          onKeyPress={(e) => {
+            if (e.key === 'Enter') {
+              confirm()
+            } else if (e.key === 'Escape') {
+              abort()
+            }
+          }}
+          style={{marginRight: 8}}
+        />
+        <Button icon="check" size="tiny" onClick={confirm} />
+        <Button icon="repeat" size="tiny" onClick={abort} />
+      </>
+    )
+  } else {
+    return (
+      <>
+        {value && <span style={{marginRight: 8}}>{value}</span>}
+        <Button icon="edit" size="tiny" onClick={() => setEditing(true)} />
+      </>
+    )
+  }
+}
+
+export default function DeviceList() {
+  const {t} = useTranslation()
+  const [loading_, setLoading] = React.useState(false)
+
+  const trigger$ = useMemo(() => new Subject(), [])
+  const devices: null | UserDevice[] = useObservable(() =>
+    trigger$.pipe(
+      startWith(null),
+      switchMap(() => concat(of(null), from(api.get('/user/devices'))))
+    )
+  )
+
+  const setDeviceDisplayName = useCallback(
+    async (deviceId: number, displayName: string) => {
+      setLoading(true)
+      try {
+        await api.put(`/user/devices/${deviceId}`, {body: {displayName}})
+      } finally {
+        setLoading(false)
+        trigger$.next(null)
+      }
+    },
+    [trigger$, setLoading]
+  )
+
+  const loading = devices == null || loading_
+
+  return (
+    <>
+      <Table compact {...{loading}}>
+        <Table.Header>
+          <Table.Row>
+            <Table.HeaderCell width={4}>{t('SettingsPage.devices.identifier')}</Table.HeaderCell>
+            <Table.HeaderCell>{t('SettingsPage.devices.alias')}</Table.HeaderCell>
+            <Table.HeaderCell />
+          </Table.Row>
+        </Table.Header>
+        <Table.Body>
+          {devices?.map((device: UserDevice) => (
+            <Table.Row key={device.id}>
+              <Table.Cell> {device.identifier}</Table.Cell>
+              <Table.Cell>
+                <EditField
+                  value={device.displayName}
+                  onEdit={(displayName: string) => setDeviceDisplayName(device.id, displayName)}
+                />
+              </Table.Cell>
+            </Table.Row>
+          ))}
+        </Table.Body>
+      </Table>
+    </>
+  )
+}

frontend/src/pages/SettingsPage/UserSettingsForm.tsx

@@ -0,0 +1,89 @@
+import React from "react";
+import { connect } from "react-redux";
+import {
+  Segment,
+  Message,
+  Form,
+  Button,
+  TextArea,
+  Ref,
+  Input,
+} from "semantic-ui-react";
+import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+
+import { setLogin } from "reducers/login";
+import api from "api";
+import { findInput } from "utils";
+
+const UserSettingsForm = connect((state) => ({ login: state.login }), {
+  setLogin,
+})(function UserSettingsForm({ login, setLogin, errors, setErrors }) {
+  const { t } = useTranslation();
+  const { register, handleSubmit } = useForm();
+  const [loading, setLoading] = React.useState(false);
+
+  const onSave = React.useCallback(
+    async (changes) => {
+      setLoading(true);
+      setErrors(null);
+      try {
+        const response = await api.put("/user", { body: changes });
+        setLogin(response);
+      } catch (err) {
+        setErrors(err.errors);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [setLoading, setLogin, setErrors]
+  );
+
+  return (
+    <Segment style={{ maxWidth: 600 }}>
+      <Form onSubmit={handleSubmit(onSave)} loading={loading}>
+        <Form.Field error={errors?.username}>
+          <label>{t("SettingsPage.profile.username.label")}</label>
+          <Ref innerRef={findInput(register)}>
+            <Input name="username" defaultValue={login.username} disabled />
+          </Ref>
+          <small>{t("SettingsPage.profile.username.hint")}</small>
+        </Form.Field>
+
+        <Message info visible>
+          {t("SettingsPage.profile.publicNotice")}
+        </Message>
+
+        <Form.Field error={errors?.displayName}>
+          <label>{t("SettingsPage.profile.displayName.label")}</label>
+          <Ref innerRef={findInput(register)}>
+            <Input
+              name="displayName"
+              defaultValue={login.displayName}
+              placeholder={login.username}
+            />
+          </Ref>
+          <small>{t("SettingsPage.profile.displayName.fallbackNotice")}</small>
+        </Form.Field>
+
+        <Form.Field error={errors?.bio}>
+          <label>{t("SettingsPage.profile.bio.label")}</label>
+          <Ref innerRef={register}>
+            <TextArea name="bio" rows={4} defaultValue={login.bio} />
+          </Ref>
+        </Form.Field>
+        <Form.Field error={errors?.image}>
+          <label>{t("SettingsPage.profile.avatarUrl.label")}</label>
+          <Ref innerRef={findInput(register)}>
+            <Input name="image" defaultValue={login.image} />
+          </Ref>
+        </Form.Field>
+
+        <Button type="submit" primary>
+          {t("general.save")}
+        </Button>
+      </Form>
+    </Segment>
+  );
+});
+export default UserSettingsForm;

frontend/src/pages/SettingsPage/index.tsx

@@ -0,0 +1,70 @@
+import React from "react";
+import { connect } from "react-redux";
+import { Header, Tab } from "semantic-ui-react";
+import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+
+import { setLogin } from "reducers/login";
+import { Page, Stats } from "components";
+import api from "api";
+
+import ApiKeySettings from "./ApiKeySettings";
+
+import UserSettingsForm from "./UserSettingsForm";
+import DeviceList from "./DeviceList";
+
+const SettingsPage = connect((state) => ({ login: state.login }), { setLogin })(
+  function SettingsPage({ login, setLogin }) {
+    const { t } = useTranslation();
+    const { register, handleSubmit } = useForm();
+    const [loading, setLoading] = React.useState(false);
+    const [errors, setErrors] = React.useState(null);
+
+    const onGenerateNewKey = React.useCallback(async () => {
+      setLoading(true);
+      setErrors(null);
+      try {
+        const response = await api.put("/user", {
+          body: { updateApiKey: true },
+        });
+        setLogin(response);
+      } catch (err) {
+        setErrors(err.errors);
+      } finally {
+        setLoading(false);
+      }
+    }, [setLoading, setLogin, setErrors]);
+
+    return (
+      <Page title={t("SettingsPage.title")}>
+        <Header as="h1">{t("SettingsPage.title")}</Header>
+        <Tab
+          menu={{ secondary: true, pointing: true }}
+          panes={[
+            {
+              menuItem: t("SettingsPage.profile.title"),
+              render: () => <UserSettingsForm {...{ errors, setErrors }} />,
+            },
+
+            {
+              menuItem: t("SettingsPage.apiKey.title"),
+              render: () => <ApiKeySettings {...{ errors, setErrors }} />,
+            },
+
+            {
+              menuItem: t("SettingsPage.stats.title"),
+              render: () => <Stats user={login.id} />,
+            },
+
+            {
+              menuItem: t("SettingsPage.devices.title"),
+              render: () => <DeviceList />,
+            },
+          ]}
+        />
+      </Page>
+    );
+  }
+);
+
+export default SettingsPage;

frontend/src/pages/TrackPage/TrackDetails.tsx

@@ -5,10 +5,7 @@ import { Duration } from "luxon";
 import { useTranslation } from "react-i18next";
 
 import { FormattedDate, Visibility } from "components";
-
+import { formatDistance, formatDuration } from "utils";
-function formatDuration(seconds) {
-  return Duration.fromMillis((seconds ?? 0) * 1000).toFormat("h'h' mm'm'");
-}
 
 export default function TrackDetails({ track, isAuthor }) {
   const { t } = useTranslation();
@@ -47,7 +44,7 @@ export default function TrackDetails({ track, isAuthor }) {
 
     track?.length != null && [
       t("TrackPage.details.length"),
-      `${(track?.length / 1000).toFixed(2)} km`,
+      formatDistance(track?.length),
     ],
 
     track?.processingStatus != null &&
@@ -63,23 +60,23 @@ export default function TrackDetails({ track, isAuthor }) {
   ].filter(Boolean);
 
   const COLUMNS = 4;
-  const chunkSize = Math.ceil(items.length / COLUMNS)
+  const chunkSize = Math.ceil(items.length / COLUMNS);
   return (
     <Grid>
       <Grid.Row columns={COLUMNS}>
-      {_.chunk(items, chunkSize).map((chunkItems, idx) => (
+        {_.chunk(items, chunkSize).map((chunkItems, idx) => (
-            <Grid.Column key={idx}>
+          <Grid.Column key={idx}>
-
+            <List>
-  <List>
+              {chunkItems.map(([title, value]) => (
-    {chunkItems.map(([title, value]) => (
+                <List.Item key={title}>
-      <List.Item key={title}>
+                  <List.Header>{title}</List.Header>
-      <List.Header>{title}</List.Header>
+                  <List.Description>{value}</List.Description>
-      <List.Description>{value}</List.Description>
+                </List.Item>
-      </List.Item>))}
+              ))}
-    </List>
+            </List>
-            </Grid.Column>
+          </Grid.Column>
-          ))}
+        ))}
-        </Grid.Row>
+      </Grid.Row>
     </Grid>
   );
 }

frontend/src/pages/UploadPage.tsx

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import React from "react";
-import { List, Loader, Table, Icon } from "semantic-ui-react";
+import { Header, List, Loader, Table, Icon } from "semantic-ui-react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 
@@ -150,8 +150,10 @@ export default function UploadPage() {
 
   const { t } = useTranslation();
 
+  const title = t("UploadPage.title");
   return (
-    <Page title="Upload">
+    <Page title={title}>
+      <Header as="h1">{title}</Header>
       {files.length ? (
         <Table>
           <Table.Header>

frontend/src/pages/index.js

@@ -1,11 +1,13 @@
-export {default as ExportPage} from './ExportPage'
+export { default as AcknowledgementsPage } from "./AcknowledgementsPage";
-export {default as HomePage} from './HomePage'
+export { default as ExportPage } from "./ExportPage";
-export {default as LoginRedirectPage} from './LoginRedirectPage'
+export { default as HomePage } from "./HomePage";
-export {default as LogoutPage} from './LogoutPage'
+export { default as LoginRedirectPage } from "./LoginRedirectPage";
-export {default as MapPage} from './MapPage'
+export { default as LogoutPage } from "./LogoutPage";
-export {default as NotFoundPage} from './NotFoundPage'
+export { default as MapPage } from "./MapPage";
-export {default as SettingsPage} from './SettingsPage'
+export { default as NotFoundPage } from "./NotFoundPage";
-export {default as TrackEditor} from './TrackEditor'
+export { default as SettingsPage } from "./SettingsPage";
-export {default as TrackPage} from './TrackPage'
+export { default as TrackEditor } from "./TrackEditor";
-export {default as TracksPage} from './TracksPage'
+export { default as TrackPage } from "./TrackPage";
-export {default as UploadPage} from './UploadPage'
+export { default as TracksPage } from "./TracksPage";
+export { default as MyTracksPage } from "./MyTracksPage";
+export { default as UploadPage } from "./UploadPage";

frontend/src/reducers/mapConfig.ts

@@ -1,95 +1,92 @@
-import { useMemo } from "react";
+import {useMemo} from 'react'
-import { useSelector } from "react-redux";
+import {useSelector} from 'react-redux'
-import produce from "immer";
+import produce from 'immer'
-import _ from "lodash";
+import _ from 'lodash'
 
-type BaseMapStyle = "positron" | "bright";
+type BaseMapStyle = 'positron' | 'bright'
 
 type RoadAttribute =
-  | "distance_overtaker_mean"
+  | 'distance_overtaker_mean'
-  | "distance_overtaker_min"
+  | 'distance_overtaker_min'
-  | "distance_overtaker_max"
+  | 'distance_overtaker_max'
-  | "distance_overtaker_median"
+  | 'distance_overtaker_median'
-  | "overtaking_event_count"
+  | 'overtaking_event_count'
-  | "usage_count"
+  | 'usage_count'
-  | "zone";
+  | 'zone'
 
 export type MapConfig = {
   baseMap: {
-    style: BaseMapStyle;
+    style: BaseMapStyle
-  };
+  }
   obsRoads: {
-    show: boolean;
+    show: boolean
-    showUntagged: boolean;
+    showUntagged: boolean
-    attribute: RoadAttribute;
+    attribute: RoadAttribute
-    maxCount: number;
+    maxCount: number
-  };
+  }
   obsEvents: {
-    show: boolean;
+    show: boolean
-  };
+  }
+  obsRegions: {
+    show: boolean
+  }
   filters: {
-    currentUser: boolean;
+    currentUser: boolean
-    dateMode: "none" | "range" | "threshold";
+    dateMode: 'none' | 'range' | 'threshold'
-    startDate?: null | string;
+    startDate?: null | string
-    endDate?: null | string;
+    endDate?: null | string
-    thresholdAfter?: null | boolean;
+    thresholdAfter?: null | boolean
-  };
+  }
-};
+}
 
 export const initialState: MapConfig = {
   baseMap: {
-    style: "positron",
+    style: 'positron',
   },
   obsRoads: {
     show: true,
     showUntagged: true,
-    attribute: "distance_overtaker_median",
+    attribute: 'distance_overtaker_median',
     maxCount: 20,
   },
   obsEvents: {
     show: false,
   },
+  obsRegions: {
+    show: true,
+  },
   filters: {
     currentUser: false,
-    dateMode: "none",
+    dateMode: 'none',
     startDate: null,
     endDate: null,
     thresholdAfter: true,
   },
-};
+}
 
 type MapConfigAction = {
-  type: "MAP_CONFIG.SET_FLAG";
+  type: 'MAP_CONFIG.SET_FLAG'
-  payload: { flag: string; value: any };
+  payload: {flag: string; value: any}
-};
+}
 
-export function setMapConfigFlag(
+export function setMapConfigFlag(flag: string, value: unknown): MapConfigAction {
-  flag: string,
+  return {type: 'MAP_CONFIG.SET_FLAG', payload: {flag, value}}
-  value: unknown
-): MapConfigAction {
-  return { type: "MAP_CONFIG.SET_FLAG", payload: { flag, value } };
 }
 
 export function useMapConfig() {
-  const mapConfig = useSelector((state) => state.mapConfig);
+  const mapConfig = useSelector((state) => state.mapConfig)
-  const result = useMemo(
+  const result = useMemo(() => _.merge({}, initialState, mapConfig), [mapConfig])
-    () => _.merge({}, initialState, mapConfig),
+  return result
-    [mapConfig]
-  );
-  return result;
 }
 
-export default function mapConfigReducer(
+export default function mapConfigReducer(state: MapConfig = initialState, action: MapConfigAction) {
-  state: MapConfig = initialState,
-  action: MapConfigAction
-) {
   switch (action.type) {
-    case "MAP_CONFIG.SET_FLAG":
+    case 'MAP_CONFIG.SET_FLAG':
       return produce(state, (draft) => {
-        _.set(draft, action.payload.flag, action.payload.value);
+        _.set(draft, action.payload.flag, action.payload.value)
-      });
+      })
 
     default:
-      return state;
+      return state
   }
 }

frontend/src/styles.less

@@ -10,6 +10,7 @@
 @borderColor: #e0e0e0;
 
 @menuHeight: 50px;
+@menuHeightMobile: 220px;
 
 @mobile: ~'screen and (max-width: 767px)';
 @desktop: ~'screen and (min-width: 768px)';

frontend/src/translations/de.yaml

@@ -49,17 +49,17 @@ LoginButton:
   login: Anmelden
 
 HomePage:
+  stats: Statistik
   mostRecentTrack: Neueste Fahrt
 
 Stats:
-  title: Statistik
-  titleUser: Meine Statistik
   placeholder: "..."
   totalTrackLength: Gesamtfahrstrecke
   timeRecorded: Aufzeichnungszeit
   eventsConfirmed: Bestätigte Vorgänge
   tracksRecorded: Aufgezeichnete Fahrten
   membersJoined: Neue Mitglieder
+  deviceCount: Geräte benutzt
   thisMonth: Dieser Monat
   thisYear: Dieses Jahr
   allTime: Immer
@@ -95,6 +95,7 @@ ExportPage:
     label: Modus
     placeholder: Modus wählen
     events: Überholvorgänge
+    segments: Straßenstatistiken
   format:
     label: Format
     placeholder: Format wählen
@@ -104,6 +105,7 @@ ExportPage:
     label: Geografischer Bereich
 
 UploadPage:
+  title: Fahrten hochladen
   uploadProgress: Lade hoch {{progress}}%
   processing: Verarbeiten...
 
@@ -133,6 +135,11 @@ NotFoundPage:
 
 MapPage:
   sidebar:
+    copyright:
+      learnMore: Mehr erfahren
+      openStreetMap: © OpenStreetMap
+      boundaries: © EuroGeographics bezüglich der Verwaltungsgrenzen
+
     baseMap:
       style:
         label: Stil der Basiskarte
@@ -158,6 +165,10 @@ MapPage:
     obsEvents:
       title: Überholvorgänge
 
+    obsRegions:
+      title: Regionen
+      colorByEventCount: Regionen eingefärbt nach Anzahl Überholungen
+
     filters:
       title: Filter
       needsLogin: Filter sind ohne Login nicht verfügbar.
@@ -194,20 +205,24 @@ MapPage:
 
     cardinalDirections:
       unknown: unbekannt
-      north: nordwärts
+      north: Norden
-      northEast: nordostwärts
+      northEast: Nordosten
-      east: ostwärts
+      east: Osten
-      southEast: südostwärts
+      southEast: Südosten
-      south: südwärts
+      south: Süden
-      southWest: südwestwärts
+      southWest: Südwesten
-      west: westwärts
+      west: Westen
-      northWest: nordwestwärts
+      northWest: Nordwesten
+
+  regionInfo:
+    unnamedRegion: Unbenannte Region
+    eventCount: Anzahl Überholungen
 
 SettingsPage:
-  title: Einstellungen
+  title: Mein Konto
 
   profile:
-    title: Mein Profil
+    title: Profil
     publicNotice: Alle Informationen ab hier sind öffentlich.
     username:
       label: Kontoname
@@ -223,7 +238,7 @@ SettingsPage:
       label: Avatar URL
 
   apiKey:
-    title: Mein API-Schlüssel
+    title: API-Schlüssel
     description: |
       Hier findest du deinen API-Schlüssel für die Nutzung mit dem
       OpenBikeSensor. Du kannst ihn dir herauskopieren und in der Seite für die
@@ -250,6 +265,14 @@ SettingsPage:
 
     generate: Neuen API-Schlüssel erstellen
 
+  stats:
+    title: Statistik
+
+  devices:
+    title: Geräte
+    identifier: Bezeichner
+    alias: Anzeigename
+
 TrackPage:
   downloadFailed: Download fehlgeschlagen
   downloadError: Diese Fahrt wurde vermutlich nicht korrekt importiert, oder in letzter Zeit nicht aktualisiert. Bitte frage den Administrator um Hilfe mit diesem Problem.
@@ -343,3 +366,47 @@ TrackEditor:
       vorhanden bleiben.
 
       **Nutze diese Funktion mit Bedacht und auf dein eigenes Risiko.**
+
+RegionStats:
+  title: Top-Regionen
+  regionName: Region
+  eventCount: Anzahl Überholungen
+
+AcknowledgementsPage:
+  title: Danksagungen
+  information: |
+    Diese Software kann nur funktionieren Dank der Arbeit vieler anderer
+    Menschen. Auf dieser Seite möchten wir die genutzten Datenbanken und
+    Bibliotheken hervorheben.
+
+    Wenn du die von dieser Software angezeigten Daten nutzen möchtest, zum
+    Beispiel Exporte, Downloads, Screenshots oder andere Extrakte, kann es sein
+    dass du einen oder mehrere dieser Datensätze weiterverwendest. Das
+    entsprechende Urheberrechts findet dann Anwendung, prüfe also bitte
+    sorgfältig die Lizenzbedigungen und ob sie für dich relevant sind. Denke
+    daran, die Autor:innen der Quellen angemessen zu attribuieren, auf deren
+    Arbeit dein Werk direkt oder indirekt durch Verwendung der Daten aufbaut.
+
+    ## Basiskarte
+
+    Die Basiskarte wird durch Daten aus der
+    [OpenStreetMap](openstreetmap.org/copyright) erzeugt und verwendet das
+    Schema und die Stile von [OpenMapTiles](https://openmaptiles.org/).
+
+    ## Straßenzüge
+
+    Informationen über Straßenzüge werden für die Verarbeitung hochgeladener
+    Fahrten und für die Anzeige der Straßensegmente auf der Karte verwendet.
+    Diese Informationen stammen aus der
+    [OpenStreetMap](openstreetmap.org/copyright).
+
+    ## Verwaltungsgrenzen
+
+    Verwaltungsgrenzen werden für statistische Auswertung der Regionen und
+    Anzeige auf der Karte verwendet und werden von
+    [NUTS](https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units)
+    importiert. Es gelten gesonderte Bedingungen für die Nutzung dieser Daten,
+    bitte folge dem obigen Link um mehr zu erfahren, wenn du diese Daten in
+    eigenen Werken nutzen möchtest.
+
+    © EuroGeographics bezüglich der Verwaltungsgrenzen

frontend/src/translations/en.yaml

@@ -54,17 +54,17 @@ LoginButton:
   login: Login
 
 HomePage:
+  stats: Statistics
   mostRecentTrack: Most recent track
 
 Stats:
-  title: Statistics
-  titleUser: My Statistic
   placeholder: "..."
   totalTrackLength: Total track length
   timeRecorded: Time recorded
   eventsConfirmed: Events confirmed
   tracksRecorded: Tracks recorded
   membersJoined: Members joined
+  deviceCount: Devices used
   thisMonth: This month
   thisYear: This year
   allTime: All time
@@ -101,6 +101,7 @@ ExportPage:
     label: Mode
     placeholder: Select mode
     events: Events
+    segments: Road statistics
   format:
     label: Format
     placeholder: Select format
@@ -110,6 +111,7 @@ ExportPage:
     label: Bounding Box
 
 UploadPage:
+  title: Upload tracks
   uploadProgress: Uploading {{progress}}%
   processing: Processing...
 
@@ -139,6 +141,11 @@ NotFoundPage:
 
 MapPage:
   sidebar:
+    copyright:
+      learnMore: Learn more
+      openStreetMap: © OpenStreetMap
+      boundaries: © EuroGeographics for the administrative boundaries
+
     baseMap:
       style:
         label: Basemap Style
@@ -164,6 +171,10 @@ MapPage:
     obsEvents:
       title: Event points
 
+    obsRegions:
+      title: Regions
+      colorByEventCount: Color regions are based on event count
+
     filters:
       title: Filters
       needsLogin: No filters available without login.
@@ -208,11 +219,15 @@ MapPage:
       west: west bound
       northWest: north-west bound
 
+  regionInfo:
+    unnamedRegion: Unnamed region
+    eventCount: Event count
+
 SettingsPage:
-  title: Settings
+  title: My Account
 
   profile:
-    title: My profile
+    title: Profile
     publicNotice: All of the information below is public.
     username:
       label: Username
@@ -228,7 +243,7 @@ SettingsPage:
       label: Avatar URL
 
   apiKey:
-    title: My API Key
+    title: API Key
     description: |
       Here you find your API Key, for use in the OpenBikeSensor. You can to
       copy and paste it into your sensor's configuration interface to allow
@@ -252,6 +267,13 @@ SettingsPage:
 
     generate: Generate new API key
 
+  stats:
+    title: Statistics
+
+  devices:
+    title: Devices
+    identifier: Identifier
+    alias: Alias
 
 TrackPage:
   downloadFailed: Download failed
@@ -342,3 +364,43 @@ TrackEditor:
       later.
 
       **Use at your own risk.**
+
+RegionStats:
+  title: Top regions
+  regionName: Region name
+  eventCount: Event count
+
+AcknowledgementsPage:
+  title: Acknowledgements
+  information: |
+    This software is only able to function thanks to the work of other people.
+    On this page we'd like to acknowledge the work we depend on and the
+    databases and libraries we use.
+
+    If you use any data provided by this software, including exports,
+    downloads, screenshots or other extracted information, you might be making
+    use of these datasets, and their copyright provisision might apply to you.
+    Please take care to review this on a case by case basis and attribute the
+    origins of the data you are using in your derivate work, whether that is
+    directly or indirectly through this software.
+
+    ## Basemap
+
+    Basemap data is generally generated from
+    [OpenStreetMap](openstreetmap.org/copyright) data and is using the
+    [OpenMapTiles](https://openmaptiles.org/) schema and styles.
+
+    ## Roadway information
+
+    Roadway information is used to process uploaded tracks and to display road
+    segment statistics. This data is extracted from the
+    [OpenStreetMap](openstreetmap.org/copyright).
+
+    ## Region boundaries
+
+    Region boundaries for statistical analysis and map display are imported from
+    [NUTS](https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units).
+    Provisions apply to the use of region boundary data, please follow above
+    link to learn more if you want to use this information in your derivative work.
+
+    © EuroGeographics for the administrative boundaries

frontend/src/translations/fr.yaml

@@ -65,6 +65,7 @@ Stats:
   eventsConfirmed: Evénements confirmées
   tracksRecorded: Traces enregistrées
   membersJoined: Membres enregistrés
+  deviceCount: Appareils utilisés
   thisMonth: Ce mois
   thisYear: Cette annéee
   allTime: De tout temps
@@ -101,6 +102,7 @@ ExportPage:
     label: Mode
     placeholder: Sélectionner un mode
     events: Evénements
+    segments: Statistiques des rues
   format:
     label: Format
     placeholder: Sélectionner un format
@@ -139,6 +141,11 @@ NotFoundPage:
 
 MapPage:
   sidebar:
+    copyright:
+      learnMore: En savoir plus
+      openStreetMap: © OpenStreetMap
+      boundaries: © EuroGeographics pour les limites administratives
+
     baseMap:
       style:
         label: Style de fond de carte
@@ -164,6 +171,10 @@ MapPage:
     obsEvents:
       title: Points d'événement
 
+    obsRegions:
+      title: Régions
+      colorByEventCount: Couleurs des régions sont basées sur le nombre d'événements
+
     filters:
       title: Filtres
       needsLogin: Aucun filtre disponible sans être connecté.
@@ -208,6 +219,10 @@ MapPage:
       west: Ouest
       northWest: Nord-Ouest
 
+  regionInfo:
+    unnamedRegion: Région sans nom
+    eventCount: Nombre de dépassements
+
 SettingsPage:
   title: Paramètres
 
@@ -228,7 +243,7 @@ SettingsPage:
       label: URL d'avatar
 
   apiKey:
-    title: MA clé d'API
+    title: Ma clé d'API
     description: |
       Ici vous trouvez votre clé API, pour l'utilisation dans le OpenBikeSensor.
       Vous pouvez la copier et coller dans l'interface de configuration de votre
@@ -237,10 +252,10 @@ SettingsPage:
       Veuillez protéger votre clé API soigneusement car elle permet un contrôle
       total sur votre compte.
     urlDescription: |
-      L'URL de l'API doit être définie comme suit :
+      L'URL de l'API doit être définie comme suit:
     generateDescription: |
       Vous pouvez générer une nouvelle clé API ici, qui invalidera l'ancienne,
-      déconnectant de votre compte tous les appareils sur lesquels vous l'avez utilisée..
+      déconnectant de votre compte tous les appareils sur lesquels vous l'avez utilisée.
 
     key:
       label: Clé API Personnel
@@ -252,6 +267,10 @@ SettingsPage:
 
     generate: Générer une nouvelle clé API
 
+  devices:
+    title: Appareils
+    identifier: Identifiant
+    alias: Alias
 
 TrackPage:
   downloadFailed: Le téléchargement a échoué
@@ -343,3 +362,45 @@ TrackEditor:
       ou les rendez anonymes plus tard.
 
       **Utilisation à vos risques et périls.**
+
+RegionStats:
+  title: Top régions
+  regionName: Nom de la région
+  eventCount: Nombre de dépassements
+
+AcknowledgementsPage:
+  title: Remerciements
+  information: |
+    Ce logiciel ne peut fonctionner que grâce au travail d'autres personnes.
+    Sur cette page, nous aimerions reconnaître le travail dont nous dépendons et le
+    bases de données et bibliothèques que nous utilisons.
+
+    Si vous utilisez des données fournies par ce logiciel, y compris les exportations,
+    téléchargements, captures d'écran ou autres informations extraites, vous pourriez faire
+    l'utilisation de ces ensembles de données, et leur disposition sur le droit d'auteur peut s'appliquer à vous.
+    Veuillez prendre soin d'examiner cela au cas par cas et d'attribuer le
+    origines des données que vous utilisez dans votre travail dérivé, que ce soit
+    directement ou indirectement via ce logiciel.
+
+    ## Fond de carte
+
+    Les données de fond de carte sont généralement générées à partir de
+    [OpenStreetMap](openstreetmap.org/copyright) données et utilise le
+    [OpenMapTiles](https://openmaptiles.org/) schéma et styles.
+
+    ## Informations routières
+
+    Les informations routières sont utilisées pour traiter les pistes
+    téléchargées et pour afficher la route statistiques de segments. Ces
+    données sont extraites du [OpenStreetMap](openstreetmap.org/copyright).
+
+    ## Limites administratives
+
+    Les limites administratives pour l'analyse statistique et l'affichage de la
+    carte sont importées de
+    [NUTS](https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units).
+    Des dispositions s'appliquent à l'utilisation des données sur les limites
+    de la région, veuillez suivre ci-dessus lien pour en savoir plus si vous
+    souhaitez utiliser ces informations dans votre travail dérivé.
+
+    © EuroGeographics pour les limites administratives

frontend/src/types.ts

@@ -1,52 +1,67 @@
-import type {FeatureCollection, Feature, LineString, Point} from 'geojson'
+import type { FeatureCollection, Feature, LineString, Point } from "geojson";
 
-export type UserProfile = {
+export interface UserProfile {
-  id: number | string
+  username: string;
-  displayName: string
+  displayName: string;
-  image?: string | null
+  image?: string | null;
-  bio?: string | null
+  bio?: string | null;
 }
 
-export type TrackData = {
+export interface TrackData {
-  track: Feature<LineString>
+  track: Feature<LineString>;
-  measurements: FeatureCollection
+  measurements: FeatureCollection;
-  overtakingEvents: FeatureCollection
+  overtakingEvents: FeatureCollection;
 }
 
-export type Track = {
+export type ProcessingStatus =
-  slug: string
+  | "error"
-  author: UserProfile
+  | "complete"
-  title: string
+  | "created"
-  description?: string
+  | "queued"
-  createdAt: string
+  | "processing";
-  public?: boolean
+
-  recordedAt?: Date
+export interface Track {
-  recordedUntil?: Date
+  slug: string;
-  duration?: number
+  author: UserProfile;
-  length?: number
+  title: string;
-  segments?: number
+  description?: string;
-  numEvents?: number
+  createdAt: string;
-  numMeasurements?: number
+  processingStatus?: ProcessingStatus;
-  numValid?: number
+  public?: boolean;
+  recordedAt?: Date;
+  recordedUntil?: Date;
+  duration?: number;
+  length?: number;
+  segments?: number;
+  numEvents?: number;
+  numMeasurements?: number;
+  numValid?: number;
+  userDeviceId?: number;
 }
 
-export type TrackPoint = {
+export interface TrackPoint {
-  type: 'Feature'
+  type: "Feature";
-  geometry: Point
+  geometry: Point;
   properties: {
-    distanceOvertaker: null | number
+    distanceOvertaker: null | number;
-    distanceStationary: null | number
+    distanceStationary: null | number;
-  }
+  };
 }
 
-export type TrackComment = {
+export interface TrackComment {
-  id: string
+  id: string;
-  body: string
+  body: string;
-  createdAt: string
+  createdAt: string;
-  author: UserProfile
+  author: UserProfile;
 }
 
-export type Location {
+export interface Location {
   longitude: number;
   latitude: number;
 }
+
+export interface UserDevice {
+  id: number;
+  identifier: string;
+  displayName?: string;
+}

frontend/src/utils.js

@@ -1,32 +1,51 @@
-import {useRef, useCallback} from 'react'
+import { useRef, useCallback } from "react";
+import { Duration } from "luxon";
 
 // Wraps the register callback from useForm into a new ref function, such that
 // any child of the provided element that is an input component will be
 // registered.
 export function findInput(register) {
   return (element) => {
-    const found = element ? element.querySelector('input, textarea, select, checkbox') : null
+    const found = element
-    register(found)
+      ? element.querySelector("input, textarea, select, checkbox")
-  }
+      : null;
+    register(found);
+  };
 }
 
 // Generates pairs from the input iterable
 export function* pairwise(it) {
-  let lastValue
+  let lastValue;
-  let firstRound = true
+  let firstRound = true;
 
   for (const i of it) {
     if (firstRound) {
-      firstRound = false
+      firstRound = false;
     } else {
-      yield [lastValue, i]
+      yield [lastValue, i];
     }
-    lastValue = i
+    lastValue = i;
   }
 }
 
 export function useCallbackRef(fn) {
-  const fnRef = useRef()
+  const fnRef = useRef();
-  fnRef.current = fn
+  fnRef.current = fn;
-  return useCallback(((...args) => fnRef.current(...args)), [])
+  return useCallback((...args) => fnRef.current(...args), []);
+}
+
+export function formatDuration(seconds) {
+  return Duration.fromMillis((seconds ?? 0) * 1000).toFormat("h'h' mm'm'");
+}
+
+export function formatDistance(meters) {
+  if (meters == null) return null;
+
+  if (meters < 0) return "-" + formatDistance(meters);
+
+  if (meters < 1000) {
+    return `${meters.toFixed(0)} m`;
+  } else {
+    return `${(meters / 1000).toFixed(2)} km`;
+  }
 }

osm2pgsql.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-osm2pgsql --create --hstore --style tools/roads_import.lua -O flex -d postgresql://$OBS_POSTGRES_USER:$OBS_POSTGRES_PASSWORD@$OBS_POSTGRES_HOST/$OBS_POSTGRES_DB /pbf/*.osm.pbf
-

roads_import.lua

@@ -1,133 +0,0 @@
---
--- To use this file, see
--- https://mygisnotes.wordpress.com/2015/10/09/openstreepmap-import-data-into-a-postgis-database-and-incrementally-update-it/
--- for general instructions:
--- 1. Download PBF
--- 2. Convert and filter to your needs
--- 3. Run the import like this:
---
---    osm2pgsql --create --hstore --style roads_import.lua -O flex \
---      --proj 32629 -H localhost -d obs -U obs -W \
---      YOUR_FILE.o5m
-
-local function contains(table, val)
-  for i=1,#table do
-    if table[i] == val then
-      return true
-    end
-  end
-  return false
-end
-
-local HIGHWAY_TYPES = {
-  "trunk",
-  "primary",
-  "secondary",
-  "tertiary",
-  "unclassified",
-  "residential",
-  "trunk_link",
-  "primary_link",
-  "secondary_link",
-  "tertiary_link",
-  "living_street",
-  "service",
-  "track",
-  "road",
-}
-local ZONE_TYPES = {
-  "urban",
-  "rural",
-  "motorway",
-}
-local URBAN_TYPES = {
-  "residential",
-  "living_street",
-  "road",
-}
-local MOTORWAY_TYPES = {
-  "motorway",
-  "motorway_link",
-}
-
-local ONEWAY_YES = {"yes", "true", "1"}
-local ONEWAY_REVERSE = {"reverse", "-1"}
-
-local roads = osm2pgsql.define_way_table('road', {
-  { column = 'zone', type = 'text', sql_type="zone_type" },
-  { column = 'directionality', type = 'int' },
-  { column = 'name', type = 'text' },
-  { column = 'geometry', type = 'linestring' },
-  { column = 'oneway', type = 'bool' },
-})
-
-local minspeed_rural = 60
-
-function osm2pgsql.process_way(object)
-  if object.tags.highway and contains(HIGHWAY_TYPES, object.tags.highway) then
-    local tags = object.tags
-    local zone = nil
-
-    if tags["zone:traffic"] then
-      zone = tags["zone:traffic"]
-
-      if zone == "DE:urban" then
-        zone = "urban"
-      elseif zone == "DE:rural" then
-        zone = "rural"
-      elseif zone == "DE:motorway" then
-        zone = "motorway"
-      elseif string.match(zone, "rural") then
-        zone = "rural"
-      elseif string.match(zone, "urban") then
-        zone = "urban"
-      elseif string.match(zone, "motorway") then
-        zone = "motorway"
-      elseif string.match(zone, "30") then
-        zone = "urban"
-      else
-        zone = "urban"
-      end
-    end
-    if not tags["zone:traffic"] then
-      if contains(URBAN_TYPES, tags.highway) then
-        zone = "urban"
-      elseif contains(MOTORWAY_TYPES, tags.highway) then
-        zone = "motorway"
-      elseif (tags.maxspeed) and (tonumber(string.match(tags.maxspeed, '[%d]*'))) and tonumber(string.match(tags.maxspeed, '[%d]*')) > minspeed_rural then
-        zone = "rural"
-      elseif (tags["maxspeed:forward"]) and (tonumber(string.match(tags["maxspeed:forward"], '[%d]*'))) and tonumber(string.match(tags["maxspeed:forward"], '[%d]*')) > minspeed_rural then
-        zone = "rural"
-      elseif (tags["maxspeed:backward"]) and (tonumber(string.match(tags["maxspeed:backward"], '[%d]*'))) and tonumber(string.match(tags["maxspeed:backward"], '[%d]*')) > minspeed_rural then
-        zone = "rural"
-      elseif tags['source:maxspeed'] and string.match(tags['source:maxspeed'], "rural") then
-        zone = "rural"
-      elseif tags['source:maxspeed'] and string.match(tags['source:maxspeed'], "urban") then
-        zone = "urban"
-      else
-        -- we can't figure it out
-        zone = "urban"
-      end
-    end
-
-    local directionality = 0
-    local oneway = tags.oneway
-
-    -- See https://wiki.openstreetmap.org/wiki/Key:oneway section "Implied oneway restriction"
-    if contains(ONEWAY_YES, tags.oneway) or tags.junction == "roundabout" or zone == "motorway" then
-      directionality = 1
-      oneway = true
-    elseif contains(ONEWAY_REVERSE, tags.oneway) then
-      directionality = -1
-      oneway = true
-    end
-
-    roads:add_row({
-      geom = { create = 'linear' },
-      name = tags.name,
-      zone = zone,
-      directionality = directionality,
-      oneway = oneway,
-    })
-  end
-end

tile-generator/layers/obs_events/layer.sql

@@ -3,7 +3,7 @@ RETURNS TABLE(event_id bigint, geometry geometry, distance_overtaker float, dist
 
     SELECT
       overtaking_event.id::bigint as event_id,
-      ST_Transform(overtaking_event.geometry, 3857) as geometry,
+      overtaking_event.geometry as geometry,
       distance_overtaker,
       distance_stationary,
       (case when direction_reversed then -1 else 1 end)::int as direction,
@@ -14,7 +14,8 @@ RETURNS TABLE(event_id bigint, geometry geometry, distance_overtaker float, dist
     FROM overtaking_event
     FULL OUTER JOIN road ON road.way_id = overtaking_event.way_id
     JOIN track on track.id = overtaking_event.track_id
-    WHERE ST_Transform(overtaking_event.geometry, 3857) && bbox
+    WHERE overtaking_event.geometry && bbox
+      AND zoom_level >= 8
       AND (user_id is NULL OR user_id = track.author_id)
       AND time BETWEEN COALESCE(min_time, '1900-01-01'::timestamp) AND COALESCE(max_time, '2100-01-01'::timestamp);
 

tile-generator/layers/obs_events/obs_events.yaml

@@ -19,7 +19,7 @@ layer:
     zone: |
       rural or urban
   defaults:
-    srs: EPSG:3785
+    srs: EPSG:3857
   datasource:
     srid: 3857
     geometry_field: geometry

tile-generator/layers/obs_regions/layer.sql

@@ -0,0 +1,26 @@
+DROP FUNCTION IF EXISTS layer_obs_regions(geometry, int);
+
+CREATE OR REPLACE FUNCTION layer_obs_regions(bbox geometry, zoom_level int)
+RETURNS TABLE(
+  region_id int,
+  geometry geometry,
+  name text,
+  overtaking_event_count int
+) AS $$
+
+    SELECT
+      -- region.id as region_id,
+      NULL::int as region_id,
+      -- ST_SimplifyPreserveTopology(region.geometry, ZRes(zoom_level + 2)) as geometry,
+      region.geometry as geometry,
+      region.name as name,
+      count(overtaking_event.id)::int as overtaking_event_count
+    FROM region
+      LEFT OUTER JOIN overtaking_event on ST_Within(overtaking_event.geometry, region.geometry)
+    WHERE
+      zoom_level >= 3 AND
+      zoom_level <= 12 AND
+      region.geometry && bbox
+    GROUP BY region.id, region.name, region.geometry
+
+$$ LANGUAGE SQL IMMUTABLE;

tile-generator/layers/obs_regions/obs_regions.yaml

@@ -0,0 +1,21 @@
+layer:
+  id: "obs_regions"
+  description: |
+      Statistics on administrative boundary areas ("regions")
+  buffer_size: 4
+  fields:
+    overtaking_event_count: |
+      Number of overtaking events.
+    name: |
+      Name of the region
+  defaults:
+    srs: EPSG:3857
+  datasource:
+    srid: 3857
+    geometry_field: geometry
+    key_field: region_id
+    key_field_as_attribute: no
+    query: (SELECT region_id, geometry, name, overtaking_event_count FROM layer_obs_regions(!bbox!, z(!scale_denominator!))) AS t
+
+schema:
+  - ./layer.sql

tile-generator/layers/obs_roads/layer.sql

@@ -67,6 +67,7 @@ RETURNS TABLE(
     ) e on (e.way_id = road.way_id and (road.directionality != 0 or e.direction_reversed = r.rev))
 
     WHERE road.geometry && bbox
+      AND zoom_level >= 10
     GROUP BY
       road.name,
       road.way_id,

tile-generator/layers/obs_roads/obs_roads.yaml

@@ -27,7 +27,7 @@ layer:
     offset_direction: |
       Factor for offset to shift the line to the driving side. One of -1, 0, 1.
   defaults:
-    srs: EPSG:3785
+    srs: EPSG:3857
   datasource:
     srid: 3857
     geometry_field: geometry

tile-generator/openbikesensor.yaml

@@ -3,6 +3,7 @@ tileset:
   layers:
     - layers/obs_events/obs_events.yaml
     - layers/obs_roads/obs_roads.yaml
+    - layers/obs_regions/obs_regions.yaml
   version: 0.7.0
   id: openbikesensor
   description: >