style(i18n): wrap the long special theme hints the way Prettier wants

feat(appearance): Halloween special theme with 3D decor and a costumed mascot
Adds a Special Themes row to Settings > Appearance > Theme. Halloween is a scheme on the existing data-scheme axis that is always dark: the applier and the boot script force .dark while it is on, and the color mode control is dimmed with a hint. - Palette for the whole app (surfaces, dashboard, Vacay glass, Journey, mobile chrome) in theme/special/halloween.tokens.css, loaded with index.css. - Decor as a lazy chunk mounted by SpecialThemeLayer while the scheme is on: fog, embers, bat flocks, a passing ghost, corner cobwebs, spiders that drop on a thread and flee when poked, a pumpkin patch and an ember running along the navbar. Figures are pre-rendered 3D sprite sheets. - Nothing is drawn over a map: the Atlas gets no decor, the trip planner only dresses its side panels. Marker clusters turn into lanterns. - The 3D mascot plays its own Halloween clips in every scene (witch hat, a spider on the brim, a lit pumpkin beside it); the SVG fallback wears the same costume. - Reduced motion stills everything, transparency off drops the fog, shared pages never show it. - Navbar, bottom nav, notifications, Atlas and Collections read the dark flag off the .dark class instead of settings.dark_mode, so a forced dark theme reaches them.
2026-10-21 14:36:31 +00:00 · 2026-10-18 13:04:19 +02:00 · 2026-10-18 12:59:36 +02:00
1679 changed files with 6772 additions and 129959 deletions
@@ -9,73 +9,23 @@ permissions:
 # analysis; pull requests get PR analysis with decoration on the PR itself
 # (the scanner picks the context up from the Actions environment).
 #
-# Job names read "<package>: <what>", so the checks list on a PR sorts by
-# package. What each job holds:
-#
-#   Repo: Changed Areas      decides what the change needs to run (below)
-#   Shared: i18n Parity      every locale has en's files and keys
-#   Shared: Coverage         shared's tests with coverage
-#   Server: Types            builds shared and the server, typechecks shared,
-#                            the server's src, tests and scripts, smokes the
-#                            production require chain, the strict ratchet,
-#                            the generated entities and Kysely types
-#   Server: Lint & Checks    ESLint (typed), errors and warning counts; then
-#                            Prettier, the plugin facts, the DB call graph,
-#                            the shared ratchet code, the source ratchets
-#                            (size, boundaries, dialect, tx, test SQL, test
-#                            mocks, hand-built services, query API, MCP zod,
-#                            error envelopes, response contracts), open
-#                            request schemas, knip
-#   Server: Tests n/7        one slice of the server suite, with coverage
-#   Server: Coverage         merges the slices, checks the per-domain
-#                            thresholds, uploads lcov
-#   Server: S3 Contract (MinIO)
-#                            the storage driver against MinIO
-#   Server: Postgres Probe   the repository SQL against Postgres
-#   Client: Types & Checks   typecheck and the strict ratchet; then the page
-#                            pattern and the source ratchets (RTL, size,
-#                            Prettier, layers, offline path, duplication,
-#                            desktop/phone pairs, skips, i18n keys, theme
-#                            tokens)
-#   Client: Lint             ESLint (typed), errors and warning counts
-#   Client: Tests n/7        one slice of the client suite, with coverage
-#   Client: Coverage         merges the slices, checks the thresholds,
-#                            uploads lcov
-#   Client: Bundle           the production build, one chunk per map engine
-#   Client: End-to-End       the app in Chromium and WebKit
-#   Plugin SDK: Types & Coverage
-#   Repo: Docker Image       builds the image and boots it until ready
-#   Repo: Helm Chart & Compose
-#   Repo: Sonar Scan         SonarCloud analysis, not required
-#   ci-ok                    the one required check (below)
-#
-# Job layout:
-#   - Everything starts right after changes: the gates and the tests run side
-#     by side, so a run takes as long as its slowest job and not the gates
-#     plus the tests. The tests used to wait for the gates, which put ~9
-#     minutes in front of every test result. The gates were one job per
-#     package (~8-9 minutes each); each is now two jobs of ~4-5 minutes,
-#     split where the time is (the server's typechecks, the client's lint),
-#     so neither outlasts a test shard.
-#   - The client and server suites run in shards (client-tests,
-#     server-tests), each running a slice with coverage and uploading a blob
-#     report; client-coverage and server-coverage merge the blobs, check the
-#     thresholds against the whole and upload lcov. A red shard is usually a
-#     failing test, a red merge job usually a threshold. None of the other
-#     test jobs feeds the scan.
-#   - Job count: GitHub runs at most 20 jobs of the organisation at once and
-#     does not say in which order it starts queued ones. A code change starts
-#     the 14 shards and about a dozen other jobs; seven of those (parity, the
-#     SDK, the bundle, S3, Postgres, shared coverage, the chart) are done in
-#     a minute or two, so what queues at the start waits about that long. The
-#     jobs that run for minutes (shards, gates, e2e, the image) must not
-#     outnumber the 20 slots, or one of them waits for another to finish and
-#     the run grows by a whole job: a layout with six gate jobs did exactly
-#     that. Check the count before adding a long job or a shard.
-#   - Scan `needs:` the gates and the four coverage jobs. A coverage job
-#     failing must stop the scan — a missing lcov file would make every line
-#     of that package report as uncovered, and the dashboard would show a
-#     collapse that did not happen.
+# Job layout — three tiers:
+#   - Preflight: plugin-facts, i18n-parity and the quality jobs
+#     (server-quality, client-quality, plugin-sdk-quality) hold the cheap
+#     generated-code/typecheck/lint/smoke gates. Every test job `needs:` all
+#     of them, so a gate failure stops the run before the expensive coverage
+#     fan-out spends ~15 runner-minutes on a result the gates already sank.
+#   - Tests: the *-coverage jobs run the suites and upload lcov; s3-contract
+#     runs the MinIO contract suite. Coverage jobs run tests only — with the
+#     gates cleared in preflight, they can only fail because tests failed.
+#     client-e2e drives the real app in Chromium and WebKit, client-bundle
+#     builds the client and checks each map engine keeps a chunk of its own,
+#     and postgres-probe runs the dialect helpers and the repository
+#     statements it reaches against a Postgres service. None of them feeds the scan.
+#   - Scan `needs:` exactly the four coverage jobs. A coverage job failing
+#     must stop the scan — a missing lcov file would make every line of that
+#     package report as uncovered, and the dashboard would show a collapse
+#     that did not happen. (The preflight gates stop it transitively.)
 #   - Fork PRs and runs Dependabot triggers don't receive the repo's Actions
 #     secrets, so the two jobs that need them skip themselves: s3-contract
 #     (MINIO_LICENSE_KEY) and scan (SONAR_TOKEN). ci-ok counts a skip as
@@ -88,7 +38,7 @@ permissions:
 #     required check that never reports blocks the PR for good.
 #   - docker-image builds the Dockerfile and boots the result, and
 #     deploy-manifests lints and renders the Helm chart and checks the
-#     compose files. Both run beside the gates rather than after them.
+#     compose files. Both run beside the preflight rather than after it.
 #   - ci-ok `needs:` every gate, test, image and chart job, and is the one
 #     check the branch ruleset requires. It fails when any of them failed or
 #     was cancelled and passes when they passed or were skipped (by changes,
@@ -119,7 +69,7 @@ concurrency:

 jobs:
  changes:
-    name: 'Repo: Changed Areas'
+    name: Changed Areas
    runs-on: ubuntu-24.04
    timeout-minutes: 10
    outputs:
@@ -194,8 +144,36 @@ jobs:
            node scripts/ci/changed-areas.mjs --all
          fi

+  plugin-facts:
+    name: Plugin Permission Facts
+    needs: changes
+    if: needs.changes.outputs.code == 'true'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: package-lock.json
+
+      - name: Install dependencies
+        run: npm ci --workspace server
+
+      # The plugin permission facts live once, in
+      # server/src/nest/plugins/protocol/envelope.ts. Every other copy — the
+      # SDK's generated/host-facts.ts and shared's plugin-permissions.ts — is
+      # generated from it and checked in, because publish-plugin-sdk builds
+      # from a standalone checkout with no server present. This fails the run
+      # if a copy drifts, if a new permission has no admin.plugins.perm.*
+      # translation, or if the CLI has no hint for it.
+      - name: Check the generated plugin facts are in sync
+        run: cd server && npm run check:plugin-facts
+
  i18n-parity:
-    name: 'Shared: i18n Parity'
+    name: i18n Key Parity
    needs: changes
    if: needs.changes.outputs.code == 'true'
    runs-on: ubuntu-24.04
@@ -211,8 +189,8 @@ jobs:
      - name: Check i18n key parity
        run: node shared/scripts/i18n-parity.mjs --strict

-  server-types:
-    name: 'Server: Types'
+  server-quality:
+    name: Server Types & Lint
    needs: changes
    if: needs.changes.outputs.code == 'true'
    runs-on: ubuntu-24.04
@@ -261,11 +239,8 @@ jobs:
        # constructor parameter does not break its hand-wired call sites at
        # compile time: the argument arrives as undefined and throws at
        # runtime, if anything reads it at all. This is the step that
-        # catches it. src and tests together are past 570,000 lines and need
-        # about 4.3 GB, over Node's default heap.
+        # catches it.
        run: cd server && npm run typecheck:tests
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192

      - name: Typecheck entity generator
        # tsconfig.scripts.json covers generate-entities.ts and migrate-encryption.ts;
@@ -282,36 +257,6 @@ jobs:
        # migration that changes a column regenerates it in the same change.
        run: cd server && npm run check:db-types

-  server-lint-checks:
-    name: 'Server: Lint & Checks'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
-    runs-on: ubuntu-24.04
-    timeout-minutes: 45
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: package-lock.json
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build shared
-        run: npm run build --workspace=shared
-
-      - name: Fetch the base the warnings are compared with
-        # lint:warnings names the file behind a grown count by linting it as
-        # it is on the base: the pushed-over commit on a push, the target
-        # branch on a pull request. A miss only drops that hint.
-        run: >-
-          git fetch --no-tags --depth=1 origin
-          "+${{ github.event_name == 'push' && github.event.before || format('refs/heads/{0}', github.base_ref || 'dev') }}:refs/remotes/lint-base"
-          || true
-
      - name: Lint
        # Errors fail, and the warnings per rule may not pass
        # scripts/eslint-baseline.json (src, tests and eslint-disable'd
@@ -319,19 +264,8 @@ jobs:
        # program, which outgrows Node's default ~4 GB heap on the runner.
        env:
          NODE_OPTIONS: --max-old-space-size=8192
-          TREK_LINT_BASE: refs/remotes/lint-base
        run: cd server && npm run lint:warnings

-      # The plugin permission facts live once, in
-      # server/src/nest/plugins/protocol/envelope.ts. Every other copy — the
-      # SDK's generated/host-facts.ts and shared's plugin-permissions.ts — is
-      # generated from it and checked in, because publish-plugin-sdk builds
-      # from a standalone checkout with no server present. This fails the run
-      # if a copy drifts, if a new permission has no admin.plugins.perm.*
-      # translation, or if the CLI has no hint for it.
-      - name: Check the generated plugin facts are in sync
-        run: cd server && npm run check:plugin-facts
-
      - name: Formatting check
        # Prettier over src/ and tests/: a file outside
        # scripts/format-baseline.json must be formatted, and the list only
@@ -425,12 +359,12 @@ jobs:
        # knip (knip.jsonc) over client, server and shared: unused files,
        # exports, types and dependencies per file may not rise above
        # scripts/ci/knip-baseline.json (scripts/ci/knip-ratchet.mjs). Here
-        # rather than in client-types-checks because it needs every workspace's
-        # dependencies, which the client jobs do not install.
+        # rather than in client-quality because it needs every workspace's
+        # dependencies, which only this job installs.
        run: npm run lint:knip

-  client-types-checks:
-    name: 'Client: Types & Checks'
+  client-quality:
+    name: Client Types & Lint
    needs: changes
    if: needs.changes.outputs.code == 'true'
    runs-on: ubuntu-24.04
@@ -446,7 +380,7 @@ jobs:
          cache-dependency-path: package-lock.json

      - name: Install dependencies
-        run: npm ci --workspace shared --workspace client
+        run: npm ci --workspace shared && npm ci --workspace client

      - name: Build shared
        run: npm run build --workspace=shared
@@ -461,6 +395,15 @@ jobs:
        # one included, has to be clean (scripts/strict-lint.mjs).
        run: cd client && npm run lint:strict

+      - name: Lint
+        # Fails on any ESLint error, like lint:check did, and on any rule
+        # whose warning count rises above scripts/eslint-baseline.json.
+        # Typed linting (no-floating-promises, no-misused-promises) loads the
+        # whole TypeScript program, so it gets the heap the server lint gets.
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+        run: cd client && npm run lint:warnings
+
      - name: Page pattern check
        run: cd client && npm run lint:pages

@@ -524,12 +467,15 @@ jobs:
        # follow the user's scheme, accent and text size (scripts/theme-lint.mjs).
        run: cd client && npm run theme:lint

-  client-lint:
-    name: 'Client: Lint'
+  plugin-sdk-quality:
+    name: Plugin SDK Types
    needs: changes
    if: needs.changes.outputs.code == 'true'
    runs-on: ubuntu-24.04
    timeout-minutes: 45
+    defaults:
+      run:
+        working-directory: plugin-sdk

    steps:
      - uses: actions/checkout@v6
@@ -537,40 +483,20 @@ jobs:
      - uses: actions/setup-node@v6
        with:
          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: package-lock.json

+      # plugin-sdk is standalone (own lockfile, not a root workspace), so it
+      # installs from its own directory.
      - name: Install dependencies
-        run: npm ci --workspace shared --workspace client
+        run: npm ci

-      - name: Build shared
-        run: npm run build --workspace=shared
-
-      - name: Fetch the base the warnings are compared with
-        # lint:warnings names the file behind a grown count by linting it as
-        # it is on the base: the pushed-over commit on a push, the target
-        # branch on a pull request. A miss only drops that hint.
-        run: >-
-          git fetch --no-tags --depth=1 origin
-          "+${{ github.event_name == 'push' && github.event.before || format('refs/heads/{0}', github.base_ref || 'dev') }}:refs/remotes/lint-base"
-          || true
-
-      - name: Lint
-        # Fails on any ESLint error, like lint:check did, and on any rule
-        # whose warning count rises above scripts/eslint-baseline.json.
-        # Typed linting (no-floating-promises, no-misused-promises) loads the
-        # whole TypeScript program, so it gets the heap the server lint gets.
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
-          TREK_LINT_BASE: refs/remotes/lint-base
-        run: cd client && npm run lint:warnings
+      - name: Typecheck
+        run: npm run typecheck

  client-bundle:
-    name: 'Client: Bundle'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+    name: Client Bundle
    runs-on: ubuntu-24.04
    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    steps:
      - uses: actions/checkout@v6

@@ -581,7 +507,7 @@ jobs:
          cache-dependency-path: package-lock.json

      - name: Install dependencies
-        run: npm ci --workspace shared --workspace client
+        run: npm ci --workspace shared && npm ci --workspace client

      - name: Build shared
        run: npm run build --workspace=shared
@@ -597,11 +523,10 @@ jobs:
        run: cd client && npm run check:gl-split

  client-e2e:
-    name: 'Client: End-to-End'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+    name: Client End-to-End
    runs-on: ubuntu-24.04
    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    steps:
      - uses: actions/checkout@v6

@@ -655,17 +580,17 @@ jobs:
          retention-days: 7

  s3-contract:
-    name: 'Server: S3 Contract (MinIO)'
+    name: S3 Driver Contract (MinIO)
    runs-on: ubuntu-24.04
    timeout-minutes: 45
-    needs: changes
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    # Fork PRs don't get repo secrets, so MINIO_LICENSE_KEY would be empty and
    # the AIStor container would fail to boot. A run Dependabot triggers gets
    # only Dependabot secrets, so its PRs (same repo, not a fork) hit the same
    # wall. Pushes and manual dispatches by anyone else do have secrets, so
-    # only those two are filtered out.
+    # only those two are filtered out. (The implicit success() on this
+    # expression also keeps the job skipped when a preflight fails.)
    if: >-
-      needs.changes.outputs.code == 'true' &&
      github.actor != 'dependabot[bot]' &&
      (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)

@@ -681,14 +606,14 @@ jobs:
      - name: Install dependencies
        run: npm ci

-      - name: Check @swc/core's native binding loads
-        # The server's SWC transform (server/vitest.config.ts) needs it. The
-        # lockfile carries the Linux binary, so npm ci installs it; this only
-        # names the cause if a lockfile regenerated without it ever lands. (It
-        # used to be installed here with --legacy-peer-deps, which pruned
-        # eight peer packages and left the tests on a tree the lockfile does
-        # not describe.)
-        run: node -e "require('@swc/core').transformSync('let a = 1')"
+      - name: Ensure @swc/core's Linux binary for unplugin-swc
+        # The lockfile was generated on Windows and omits @swc/core's Linux
+        # optional native binary, so npm ci/install skips it on the runner.
+        # Install the matching version explicitly so the server's SWC transform
+        # (server/vitest.config.ts) can load.
+        run: |
+          SWC_VERSION=$(node -p "require('@swc/core/package.json').version")
+          npm install --no-save --legacy-peer-deps "@swc/core-linux-x64-gnu@$SWC_VERSION"

      - name: Build shared
        run: npm run build --workspace=shared
@@ -746,10 +671,10 @@ jobs:
  # artifact seeds the file and a change that fixes a statement can lower it
  # without a local Postgres.
  postgres-probe:
-    name: 'Server: Postgres Probe'
+    name: Postgres Probe
    runs-on: ubuntu-24.04
    timeout-minutes: 10
-    needs: changes
+    needs: [changes, plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    if: needs.changes.outputs.code == 'true'
    services:
      postgres:
@@ -802,20 +727,11 @@ jobs:
          if-no-files-found: ignore
          retention-days: 14

-  # The server suite in seven slices. vitest.shard.config.ts is vitest.config.ts
-  # without the thresholds and the coverage reports: a slice's blob carries
-  # its coverage to server-coverage, which checks the whole. fail-fast is off,
-  # so one red run shows every failing slice and not just the first.
-  server-tests:
-    name: 'Server: Tests ${{ matrix.shard }}/7'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+  server-coverage:
+    name: Server Coverage
    runs-on: ubuntu-24.04
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7]
+    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    steps:
      - uses: actions/checkout@v6

@@ -828,63 +744,20 @@ jobs:
      - name: Install dependencies
        run: npm ci

-      - name: Check @swc/core's native binding loads
-        # The server's SWC transform (server/vitest.config.ts) needs it. The
-        # lockfile carries the Linux binary, so npm ci installs it; this only
-        # names the cause if a lockfile regenerated without it ever lands. (It
-        # used to be installed here with --legacy-peer-deps, which pruned
-        # eight peer packages and left the tests on a tree the lockfile does
-        # not describe.)
-        run: node -e "require('@swc/core').transformSync('let a = 1')"
+      - name: Ensure @swc/core's Linux binary for unplugin-swc
+        # The lockfile was generated on Windows and omits @swc/core's Linux
+        # optional native binary, so npm ci/install skips it on the runner.
+        # Install the matching version explicitly so the server's SWC transform
+        # (server/vitest.config.ts) can load.
+        run: |
+          SWC_VERSION=$(node -p "require('@swc/core/package.json').version")
+          npm install --no-save --legacy-peer-deps "@swc/core-linux-x64-gnu@$SWC_VERSION"

      - name: Build shared
        run: npm run build --workspace=shared

-      - name: Run a slice of the tests with coverage
-        run: >-
-          cd server && npx vitest run --config vitest.shard.config.ts --coverage
-          --shard=${{ matrix.shard }}/7
-          --reporter=default --reporter=github-actions --reporter=blob
-
-      - name: Upload the blob report
-        uses: actions/upload-artifact@v6
-        with:
-          name: server-blob-${{ matrix.shard }}
-          path: server/.vitest-reports/
-          include-hidden-files: true
-          if-no-files-found: error
-          retention-days: 1
-
-  server-coverage:
-    name: 'Server: Coverage'
-    needs: server-tests
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: package-lock.json
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Download the blob reports
-        uses: actions/download-artifact@v7
-        with:
-          pattern: server-blob-*
-          path: server/.vitest-reports/
-          merge-multiple: true
-
-      - name: Merge the slices and check the thresholds
-        # Every blob holds a whole coverage map, and the merge reads them all
-        # into one process.
-        env:
-          NODE_OPTIONS: --max-old-space-size=6144
-        run: cd server && npx vitest run --merge-reports --coverage
+      - name: Run tests with coverage
+        run: cd server && npm run test:coverage

      - name: Upload coverage
        uses: actions/upload-artifact@v6
@@ -893,18 +766,11 @@ jobs:
          path: server/coverage/
          retention-days: 1

-  # The client suite in seven slices, the same way as server-tests. The two
-  # suites cost about the same per slice at seven each (~4-6 minutes).
-  client-tests:
-    name: 'Client: Tests ${{ matrix.shard }}/7'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+  client-coverage:
+    name: Client Coverage
    runs-on: ubuntu-24.04
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7]
+    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    steps:
      - uses: actions/checkout@v6

@@ -919,56 +785,13 @@ jobs:
      # @testing-library/react) in the tree without the re-resolution dance
      # the folded coverage job used to need.
      - name: Install dependencies
-        run: npm ci --workspace shared --workspace client
+        run: npm ci --workspace shared && npm ci --workspace client

      - name: Build shared
        run: npm run build --workspace=shared

-      - name: Run a slice of the tests with coverage
-        run: >-
-          cd client && npx vitest run --config vitest.shard.config.ts --coverage
-          --shard=${{ matrix.shard }}/7
-          --reporter=default --reporter=github-actions --reporter=blob
-
-      - name: Upload the blob report
-        uses: actions/upload-artifact@v6
-        with:
-          name: client-blob-${{ matrix.shard }}
-          path: client/.vitest-reports/
-          include-hidden-files: true
-          if-no-files-found: error
-          retention-days: 1
-
-  client-coverage:
-    name: 'Client: Coverage'
-    needs: client-tests
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: npm
-          cache-dependency-path: package-lock.json
-
-      - name: Install dependencies
-        run: npm ci --workspace shared --workspace client
-
-      - name: Download the blob reports
-        uses: actions/download-artifact@v7
-        with:
-          pattern: client-blob-*
-          path: client/.vitest-reports/
-          merge-multiple: true
-
-      - name: Merge the slices and check the thresholds
-        # Every blob holds a whole coverage map, and the merge reads them all
-        # into one process.
-        env:
-          NODE_OPTIONS: --max-old-space-size=6144
-        run: cd client && npx vitest run --merge-reports --coverage
+      - name: Run tests with coverage
+        run: cd client && npm run test:coverage

      - name: Upload coverage
        uses: actions/upload-artifact@v6
@@ -978,11 +801,10 @@ jobs:
          retention-days: 1

  shared-coverage:
-    name: 'Shared: Coverage'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+    name: Shared Coverage
    runs-on: ubuntu-24.04
    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    steps:
      - uses: actions/checkout@v6

@@ -1005,14 +827,11 @@ jobs:
          path: shared/coverage/
          retention-days: 1

-  # Typecheck and tests in one job: each takes seconds, and a runner of its
-  # own would cost more in setup than it saves.
-  plugin-sdk:
-    name: 'Plugin SDK: Types & Coverage'
-    needs: changes
-    if: needs.changes.outputs.code == 'true'
+  plugin-sdk-coverage:
+    name: Plugin SDK Coverage
    runs-on: ubuntu-24.04
    timeout-minutes: 45
+    needs: [plugin-facts, i18n-parity, server-quality, client-quality, plugin-sdk-quality]
    defaults:
      run:
        working-directory: plugin-sdk
@@ -1031,9 +850,6 @@ jobs:
      - name: Install dependencies
        run: npm ci

-      - name: Typecheck
-        run: npm run typecheck
-
      - name: Run tests with coverage
        run: npm run test:coverage

@@ -1045,7 +861,7 @@ jobs:
          retention-days: 1

  scan:
-    name: 'Repo: Sonar Scan'
+    name: Scan
    runs-on: ubuntu-24.04
    timeout-minutes: 45
    # Fork PRs and Dependabot runs don't receive SONAR_TOKEN, so skip the scan
@@ -1055,18 +871,9 @@ jobs:
      (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
    # Coverage jobs failing must stop the scan: a missing lcov file would make
    # every line of that package report as uncovered, and the dashboard would
-    # show a collapse that did not happen. The gates run beside the tests now,
-    # so they are listed here too, and a failed gate still stops the scan.
-    needs:
-      - i18n-parity
-      - server-types
-      - server-lint-checks
-      - client-types-checks
-      - client-lint
-      - server-coverage
-      - client-coverage
-      - shared-coverage
-      - plugin-sdk
+    # show a collapse that did not happen. The preflight gates already stop it
+    # transitively through these four, so they aren't repeated here.
+    needs: [server-coverage, client-coverage, shared-coverage, plugin-sdk-coverage]

    steps:
      - uses: actions/checkout@v6
@@ -1127,7 +934,7 @@ jobs:
  # reached dev unseen. It is separate from the vulnerability scan on purpose,
  # so a newly published CVE cannot hide a broken build or the other way round.
  docker-image:
-    name: 'Repo: Docker Image'
+    name: Docker Image
    needs: changes
    if: needs.changes.outputs.image == 'true'
    runs-on: ubuntu-24.04
@@ -1204,7 +1011,7 @@ jobs:
  # the output checked against the Kubernetes API schemas. Both tools come
  # from their release pages, pinned by version and checksum.
  deploy-manifests:
-    name: 'Repo: Helm Chart & Compose'
+    name: Helm Chart & Compose
    needs: changes
    if: needs.changes.outputs.deploy == 'true'
    runs-on: ubuntu-24.04
@@ -1275,21 +1082,19 @@ jobs:
  ci-ok:
    needs:
      - changes
+      - plugin-facts
      - i18n-parity
-      - server-types
-      - server-lint-checks
-      - client-types-checks
-      - client-lint
+      - server-quality
+      - client-quality
+      - plugin-sdk-quality
      - client-bundle
      - client-e2e
      - s3-contract
      - postgres-probe
-      - server-tests
      - server-coverage
-      - client-tests
      - client-coverage
      - shared-coverage
-      - plugin-sdk
+      - plugin-sdk-coverage
      - docker-image
      - deploy-manifests
    # always(): without it a failed dependency would skip this job, and the
@@ -55,8 +55,6 @@ coverage
 coverage-*/
 *.lcov
 .nyc_output
-# Blob reports of a sharded vitest run (test.yml)
-.vitest-reports

 # Cache
 .npm
@@ -134,10 +134,8 @@ These principles come out of a full-repo audit and shape all new code:

 ## Quality gates in CI

-`.github/workflows/test.yml` runs, per package: typecheck (server also `typecheck:tests`, client also the strict-mode ratchet `lint:strict`), lint (client and server through `lint:warnings`, which also holds the warning count per rule), `lint:pages`, `lint:rtl`, `lint:size` (client and server), the server's `lint:strict`, `lint:boundaries`, `lint:tx`, `lint:dialect`, `lint:test-sql`, `lint:test-mocks`, `lint:test-new-service`, `lint:query-api`, `lint:mcp-zod`, `lint:service-http` and `lint:response-contracts`, the client's and server's `lint:format`, `lint:layers`, `lint:offline`, `lint:dup`, `lint:pairs`, `lint:skips`, `lint:i18n-keys` and `theme:lint`, shared's `contracts:open`, the repo-wide `lint:knip` (in server-lint-checks), `check:plugin-facts`, `i18n:parity:strict` (with the untranslated-strings ratchet), the S3 contract suite, the Postgres probe (`postgres-probe`: every dialect helper on SQLite and Postgres, and the statements every repository method reaches with sample arguments against a Postgres service; the SQL errors per method and the list of methods it cannot measure are held to a baseline that only shrinks and fails while it is still unmeasured; see `server/CLAUDE.md`), the browser end-to-end flows (Chromium and WebKit), a client build with `check:gl-split`, coverage for all four packages, then a SonarCloud scan. It also builds the Docker image and boots it until `/api/health/ready` answers (`docker-image`), and lints and renders the Helm chart against the Kubernetes schemas and runs `docker compose config` on every compose file (`deploy-manifests`). `lint-prettier.yml` additionally runs `lint` + `lint:format` on `shared/`, both check-only. `plugin-sdk` has no lint script and is outside the eslint gates. **Not in CI**: the screenshot and help-media Playwright projects; run them locally. There are no git hooks; nothing runs before a commit except you. Other workflows build Docker images, scan them, and publish `trek-plugin-sdk` on `plugin-sdk-v*` tags.
+`.github/workflows/test.yml` runs, per package: typecheck (server also `typecheck:tests`, client also the strict-mode ratchet `lint:strict`), lint (client and server through `lint:warnings`, which also holds the warning count per rule), `lint:pages`, `lint:rtl`, `lint:size` (client and server), the server's `lint:strict`, `lint:boundaries`, `lint:tx`, `lint:dialect`, `lint:test-sql`, `lint:test-mocks`, `lint:test-new-service`, `lint:query-api`, `lint:mcp-zod`, `lint:service-http` and `lint:response-contracts`, the client's and server's `lint:format`, `lint:layers`, `lint:offline`, `lint:dup`, `lint:pairs`, `lint:skips`, `lint:i18n-keys` and `theme:lint`, shared's `contracts:open`, the repo-wide `lint:knip` (in server-quality), `check:plugin-facts`, `i18n:parity:strict` (with the untranslated-strings ratchet), the S3 contract suite, the Postgres probe (`postgres-probe`: every dialect helper on SQLite and Postgres, and the statements every repository method reaches with sample arguments against a Postgres service; the SQL errors per method and the list of methods it cannot measure are held to a baseline that only shrinks and fails while it is still unmeasured; see `server/CLAUDE.md`), the browser end-to-end flows (Chromium and WebKit), a client build with `check:gl-split`, coverage for all four packages, then a SonarCloud scan. It also builds the Docker image and boots it until `/api/health/ready` answers (`docker-image`), and lints and renders the Helm chart against the Kubernetes schemas and runs `docker compose config` on every compose file (`deploy-manifests`). `lint-prettier.yml` additionally runs `lint` + `lint:format` on `shared/`, both check-only. `plugin-sdk` has no lint script and is outside the eslint gates. **Not in CI**: the screenshot and help-media Playwright projects; run them locally. There are no git hooks; nothing runs before a commit except you. Other workflows build Docker images, scan them, and publish `trek-plugin-sdk` on `plugin-sdk-v*` tags.

- **Job names read "package: what"** (`Server: Types`, `Client: Tests 3/7`), and the list at the top of `test.yml` says what each job holds. A new job follows the scheme and joins that list, and the job-count note there says when a long job needs a slot freed first.
- **Tests run beside the gates, in shards.** The client and server suites run in slices on parallel runners (`client-tests`, `server-tests`, through each package's `vitest.shard.config.ts`), and `client-coverage`/`server-coverage` merge their blob reports and check the thresholds against the whole. A red slice is usually a failing test, a red merge job usually a threshold.
 - **`ci-ok` is the required check.** The branch ruleset requires `ci-ok` (plus `lint` and `check-target` from their own workflows), and `ci-ok` needs every job above except the scan. It fails if any of them failed or was cancelled and passes if they passed or were skipped. A new gate job counts only once it is listed in `ci-ok`'s `needs:`.
 - **Guides name paths that exist**: the `changes` job runs `scripts/ci/doc-paths.mjs`, which resolves every backtick path in the CLAUDE.md files, `README.md`, `server/src/nest/README.md` and the wiki against the tracked files; the missing ones are listed in `scripts/ci/doc-paths-baseline.json`, which only shrinks (`--update` after a fix).
 - **What runs is decided by `changes`, not by `on.paths`**: `scripts/ci/changed-areas.mjs` maps the changed files to the `code`, `image` and `deploy` areas (tests: `npm run test:ci-scripts`). A path filter on the workflow would leave `ci-ok` unreported on a docs-only PR and block it. Add a new top-level file the build reads to the right area there.
@@ -47,6 +47,7 @@
  },
  "dependencies": {
    "@fontsource/bebas-neue": "^5.3.0",
+    "@fontsource/creepster": "^5.3.0",
    "@fontsource/eb-garamond": "^5.3.0",
    "@fontsource/geist-sans": "^5.3.0",
    "@fontsource/inter": "^5.3.0",
@@ -24,6 +24,8 @@
    if (isShared) dark = false;
    else if (s.darkMode === 'auto') dark = window.matchMedia('(prefers-color-scheme: dark)').matches;
    else dark = s.darkMode === true || s.darkMode === 'dark';
+    // Special themes (APPEARANCE_SPECIAL_SCHEMES in @trek/shared) are dark-only.
+    if (!isShared && s.scheme === 'halloween') dark = true;
    root.classList.toggle('dark', dark);

    var scheme = isShared ? 'default' : s.scheme;
@@ -1,22 +1,22 @@
 {
  "src": {
    "@typescript-eslint/no-non-null-assertion": 404,
-    "@typescript-eslint/no-misused-promises": 874,
+    "@typescript-eslint/no-misused-promises": 875,
    "no-console": 88,
    "complexity": 230,
    "@typescript-eslint/no-explicit-any": 147,
    "trek/no-swallowed-catch": 133,
    "max-params": 35,
    "trek/store-without-selector": 69,
-    "react-hooks/refs": 558,
+    "react-hooks/refs": 559,
    "react-hooks/set-state-in-effect": 197,
    "@typescript-eslint/no-floating-promises": 167,
    "react-hooks/exhaustive-deps": 121,
-    "@typescript-eslint/no-unused-vars": 129,
+    "@typescript-eslint/no-unused-vars": 130,
    "react-hooks/immutability": 28,
    "max-lines-per-function": 133,
    "react-hooks/static-components": 78,
-    "react-hooks/preserve-manual-memoization": 12,
+    "react-hooks/preserve-manual-memoization": 15,
    "no-useless-assignment": 7,
    "no-empty": 19,
    "trek/no-window-globals": 41,
@@ -571,12 +571,6 @@
      "desktop": ["src/components/Admin/AdminPluginsPanel.tsx"],
      "mobile": ["src/mobile/screens/admin/MAdminPluginsPanel.tsx"]
    },
-    {
-      "feature": "Public transit for one leg, between two city walks from the first one's end, and a journey late for the next walk",
-      "hooks": ["src/components/Planner/useTransitLegPlanner.ts"],
-      "desktop": ["src/components/Planner/DayPlanSidebar.tsx"],
-      "mobile": ["src/mobile/screens/trip/plan/useMPlanTimeline.ts"]
-    },
    {
      "feature": "Reservation form incl. hotel accommodation creation",
      "hooks": ["src/components/Planner/reservationFormModel.ts", "src/components/Planner/useReservationForm.ts"],
@@ -2,7 +2,6 @@
 * The tally and the comparison behind lint:warnings (scripts/eslint-ratchet.mjs).
 */
 import { ESLint } from 'eslint';
-import { execFileSync } from 'node:child_process';
 import { join } from 'node:path';
 import ts from 'typescript';
 import {
@@ -138,90 +137,6 @@ export async function lintClient(root) {
  }));
 }

-/** The ref new warnings are measured against: TREK_LINT_BASE (the CI sets it), else origin/dev. */
-const baseRef = () => process.env.TREK_LINT_BASE || 'origin/dev';
-
-/** Git in the workspace: its output, or null when it fails (no repository, no such ref). */
-function gitIn(root, args) {
-  try {
-    return execFileSync('git', args, {
-      cwd: root,
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: 1 << 28,
-    });
-  } catch {
-    return null;
-  }
-}
-
-/** The messages of one rule in one area of a single file's lint result. */
-function ofRule(results, rule, area) {
-  const result = results[0];
-  if (!result) return [];
-  const pool =
-    area === 'suppressed' ? (result.suppressedMessages ?? []) : result.messages.filter((m) => m.severity === 1);
-  return pool.filter((m) => ruleOf(m) === rule);
-}
-
-/**
- * Where a grown rule's new warnings sit: every file among `keys` (the files
- * holding the rule now) that differs from `ref` and holds more of the rule
- * than it did there, each of its warnings of the rule as `file:line  message`.
- * The count alone names no file, and the files holding the most are old ones;
- * this names the file that tipped it. Null when `ref` is not at hand (a clone
- * without it), and the report then keeps to the files holding the most.
- */
-export async function newWarningsOf({ root, rule, area, keys, lintText, ref = baseRef(), git = gitIn }) {
-  const changed = git(root, ['diff', '--name-only', '--relative', ref, '--', '.']);
-  if (changed === null) return null;
-  const differs = new Set(changed.split('\n').filter(Boolean));
-  const found = await Promise.all(
-    keys
-      .filter((key) => differs.has(key))
-      .map(async (key) => {
-        const path = join(root, key);
-        // A typed rule can trip over a text that is not the file on disk (the
-        // base version); then the file's own warnings are told, marked so.
-        const lint = async (text) => {
-          try {
-            return { messages: ofRule(await lintText(text, path), rule, area) };
-          } catch {
-            return null;
-          }
-        };
-        const now = await lint(readText(path));
-        if (!now) return [];
-        const before = git(root, ['show', `${ref}:./${key}`]);
-        const was = before === null ? { messages: [] } : await lint(before);
-        if (was && now.messages.length <= was.messages.length) return [];
-        const note = was ? '' : '  (the base version could not be linted)';
-        return now.messages.map((m) => `${key}:${m.line ?? 0}  ${m.message}${note}`);
-      })
-  );
-  return found.flat();
-}
-
-/** Prints, under the grown counts, the files and lines behind each one (see newWarningsOf). */
-async function reportNew(grown, { root, files, lintText, error }) {
-  if (!grown.length || !lintText) return;
-  const found = await Promise.all(
-    grown.map(({ area, rule }) => newWarningsOf({ root, rule, area, keys: Object.keys(files[area][rule]), lintText }))
-  );
-  grown.forEach(({ area, rule }, i) => {
-    const lines = found[i];
-    if (!lines?.length) return;
-    error(`New ${rule} warning(s) in ${area}, against ${baseRef()}:`);
-    for (const line of lines) error(`  ${line}`);
-  });
-}
-
-/** Lints one file's text with the client's own config, for newWarningsOf. */
-function lintTextClient(root) {
-  const eslint = new ESLint({ cwd: root });
-  return (text, filePath) => eslint.lintText(text, { filePath });
-}
-
 const sum = (map) => Object.values(map).reduce((a, b) => a + b, 0);

 /**
@@ -233,7 +148,6 @@ export async function check({
  baselinePath = join(root, 'scripts/eslint-baseline.json'),
  update = false,
  lint = lintClient,
-  lintText = lint === lintClient ? lintTextClient : null,
  log = console.log,
  error = console.error,
 }) {
@@ -246,13 +160,13 @@ export async function check({
  }

  for (const line of errors) error(`FAIL  ${line}`);
-  const grown = [];
+  let grown = 0;
  let stale = 0;
  for (const area of AREAS) {
    for (const [rule, n] of Object.entries(counts[area])) {
      const allowed = baseline[area][rule] ?? 0;
      if (n <= allowed) continue;
-      grown.push({ area, rule });
+      grown++;
      const top = Object.entries(files[area][rule])
        .sort(([, a], [, b]) => b - a)
        .slice(0, 5)
@@ -268,8 +182,7 @@ export async function check({
    });
    stale += fallen.length;
  }
-  await reportNew(grown, { root, files, lintText: lintText && lintText(root), error });
-  if (grown.length) {
+  if (grown) {
    error(
      'Fix the new warning rather than silencing it: an eslint-disable comment is counted under "suppressed". ' +
        'Run npx eslint <file> to see each one.'
@@ -278,5 +191,5 @@ export async function check({
  log(
    `eslint: ${errors.length} error(s); warnings ${AREAS.map((area) => `${area} ${sum(counts[area])}/${sum(baseline[area])}`).join(', ')} (now/baseline)`
  );
-  return errors.length || grown.length || stale ? 1 : 0;
+  return errors.length || grown || stale ? 1 : 0;
 }
@@ -5,14 +5,14 @@
  "src/components/Admin/AdminPluginsPanel.tsx": 1667,
  "src/components/Budget/CostsPanel.test.tsx": 2764,
  "src/components/Budget/CostsPanel.tsx": 1816,
-  "src/components/Map/MapView.tsx": 1401,
+  "src/components/Map/MapView.tsx": 1409,
  "src/components/Map/MapViewGL.test.tsx": 2920,
-  "src/components/Map/MapViewGL.tsx": 2293,
+  "src/components/Map/MapViewGL.tsx": 2299,
  "src/components/Map/RouteCalculator.ts": 1195,
  "src/components/PDF/TripPDF.tsx": 1082,
  "src/components/Planner/DayDetailPanel.test.tsx": 2333,
  "src/components/Planner/DayPlanSidebar.test.tsx": 5378,
-  "src/components/Planner/DayPlanSidebar.tsx": 2969,
+  "src/components/Planner/DayPlanSidebar.tsx": 2971,
  "src/components/Planner/PlaceFormModal.test.tsx": 2864,
  "src/components/Planner/PlaceFormModal.tsx": 1250,
  "src/components/Planner/PlaceInspector.tsx": 1304,
@@ -24,7 +24,7 @@
  "src/mobile/screens/admin/MAdminPluginsPanel.tsx": 1507,
  "src/pages/JourneyDetailPage.test.tsx": 4030,
  "src/pages/LoginPage.tsx": 1348,
-  "src/pages/TripPlannerPage.tsx": 1141,
+  "src/pages/TripPlannerPage.tsx": 1142,
  "src/pages/atlas/useAtlas.ts": 1287,
  "src/pages/tripPlanner/useTripPlanner.roadtrip.test.tsx": 3518,
  "src/pages/tripPlanner/useTripPlanner.test.tsx": 3309,
@@ -55,7 +55,7 @@
  "components/Layout/DemoBanner.tsx": 25,
  "components/Layout/InAppNotificationBell.tsx": 10,
  "components/Layout/MobileTopBar.tsx": 51,
-  "components/Layout/Navbar.tsx": 21,
+  "components/Layout/Navbar.tsx": 22,
  "components/Layout/NewVersionNotice.tsx": 3,
  "components/Layout/OfflineBanner.tsx": 2,
  "components/Layout/PageSidebar.tsx": 3,
@@ -269,7 +269,7 @@
  "mobile/screens/trip/sheets/PlSheetChrome.tsx": 7,
  "mobile/screens/trip/sheets/PlTimeFields.tsx": 3,
  "mobile/screens/trip/tabs/MBagsSheet.tsx": 13,
-  "mobile/screens/trip/tabs/MBookingsTab.tsx": 2,
+  "mobile/screens/trip/tabs/MBookingsTab.tsx": 3,
  "mobile/screens/trip/tabs/MCollabChat.tsx": 22,
  "mobile/screens/trip/tabs/MCollabNotes.tsx": 19,
  "mobile/screens/trip/tabs/MCollabPolls.tsx": 18,
@@ -33,6 +33,7 @@ import OfflineBanner from './components/Layout/OfflineBanner'
 import NewVersionNotice from './components/Layout/NewVersionNotice'
 import { SystemNoticeHost } from './components/SystemNotices/SystemNoticeHost.js'
 import HelpPanel from './components/Help/HelpPanel'
+import SpecialThemeLayer from './theme/special/SpecialThemeLayer'
 // Notice action registrations (side-effect imports):
 import './pages/Trips/noticeActions.js'
 import { managedRoutes } from './managed'
@@ -405,6 +406,7 @@ export default function App() {
      {!hideAuthedWidgets && (isPhone ? <MSaveToCollectionSheet /> : <SaveToCollectionModal />)}
      <ErrorBoundary boundaryId="widget:offline-banner" fallback={null}><OfflineBanner /></ErrorBoundary>
      <ErrorBoundary boundaryId="widget:new-version" fallback={null}><NewVersionNotice /></ErrorBoundary>
+      <ErrorBoundary boundaryId="widget:special-theme" fallback={null}><SpecialThemeLayer /></ErrorBoundary>
      {/* One boundary for all route chunks, above <Routes> so it stays mounted
          across navigations. react-router runs location updates inside a transition,
          so a mounted boundary keeps the current page on screen instead of flashing
@@ -1,54 +0,0 @@
-// FE-API-COLLECTION-TOURS-001 to FE-API-COLLECTION-TOURS-002
-//
-// LIB-03: every method pins its verb, its path and its body, and hands back what
-// the server answered.
-import { http, HttpResponse, type JsonBodyType } from 'msw';
-import { beforeEach, describe, expect, it } from 'vitest';
-import { server } from '../../tests/helpers/msw/server';
-import { collectionToursApi } from './collectionTours';
-
-const BASE = '/api/addons/collections/3/tours';
-
-let calls: Array<{ method: string; path: string; body: unknown }> = [];
-
-beforeEach(() => {
-  calls = [];
-});
-
-function record(data: JsonBodyType | null) {
-  return async ({ request }: { request: Request }) => {
-    const text = await request.text();
-    calls.push({ method: request.method, path: new URL(request.url).pathname, body: text ? JSON.parse(text) : null });
-    return data === null ? new HttpResponse(null, { status: 200 }) : HttpResponse.json(data);
-  };
-}
-
-describe('collectionToursApi', () => {
-  it('FE-API-COLLECTION-TOURS-001: lists, reads, keeps and removes the tours of a collection', async () => {
-    server.use(
-      http.get(BASE, record({ tours: [] })),
-      http.get(`${BASE}/4`, record({ tour: { id: 4 }, line: [], points: [], trips: [] })),
-      http.post(BASE, record({ tour: { id: 5 } })),
-      http.delete(`${BASE}/4`, record({ success: true }))
-    );
-    expect(await collectionToursApi.list(3)).toEqual({ tours: [] });
-    expect((await collectionToursApi.detail(3, 4)).tour).toEqual({ id: 4 });
-    expect(await collectionToursApi.save(3, { source_trip_id: 2, source_place_id: 7, name: 'Kept' })).toEqual({
-      tour: { id: 5 },
-    });
-    expect(await collectionToursApi.remove(3, 4)).toBeUndefined();
-    expect(calls).toEqual([
-      { method: 'GET', path: BASE, body: null },
-      { method: 'GET', path: `${BASE}/4`, body: null },
-      { method: 'POST', path: BASE, body: { source_trip_id: 2, source_place_id: 7, name: 'Kept' } },
-      { method: 'DELETE', path: `${BASE}/4`, body: null },
-    ]);
-  });
-
-  it('FE-API-COLLECTION-TOURS-002: takes a kept tour into a trip with the choice about its points', async () => {
-    server.use(http.post('/api/trips/6/tours/from-collection', record({ tour: { place_id: 9 }, waypoints: [] })));
-    const body = { collection_id: 3, collection_tour_id: 4, include_waypoints: false };
-    expect((await collectionToursApi.takeOver(6, body)).tour).toEqual({ place_id: 9 });
-    expect(calls).toEqual([{ method: 'POST', path: '/api/trips/6/tours/from-collection', body }]);
-  });
-});
@@ -1,25 +0,0 @@
-import type {
-  CollectionTourDetailResponse,
-  CollectionTourListResponse,
-  CollectionTourSaveRequest,
-  CollectionTourSaveResponse,
-  CollectionTourTakeOverRequest,
-  TourCreateResponse,
-} from '@trek/shared';
-import apiClient from './client';
-
-const base = (collectionId: number) => `/addons/collections/${collectionId}/tours`;
-
-/** LIB-03: the whole tours a collection keeps, keeping one, removing one and taking one into a trip. */
-export const collectionToursApi = {
-  list: (collectionId: number, signal?: AbortSignal): Promise<CollectionTourListResponse> =>
-    apiClient.get(base(collectionId), { signal }).then((r) => r.data),
-  detail: (collectionId: number, tourId: number, signal?: AbortSignal): Promise<CollectionTourDetailResponse> =>
-    apiClient.get(`${base(collectionId)}/${tourId}`, { signal }).then((r) => r.data),
-  save: (collectionId: number, body: CollectionTourSaveRequest): Promise<CollectionTourSaveResponse> =>
-    apiClient.post(base(collectionId), body).then((r) => r.data),
-  remove: (collectionId: number, tourId: number): Promise<void> =>
-    apiClient.delete(`${base(collectionId)}/${tourId}`).then(() => undefined),
-  takeOver: (tripId: number, body: CollectionTourTakeOverRequest): Promise<TourCreateResponse> =>
-    apiClient.post(`/trips/${tripId}/tours/from-collection`, body).then((r) => r.data),
-};
@@ -1,34 +0,0 @@
-// FE-API-HORSE-001 to FE-API-HORSE-002
-import { http, HttpResponse } from 'msw';
-import { describe, expect, it } from 'vitest';
-
-import { server } from '../../tests/helpers/msw/server';
-import { horseRoutesApi } from './horseRoutes';
-
-const reply = { routes: [], truncated: false, source: 'openstreetmap', attribution: '© OpenStreetMap contributors' };
-const BBOX = '47.10000,11.20000,47.30000,11.50000';
-
-describe('horseRoutesApi.list', () => {
-  it('FE-API-HORSE-001: asks GET /api/trips/:tripId/tours/horse-routes with the view and returns the body', async () => {
-    let url = '';
-    server.use(
-      http.get('/api/trips/7/tours/horse-routes', ({ request }) => {
-        url = request.url;
-        return HttpResponse.json(reply);
-      })
-    );
-
-    await expect(horseRoutesApi.list(7, BBOX)).resolves.toEqual(reply);
-    expect(new URL(url).searchParams.get('bbox')).toBe(BBOX);
-  });
-
-  it('FE-API-HORSE-002: no Overpass mirror answering (502) rejects', async () => {
-    server.use(
-      http.get('/api/trips/7/tours/horse-routes', () =>
-        HttpResponse.json({ error: 'Horse route data is unavailable right now' }, { status: 502 })
-      )
-    );
-
-    await expect(horseRoutesApi.list(7, BBOX)).rejects.toBeTruthy();
-  });
-});
@@ -1,21 +0,0 @@
-import apiClient from './client';
-
-/**
- * How long the browser waits for GET /api/trips/:tripId/tours/horse-routes.
- * The server races the Overpass mirrors under its own deadline (25 s by
- * default) and answers 502 when none made it, so this sits just above it, as
- * the via ferrata layer's wait does.
- */
-const HORSE_ROUTES_TIMEOUT_MS = 30_000;
-
-/**
- * HOR-01 GET /api/trips/:tripId/tours/horse-routes: the signposted horse
- * routes OpenStreetMap knows inside one map view. The answer comes back
- * unparsed; repo/horseRouteRepo.ts checks it against the shared contract.
- */
-export const horseRoutesApi = {
-  list: (tripId: number | string, bbox: string, signal?: AbortSignal): Promise<unknown> =>
-    apiClient
-      .get(`/trips/${tripId}/tours/horse-routes`, { params: { bbox }, signal, timeout: HORSE_ROUTES_TIMEOUT_MS })
-      .then((response) => response.data as unknown),
-};
@@ -1,13 +0,0 @@
-import { paddleRegionLoadResponseSchema, type PaddleRegionLoadRequest, type PaddleRegionLoadState } from '@trek/shared';
-import apiClient from './client';
-
-/** A first look into Geofabrik's list can take the server a while (it fetches the list itself, within 20 s). */
-const GEOFABRIK = { timeout: 30_000 };
-
-/** PAD-11C: the water data around places no paddle region covers yet, loaded or asked for by the server. */
-export const paddleRegionLoadApi = {
-  load: (request: PaddleRegionLoadRequest, signal?: AbortSignal): Promise<PaddleRegionLoadState[]> =>
-    apiClient
-      .post('/paddle/regions/load', request, { signal, ...GEOFABRIK })
-      .then((r) => paddleRegionLoadResponseSchema.parse(r.data).points),
-};
@@ -2,19 +2,17 @@ import {
  paddleRegionCatalogResponseSchema,
  paddleRegionListResponseSchema,
  paddleRegionSchema,
-  paddleRegionSettingsSchema,
  successResponseSchema,
  type PaddleRegionRequest,
-  type PaddleRegionSettings,
 } from '@trek/shared';
 import apiClient from './client';

 /** A first look into Geofabrik's list can take the server a while (it fetches the list itself, within 20 s). */
 const GEOFABRIK = { timeout: 30_000 };

-/** PAD-05A, the admin side: the regions TREK reads paddle data for, and those paddlers asked for (PAD-11C). */
+/** PAD-05A, the admin side: the regions TREK reads paddle data for. */
 export const paddleRegionsApi = {
-  list: () => apiClient.get('/admin/paddle-regions').then((r) => paddleRegionListResponseSchema.parse(r.data)),
+  list: () => apiClient.get('/admin/paddle-regions').then((r) => paddleRegionListResponseSchema.parse(r.data).regions),
  catalog: (q: string, signal?: AbortSignal) =>
    apiClient
      .get('/admin/paddle-regions/catalog', { params: { q }, signal, ...GEOFABRIK })
@@ -31,11 +29,4 @@ export const paddleRegionsApi = {
    apiClient
      .post('/admin/paddle-regions/remove', { id } satisfies PaddleRegionRequest)
      .then((r) => successResponseSchema.parse(r.data)),
-  decline: (id: string) =>
-    apiClient
-      .post('/admin/paddle-regions/decline', { id } satisfies PaddleRegionRequest)
-      .then((r) => successResponseSchema.parse(r.data)),
-  settings: () => apiClient.get('/admin/paddle-regions/settings').then((r) => paddleRegionSettingsSchema.parse(r.data)),
-  saveSettings: (settings: PaddleRegionSettings) =>
-    apiClient.put('/admin/paddle-regions/settings', settings).then((r) => paddleRegionSettingsSchema.parse(r.data)),
 };
@@ -1,10 +0,0 @@
-import { paddleRouteResponseSchema, type PaddleRouteInput, type PaddleRouteResponse } from '@trek/shared';
-import apiClient from './client';
-
-/** PAD-11: legs of a paddle tour planned on the water by the server's router. */
-export const paddleRouteApi = {
-  plan: (tripId: number | string, request: PaddleRouteInput, signal?: AbortSignal): Promise<PaddleRouteResponse> =>
-    apiClient
-      .post(`/trips/${tripId}/paddle/route`, request, { signal })
-      .then((r) => paddleRouteResponseSchema.parse(r.data)),
-};
@@ -1,14 +0,0 @@
-import type { TourActivityAssignRequest, TourDetailResponse } from '@trek/shared';
-import apiClient from './client';
-
-/** ACT-01: the recorded tracks of a tour, assigned and taken off; both answer the tour's detail. */
-export const tourActivitiesApi = {
-  assign: (
-    tripId: number | string,
-    placeId: number | string,
-    body: TourActivityAssignRequest
-  ): Promise<TourDetailResponse> =>
-    apiClient.put(`/trips/${tripId}/tours/${placeId}/activities`, body).then((r) => r.data),
-  unassign: (tripId: number | string, placeId: number | string, activityId: number): Promise<TourDetailResponse> =>
-    apiClient.delete(`/trips/${tripId}/tours/${placeId}/activities/${activityId}`).then((r) => r.data),
-};
@@ -1,10 +0,0 @@
-import type { TourActivityExclusionRequest, TourActivityStatsResponse } from '@trek/shared';
-import apiClient from './client';
-
-/** STA-02: the user's own tour activities across their trips, and leaving one out of them; both answer the sums. */
-export const tourActivityStatsApi = {
-  get: (signal?: AbortSignal): Promise<TourActivityStatsResponse> =>
-    apiClient.get('/tours/activity-stats', { signal }).then((r) => r.data),
-  setExcluded: (body: TourActivityExclusionRequest): Promise<TourActivityStatsResponse> =>
-    apiClient.put('/tours/activity-stats/exclusions', body).then((r) => r.data),
-};
@@ -1,16 +0,0 @@
-import type { AdminFeatureToggleResponse } from '@trek/shared';
-import apiClient from './client';
-
-/** An admin's switch for a map the Tours planner offers on its operator's terms. */
-function tourBaseMapAdminApi(path: string) {
-  return {
-    get: (): Promise<AdminFeatureToggleResponse> => apiClient.get(path).then((r) => r.data),
-    update: (enabled: boolean): Promise<AdminFeatureToggleResponse> =>
-      apiClient.put(path, { enabled }).then((r) => r.data),
-  };
-}
-
-/** MAP-01: OpenHikingMap for a hike. */
-export const hikingMapAdminApi = tourBaseMapAdminApi('/admin/tours-hiking-map');
-/** BIK-06: CyclOSM for a bike tour. */
-export const cycleMapAdminApi = tourBaseMapAdminApi('/admin/tours-cycle-map');
@@ -1,7 +1,7 @@
 import type { TourGpxImportFields, TourGpxPreviewResponse, TourImportGpxResponse } from '@trek/shared';
 import { postMultipart } from './client';

-/** A GPX, KML or KMZ file and the fields beside it, as the Tours import routes read a multipart body. */
+/** A GPX file and the fields beside it, as the Tours import routes read a multipart body. */
 function gpxForm(file: File, fields?: TourGpxImportFields): FormData {
  const fd = new FormData();
  fd.append('file', file);
@@ -9,10 +9,7 @@ function gpxForm(file: File, fields?: TourGpxImportFields): FormData {
  return fd;
 }

-/**
- * The Tours file import: a GPX, KML or KMZ file (IO-02) read for its preview
- * first (PAD-02), then imported as the type chosen.
- */
+/** The Tours GPX import: a file read for its preview first (PAD-02), then imported as the type chosen. */
 export const tourGpxApi = {
  /** What the file holds, read by the import's own parser; nothing is stored. */
  preview: (tripId: number | string, file: File): Promise<TourGpxPreviewResponse> =>
@@ -1,33 +0,0 @@
-import apiClient from './client';
-
-/**
- * The file name a download's Content-Disposition gives: the UTF-8 `filename*`
- * first, since it keeps the tour's own script, the plain `filename` after.
- */
-export function attachmentFilename(header: unknown): string | null {
-  if (typeof header !== 'string') return null;
-  const encoded = /filename\*=UTF-8''([^;]+)/i.exec(header)?.[1];
-  if (encoded) {
-    try {
-      return decodeURIComponent(encoded.trim());
-    } catch {
-      // A malformed escape falls through to the plain name.
-    }
-  }
-  return /filename="([^"]+)"/i.exec(header)?.[1] ?? null;
-}
-
-/** PR1-06A: one saved tour as the GPX file the server writes. */
-export const tourGpxExportApi = {
-  download: async (
-    tripId: number | string,
-    placeId: number,
-    signal?: AbortSignal
-  ): Promise<{ blob: Blob; filename: string | null }> => {
-    const response = await apiClient.get<Blob>(`/trips/${tripId}/tours/${placeId}/export.gpx`, {
-      responseType: 'blob',
-      signal,
-    });
-    return { blob: response.data, filename: attachmentFilename(response.headers['content-disposition']) };
-  },
-};
@@ -1,18 +0,0 @@
-import type {
-  TourCreateResponse,
-  TourLibraryDetailResponse,
-  TourLibraryQuery,
-  TourLibraryResponse,
-  TourTakeOverRequest,
-} from '@trek/shared';
-import apiClient from './client';
-
-/** LIB-02: the tours of the user's other trips, one's preview, and taking one over into a trip. */
-export const tourLibraryApi = {
-  list: (query: TourLibraryQuery, signal?: AbortSignal): Promise<TourLibraryResponse> =>
-    apiClient.get('/tours/library', { params: query, signal }).then((r) => r.data),
-  detail: (placeId: number, signal?: AbortSignal): Promise<TourLibraryDetailResponse> =>
-    apiClient.get(`/tours/library/${placeId}`, { signal }).then((r) => r.data),
-  takeOver: (tripId: number | string, body: TourTakeOverRequest): Promise<TourCreateResponse> =>
-    apiClient.post(`/trips/${tripId}/tours/take-over`, body).then((r) => r.data),
-};
@@ -1,20 +0,0 @@
-import type { TourDetailResponse, TourPackingLinkRequest, TourPackingLinkResponse } from '@trek/shared';
-import apiClient from './client';
-
-/**
- * Where a tour's packing link lives; a write queued offline replays to the
- * same path, `{id}` standing for a tour that has not synced yet.
- */
-export function tourPackingLinkPath(tripId: number | string, placeId: number | string): string {
-  return `/trips/${tripId}/tours/${placeId}/packing-link`;
-}
-
-/** P2D-XD-01: the packing list, or the category of it, a tour points at. */
-export const tourPackingLinkApi = {
-  read: (tripId: number | string, placeId: number, signal?: AbortSignal): Promise<TourPackingLinkResponse> =>
-    apiClient.get(tourPackingLinkPath(tripId, placeId), { signal }).then((r) => r.data),
-  link: (tripId: number | string, placeId: number, body: TourPackingLinkRequest): Promise<TourDetailResponse> =>
-    apiClient.put(tourPackingLinkPath(tripId, placeId), body).then((r) => r.data),
-  unlink: (tripId: number | string, placeId: number): Promise<TourDetailResponse> =>
-    apiClient.delete(tourPackingLinkPath(tripId, placeId)).then((r) => r.data),
-};
@@ -1,16 +0,0 @@
-import type { TourPoiSearchRequest, TourPoiSearchResponse } from '@trek/shared';
-import apiClient from './client';
-
-/**
- * PLN-02: places along a tour. A search runs several stretches against the map
- * search on the server, each allowed its own timeout there, so it may take
- * longer than the shared default.
- */
-const POI_SEARCH_TIMEOUT_MS = 60_000;
-
-export const tourPoiSearchApi = {
-  search: (tripId: number | string, body: TourPoiSearchRequest, signal?: AbortSignal): Promise<TourPoiSearchResponse> =>
-    apiClient
-      .post(`/trips/${tripId}/tours/poi-search`, body, { signal, timeout: POI_SEARCH_TIMEOUT_MS })
-      .then((r) => r.data),
-};
@@ -1,11 +0,0 @@
-import type { TourDetailResponse, TourSkiClassificationRequest } from '@trek/shared';
-import apiClient from './client';
-
-/** SKI-02: a ski track classified again, its discipline and cross-country technique. */
-export const tourSkiApi = {
-  classify: (
-    tripId: number | string,
-    placeId: number | string,
-    body: TourSkiClassificationRequest
-  ): Promise<TourDetailResponse> => apiClient.put(`/trips/${tripId}/tours/${placeId}/ski`, body).then((r) => r.data),
-};
@@ -1,20 +0,0 @@
-import type { TourTrailGradeRequest, TourTrailGradeResponse } from '@trek/shared';
-import apiClient from './client';
-
-/**
- * BIK-05: the trail grades of the ways a mountain bike tour runs on. The
- * server asks Overpass in parts, one after another, so a long tour may take
- * longer than the shared default.
- */
-const TRAIL_GRADE_TIMEOUT_MS = 60_000;
-
-export const tourTrailGradeApi = {
-  grades: (
-    tripId: number | string,
-    body: TourTrailGradeRequest,
-    signal?: AbortSignal
-  ): Promise<TourTrailGradeResponse> =>
-    apiClient
-      .post(`/trips/${tripId}/tours/trail-grades`, body, { signal, timeout: TRAIL_GRADE_TIMEOUT_MS })
-      .then((r) => r.data),
-};
@@ -1,20 +0,0 @@
-import type { TourVisitListResponse, TourVisitUpdateRequest } from '@trek/shared';
-import apiClient from './client';
-
-/** Where one station of a walk is marked for one day; a write queued offline replays to the same path. */
-export function tourVisitPath(tripId: number | string, assignmentId: number, stationKey: string): string {
-  return `/trips/${tripId}/tour-visits/${assignmentId}/${encodeURIComponent(stationKey)}`;
-}
-
-/** CW-03: the stations of a trip's city walks visited or skipped on their days. */
-export const tourVisitsApi = {
-  list: (tripId: number | string): Promise<TourVisitListResponse> =>
-    apiClient.get(`/trips/${tripId}/tour-visits`).then((r) => r.data),
-  update: (
-    tripId: number | string,
-    assignmentId: number,
-    stationKey: string,
-    body: TourVisitUpdateRequest
-  ): Promise<TourVisitListResponse> =>
-    apiClient.put(tourVisitPath(tripId, assignmentId, stationKey), body).then((r) => r.data),
-};
@@ -1,20 +0,0 @@
-import type { WalkImportPreviewRequest, WalkImportPreviewResponse } from '@trek/shared';
-import apiClient from './client';
-
-/**
- * CW-07: a Google Maps walking route read into its stops. The server may
- * follow a short link a few hops within its own deadline, so the call waits
- * a little longer than that before it gives up.
- */
-const WALK_IMPORT_TIMEOUT_MS = 20_000;
-
-export const tourWalkImportApi = {
-  preview: (
-    tripId: number | string,
-    body: WalkImportPreviewRequest,
-    signal?: AbortSignal
-  ): Promise<WalkImportPreviewResponse> =>
-    apiClient
-      .post(`/trips/${tripId}/tours/import/google-maps/preview`, body, { signal, timeout: WALK_IMPORT_TIMEOUT_MS })
-      .then((r) => r.data),
-};
@@ -1,31 +0,0 @@
-import type {
-  TripJournalCandidatesResponse,
-  TripJournalLinkMemberRequest,
-  TripJournalLinkResponse,
-} from '@trek/shared';
-import apiClient from './client';
-
-/**
- * `/api/trips/:tripId/journal`: the journal from the Journey addon a trip shows,
- * and who it is open to. In its own file rather than in the `client.ts` god
- * module; repo/tripJournalLinkRepo.ts is the one caller.
- */
-export const tripJournalApi = {
-  get: (tripId: number): Promise<TripJournalLinkResponse> =>
-    apiClient.get(`/trips/${tripId}/journal`).then((r) => r.data),
-  candidates: (tripId: number, journeyId: number): Promise<TripJournalCandidatesResponse> =>
-    apiClient.get(`/trips/${tripId}/journal/candidates`, { params: { journey_id: journeyId } }).then((r) => r.data),
-  link: (
-    tripId: number,
-    journeyId: number,
-    members: TripJournalLinkMemberRequest[]
-  ): Promise<TripJournalLinkResponse> =>
-    apiClient.put(`/trips/${tripId}/journal`, { journey_id: journeyId, members }).then((r) => r.data),
-  setMembers: (tripId: number, members: TripJournalLinkMemberRequest[]): Promise<TripJournalLinkResponse> =>
-    apiClient.patch(`/trips/${tripId}/journal/members`, { members }).then((r) => r.data),
-  unlink: (tripId: number): Promise<TripJournalLinkResponse> =>
-    apiClient.delete(`/trips/${tripId}/journal`).then((r) => r.data),
-  /** The journals this person can open; the dialog offers the ones they own. */
-  journals: (): Promise<{ journeys: { id: number; user_id: number; title: string; subtitle?: string | null }[] }> =>
-    apiClient.get('/journeys').then((r) => r.data),
-};
@@ -1,7 +1,6 @@
 import type {
  AdminFeatureToggleResponse,
  TourSourceCheckResponse,
-  TourSourceHintResponse,
  WandererConnection,
  WandererImportPreview,
  WandererImportRequest,
@@ -12,7 +11,6 @@ import type {
  WandererSettingsRequest,
  WandererTestRequest,
  WandererTestResponse,
-  WandererWatch,
 } from '@trek/shared';
 import apiClient from './client';

@@ -33,10 +31,6 @@ export const wandererApi = {
  disconnect: (): Promise<{ success: true }> => apiClient.delete('/integrations/wanderer/settings').then((r) => r.data),
  test: (data: WandererTestRequest): Promise<WandererTestResponse> =>
    apiClient.post('/integrations/wanderer/test', data, upstream).then((r) => r.data),
-  /** WAN-02: the optional background watch of the connection, with the open hints. */
-  getWatch: (): Promise<WandererWatch> => apiClient.get('/integrations/wanderer/watch').then((r) => r.data),
-  setWatch: (enabled: boolean): Promise<WandererWatch> =>
-    apiClient.put('/integrations/wanderer/watch', { enabled }).then((r) => r.data),

  search: (tripId: number, body: WandererSearchRequest, signal?: AbortSignal): Promise<WandererSearchResponse> =>
    apiClient.post(`/trips/${tripId}/tours/wanderer/search`, body, { ...upstream, signal }).then((r) => r.data),
@@ -49,9 +43,6 @@ export const wandererApi = {
  /** MF-03: whether the trail a snapshot came from changed since; the server reads, it writes nothing. */
  checkSource: (tripId: number, placeId: number): Promise<TourSourceCheckResponse> =>
    apiClient.post(`/trips/${tripId}/tours/wanderer/sources/${placeId}/check`, {}, upstream).then((r) => r.data),
-  /** WAN-02: the caller's own background hint on a snapshot; the server only reads its own rows. */
-  sourceHint: (tripId: number, placeId: number, signal?: AbortSignal): Promise<TourSourceHintResponse> =>
-    apiClient.get(`/trips/${tripId}/tours/wanderer/sources/${placeId}/hint`, { signal }).then((r) => r.data),
 };

 /** The admin's switch for wanderer under the Tours addon. */
@@ -19,8 +19,6 @@ export const HANDLED_OUTSIDE_TRIP_STORE = [
  // Tours facet invalidation — hooks/useTripWebSocket forwards tours:changed to
  // useTourPlaceIds so the active trip refreshes its Tours/Places read model.
  'tours:changed',
-  // CW-03: store/tourVisitStore (watchTourVisits) keeps the visits store current.
-  'tours:visits',
  // Collab — Collab/MCollab components + useTripWebSocket's collabFileSync
  'collab:note:created',
  'collab:note:updated',
@@ -95,10 +93,6 @@ export const HANDLED_OUTSIDE_TRIP_STORE = [
  // the bag ping: what a run changed is per-binding server state, and the
  // files it moved arrive as file:* events.
  'docsync:changed',
-  // Linked journal: components/Trips/useTripJournalLink asks again which journal
-  // the trip shows and who it is open to. Content-free, because that answer is
-  // per person (a member left off the link must not learn its title).
-  'trip:journal:changed',
  // Booking import — BackgroundTasks/BackgroundTasksWidget ('import:' prefix listener)
  'import:progress',
  'import:done',
@@ -77,7 +77,6 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
    addons, loading, handleToggle, tripAddons, globalAddons, integrationAddons, providerOptions, documentProviderOptions,
    toursWanderer,
    toggleToursWanderer,
-    mapSwitches,
  } = useAddonManager()

  if (loading) {
@@ -156,25 +155,13 @@ export default function AddonManager({ bagTrackingEnabled, onToggleBagTracking,
    }
    if (addon.id === 'tours' && addon.enabled) {
      return (
-        <>
-          <AddonSubRow
-            icon={<WandererMark size={14} />}
-            title={t('admin.toursWanderer.title')}
-            description={t('admin.toursWanderer.subtitle')}
-            enabled={toursWanderer}
-            onToggle={() => void toggleToursWanderer()}
-          />
-          {mapSwitches.map(({ key, Icon, titleKey, subtitleKey, enabled, toggle }) => (
-            <AddonSubRow
-              key={key}
-              icon={<Icon size={14} />}
-              title={t(titleKey)}
-              description={t(subtitleKey)}
-              enabled={enabled}
-              onToggle={() => void toggle()}
-            />
-          ))}
-        </>
+        <AddonSubRow
+          icon={<WandererMark size={14} />}
+          title={t('admin.toursWanderer.title')}
+          description={t('admin.toursWanderer.subtitle')}
+          enabled={toursWanderer}
+          onToggle={() => void toggleToursWanderer()}
+        />
      )
    }
    // The AI-parsing settings hang off their tile like every other sub-feature,
@@ -2,13 +2,11 @@ import { act, renderHook, waitFor } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

 import { adminApi } from '../../../api/client';
-import { cycleMapAdminApi, hikingMapAdminApi } from '../../../api/tourBaseMaps';
-import { wandererAdminApi } from '../../../api/wanderer';
 import { useAddonStore } from '../../../store/addonStore';
 import type { Addon } from './addonModel';
 import { useAddonManager } from './useAddonManager';

-// FE-HOOK-ADDONMGR-001 to FE-HOOK-ADDONMGR-008
+// FE-HOOK-ADDONMGR-001 to FE-HOOK-ADDONMGR-006

 const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn() }));
 vi.mock('../../shared/Toast', () => ({ useToast: () => toast }));
@@ -37,9 +35,6 @@ beforeEach(() => {
  useAddonStore.setState({ loadAddons });
  vi.spyOn(adminApi, 'addons').mockResolvedValue({ addons: ADDONS });
  vi.spyOn(adminApi, 'updateAddon').mockResolvedValue({});
-  vi.spyOn(wandererAdminApi, 'get').mockResolvedValue({ enabled: false });
-  vi.spyOn(hikingMapAdminApi, 'get').mockResolvedValue({ enabled: true });
-  vi.spyOn(cycleMapAdminApi, 'get').mockResolvedValue({ enabled: true });
 });
 afterEach(() => vi.restoreAllMocks());

@@ -51,13 +46,6 @@ async function loaded() {

 const enabledOf = (addons: Addon[], id: string) => addons.find((a) => a.id === id)?.enabled;

-/** One of the map switches under Tours, by its key. */
-function mapSwitch(manager: ReturnType<typeof useAddonManager>, key: 'hiking' | 'cycle') {
-  const found = manager.mapSwitches.find((entry) => entry.key === key);
-  if (!found) throw new Error(`no ${key} map switch`);
-  return found;
-}
-
 describe('useAddonManager', () => {
  it('FE-HOOK-ADDONMGR-001: loads once and sorts addons into trip, global, integration and the two shelves', async () => {
    const { result, rerender } = await loaded();
@@ -127,33 +115,4 @@ describe('useAddonManager', () => {
    await act(() => result.current.documentProviderOptions[0].toggle());
    expect(adminApi.updateAddon).toHaveBeenLastCalledWith('gdrive', { enabled: false });
  });
-
-  it('FE-HOOK-ADDONMGR-007: the hiking map switch under Tours loads, flips, saves and refreshes the store (MAP-01)', async () => {
-    const update = vi.spyOn(hikingMapAdminApi, 'update').mockResolvedValue({ enabled: false });
-    const { result } = await loaded();
-    await waitFor(() => expect(mapSwitch(result.current, 'hiking').enabled).toBe(true));
-    await act(() => mapSwitch(result.current, 'hiking').toggle());
-    expect(update).toHaveBeenCalledWith(false);
-    expect(mapSwitch(result.current, 'hiking').enabled).toBe(false);
-    expect(loadAddons).toHaveBeenCalled();
-    expect(toast.success).toHaveBeenCalledWith('admin.addons.toast.updated');
-  });
-
-  it('FE-HOOK-ADDONMGR-009: the cycling map switch under Tours loads, flips and saves on its own (BIK-06)', async () => {
-    const update = vi.spyOn(cycleMapAdminApi, 'update').mockResolvedValue({ enabled: false });
-    const { result } = await loaded();
-    await waitFor(() => expect(mapSwitch(result.current, 'cycle').enabled).toBe(true));
-    await act(() => mapSwitch(result.current, 'cycle').toggle());
-    expect(update).toHaveBeenCalledWith(false);
-    expect(mapSwitch(result.current, 'cycle').enabled).toBe(false);
-    expect(mapSwitch(result.current, 'hiking').enabled).toBe(true);
-  });
-
-  it('FE-HOOK-ADDONMGR-008: a failed save puts the switch under Tours back and says so', async () => {
-    vi.spyOn(wandererAdminApi, 'update').mockRejectedValue(new Error('500'));
-    const { result } = await loaded();
-    await act(() => result.current.toggleToursWanderer());
-    expect(result.current.toursWanderer).toBe(false);
-    expect(toast.error).toHaveBeenCalledWith('admin.addons.toast.error');
-  });
 });
@@ -1,8 +1,6 @@
-import { Bike, Footprints } from 'lucide-react';
 import { useEffect, useEffectEvent, useState } from 'react';

 import { adminApi } from '../../../api/client';
-import { cycleMapAdminApi, hikingMapAdminApi } from '../../../api/tourBaseMaps';
 import { wandererAdminApi } from '../../../api/wanderer';
 import { useTranslation } from '../../../i18n';
 import { useAddonStore } from '../../../store/addonStore';
@@ -22,8 +20,6 @@ export function useAddonManager() {
  const [addons, setAddons] = useState<Addon[]>([]);
  const [loading, setLoading] = useState(true);
  const [toursWanderer, setToursWanderer] = useState(false);
-  const [toursHikingMap, setToursHikingMap] = useState(false);
-  const [toursCycleMap, setToursCycleMap] = useState(false);

  const loadAddons = async () => {
    try {
@@ -40,14 +36,6 @@ export function useAddonManager() {
      .get()
      .then((flag) => setToursWanderer(flag.enabled))
      .catch(() => toast.error(t('admin.addons.toast.error')));
-    hikingMapAdminApi
-      .get()
-      .then((flag) => setToursHikingMap(flag.enabled))
-      .catch(() => toast.error(t('admin.addons.toast.error')));
-    cycleMapAdminApi
-      .get()
-      .then((flag) => setToursCycleMap(flag.enabled))
-      .catch(() => toast.error(t('admin.addons.toast.error')));
  });
  useEffect(() => {
    loadOnMount();
@@ -75,44 +63,20 @@ export function useAddonManager() {
    toast.success(t('admin.addons.toast.updated'));
  };

-  /** A switch under Tours (wanderer, OpenHikingMap, CyclOSM): flipped at once, put back when the save fails. */
-  const flipToursSwitch = async (
-    current: boolean,
-    set: (enabled: boolean) => void,
-    save: (enabled: boolean) => Promise<unknown>
-  ) => {
-    const next = !current;
-    set(next);
+  /** wanderer under Tours: flipped at once, put back when the save fails. */
+  const toggleToursWanderer = async () => {
+    const next = !toursWanderer;
+    setToursWanderer(next);
    try {
-      await save(next);
+      await wandererAdminApi.update(next);
    } catch {
-      set(!next);
+      setToursWanderer(!next);
      toast.error(t('admin.addons.toast.error'));
      return;
    }
    void refreshGlobalAddons();
    toast.success(t('admin.addons.toast.updated'));
  };
-  const toggleToursWanderer = () => flipToursSwitch(toursWanderer, setToursWanderer, wandererAdminApi.update);
-  /** The maps the Tours planner offers on their operators' terms, one switch each (MAP-01, BIK-06). */
-  const mapSwitches = [
-    {
-      key: 'hiking',
-      Icon: Footprints,
-      titleKey: 'admin.toursHikingMap.title',
-      subtitleKey: 'admin.toursHikingMap.subtitle',
-      enabled: toursHikingMap,
-      toggle: () => flipToursSwitch(toursHikingMap, setToursHikingMap, hikingMapAdminApi.update),
-    },
-    {
-      key: 'cycle',
-      Icon: Bike,
-      titleKey: 'admin.toursCycleMap.title',
-      subtitleKey: 'admin.toursCycleMap.subtitle',
-      enabled: toursCycleMap,
-      toggle: () => flipToursSwitch(toursCycleMap, setToursCycleMap, cycleMapAdminApi.update),
-    },
-  ] as const;

  const asOption = (provider: Addon): ProviderOption => ({
    key: provider.id,
@@ -142,6 +106,5 @@ export function useAddonManager() {
    documentProviderOptions,
    toursWanderer,
    toggleToursWanderer,
-    mapSwitches,
  };
 }
@@ -1,167 +0,0 @@
-import type { PaddleRegionAutoMode, PaddleRegionPending } from '@trek/shared';
-import { Ban, CloudDownload, Hand, Loader2, Power, Sparkles } from 'lucide-react';
-import { useTranslation } from '../../../i18n';
-import { ChoiceChips, SettingRows, SETTINGS_BUTTON, SettingsHint, StatusPill } from '../../Settings/settingsKit';
-import { LABEL, Segmented } from '../../shared/dialogParts';
-import { fs } from '../../shared/DialogShell';
-import { Tooltip } from '../../shared/Tooltip';
-import type { usePaddleRegionsAdmin } from './usePaddleRegionsAdmin';
-
-type Admin = ReturnType<typeof usePaddleRegionsAdmin>;
-
-const MODES: readonly PaddleRegionAutoMode[] = ['auto', 'ask', 'off'];
-const MODE_ICONS = { auto: CloudDownload, ask: Hand, off: Power } as const;
-/** The largest region TREK loads by itself, in megabytes: a district, a state, a small country. */
-const SIZES = [100, 250, 500, 1000, 2000] as const;
-
-/** A size in megabytes as the reader's language writes it, from 1000 on in gigabytes. */
-function useMegabytes() {
-  const { language } = useTranslation();
-  return (mb: number) =>
-    new Intl.NumberFormat(language, {
-      style: 'unit',
-      unit: mb >= 1000 ? 'gigabyte' : 'megabyte',
-      maximumFractionDigits: mb >= 1000 ? 1 : 0,
-    }).format(mb >= 1000 ? mb / 1000 : mb);
-}
-
-const MB = 1024 * 1024;
-
-/**
- * PAD-11C: how TREK gets the water data of a place a paddler plans in. The
- * mode, and in the automatic one the largest region it loads without asking.
- */
-export function AutoLoadSettings({ admin }: { admin: Admin }) {
-  const { t } = useTranslation();
-  const megabytes = useMegabytes();
-  const { settings, saving, save } = admin.autoLoad;
-  if (!settings) return null;
-  const sizes = SIZES.includes(settings.max_mb as (typeof SIZES)[number])
-    ? SIZES
-    : [...SIZES, settings.max_mb].sort((a, b) => a - b);
-  return (
-    <div data-testid="paddle-auto-load" className="flex min-w-0 flex-col gap-2.5">
-      <div className="min-w-0">
-        <span className={LABEL}>{t('admin.paddleRegions.auto.title')}</span>
-        <fieldset disabled={saving} className="m-0 min-w-0 border-0 p-0">
-          <Segmented<PaddleRegionAutoMode>
-            value={settings.mode}
-            onChange={(mode) => void save({ mode })}
-            label={t('admin.paddleRegions.auto.title')}
-            fill
-            options={MODES.map((mode) => {
-              const Icon = MODE_ICONS[mode];
-              return {
-                value: mode,
-                label: t(`admin.paddleRegions.auto.mode.${mode}`),
-                icon: <Icon size={13} strokeWidth={2} aria-hidden="true" />,
-              };
-            })}
-          />
-        </fieldset>
-        <SettingsHint className="mt-1.5">{t(`admin.paddleRegions.auto.modeHint.${settings.mode}`)}</SettingsHint>
-      </div>
-      {settings.mode === 'auto' && (
-        <fieldset disabled={saving} className="m-0 min-w-0 border-0 p-0">
-          <span className={LABEL}>{t('admin.paddleRegions.auto.maxSize')}</span>
-          <ChoiceChips<string>
-            value={String(settings.max_mb)}
-            label={t('admin.paddleRegions.auto.maxSize')}
-            onChange={(value) => void save({ max_mb: Number(value) })}
-            options={sizes.map((mb) => ({ value: String(mb), label: megabytes(mb) }))}
-          />
-          <SettingsHint className="mt-1.5">{t('admin.paddleRegions.auto.maxSizeHint')}</SettingsHint>
-        </fieldset>
-      )}
-    </div>
-  );
-}
-
-function RequestRow({ request, admin }: { request: PaddleRegionPending; admin: Admin }) {
-  const { t, language } = useTranslation();
-  const megabytes = useMegabytes();
-  const busy = admin.busyId === request.id;
-  const date = new Date(request.requested_at).toLocaleDateString(language, { dateStyle: 'medium' });
-  return (
-    <div
-      className={`flex flex-wrap items-center gap-x-3 gap-y-2 py-2.5 pe-2 ps-3 ${busy ? 'opacity-60' : ''}`}
-      data-testid="paddle-region-request"
-    >
-      <div className="flex min-w-0 flex-1 basis-48 flex-col gap-1">
-        <span className="truncate font-medium text-content" style={fs(13, 'body')}>
-          {request.name}
-        </span>
-        <span className="flex flex-wrap items-center gap-1.5">
-          {request.declined ? (
-            <StatusPill tone="danger" icon={<Ban size={10} strokeWidth={2.4} />}>
-              {t('admin.paddleRegions.requests.declined')}
-            </StatusPill>
-          ) : (
-            <StatusPill tone="warning">{t(`admin.paddleRegions.requests.reason.${request.reason}`)}</StatusPill>
-          )}
-          {request.bytes !== null && <StatusPill>{megabytes(Math.max(1, Math.round(request.bytes / MB)))}</StatusPill>}
-          {request.requested_by && (
-            <StatusPill>{t('admin.paddleRegions.requests.by', { user: request.requested_by })}</StatusPill>
-          )}
-          <StatusPill>{date}</StatusPill>
-        </span>
-      </div>
-      <span className="flex flex-none items-center gap-1.5">
-        {!request.declined && (
-          <button
-            type="button"
-            disabled={admin.busyId !== null}
-            onClick={() => void admin.decline(request.id)}
-            className={SETTINGS_BUTTON}
-            style={fs(12.5, 'body')}
-          >
-            {t('admin.paddleRegions.requests.decline')}
-          </button>
-        )}
-        <button
-          type="button"
-          disabled={admin.busyId !== null}
-          onClick={() => void admin.approve(request.id)}
-          className={SETTINGS_BUTTON}
-          style={fs(12.5, 'body')}
-        >
-          {busy ? <Loader2 size={13} className="animate-spin" /> : <CloudDownload size={13} strokeWidth={2.2} />}
-          {t('admin.paddleRegions.requests.approve')}
-        </button>
-      </span>
-    </div>
-  );
-}
-
-/** The regions paddlers asked for that wait for an admin, the open ones first. */
-export function RequestList({ admin }: { admin: Admin }) {
-  const { t } = useTranslation();
-  if (admin.requests.length === 0) return null;
-  const ordered = [...admin.requests].sort((a, b) => Number(a.declined) - Number(b.declined));
-  const open = admin.requests.filter((request) => !request.declined).length;
-  return (
-    <div className="flex min-w-0 flex-col gap-2" data-testid="paddle-region-requests">
-      <span className={`${LABEL} mb-0 flex items-center gap-1.5`}>
-        {t('admin.paddleRegions.requests.title')}
-        {open > 0 && <StatusPill tone="warning">{open}</StatusPill>}
-      </span>
-      <SettingRows>
-        {ordered.map((request) => (
-          <RequestRow key={request.id} request={request} admin={admin} />
-        ))}
-      </SettingRows>
-    </div>
-  );
-}
-
-/** A region TREK loaded by itself for a paddler, told apart from those an admin added. */
-export function AutoOriginPill() {
-  const { t } = useTranslation();
-  return (
-    <Tooltip label={t('admin.paddleRegions.origin.autoHint')}>
-      <span className="inline-flex" data-testid="paddle-region-auto">
-        <StatusPill icon={<Sparkles size={10} strokeWidth={2.2} />}>{t('admin.paddleRegions.origin.auto')}</StatusPill>
-      </span>
-    </Tooltip>
-  );
-}
@@ -1,4 +1,4 @@
-// FE-ADMIN-PADDLEREG-001 to FE-ADMIN-PADDLEREG-027: the paddle regions card in the admin area, drawn from a
+// FE-ADMIN-PADDLEREG-001 to FE-ADMIN-PADDLEREG-021: the paddle regions card in the admin area, drawn from a
 // controlled usePaddleRegionsAdmin (the hook has its own test).
 // FE-ADMIN-PADDLEREG-MODEL-001 to FE-ADMIN-PADDLEREG-MODEL-003: the helpers in paddleRegionsModel.
 import type { PaddleRegion, PaddleRegionCatalogEntry } from '@trek/shared';
@@ -25,13 +25,11 @@ function region(overrides: Partial<PaddleRegion> = {}): PaddleRegion {
    id: 'oberpfalz',
    name: 'Oberpfalz',
    status: 'ready',
-    origin: 'admin',
    source_timestamp: '2026-10-03T12:00:00Z',
    imported_at: '2026-10-04T08:00:00Z',
    feature_count: 1234,
    error: null,
    progress: null,
-    network: null,
    ...overrides,
  };
 }
@@ -58,8 +56,6 @@ function adminState(overrides: Partial<Admin> = {}, search: Partial<Admin['searc
    toursOn: true,
    offline: false,
    regions: [],
-    requests: [],
-    autoLoad: { settings: null, saving: false, save: vi.fn(async () => {}) },
    loading: false,
    error: null,
    retry: vi.fn(),
@@ -67,8 +63,6 @@ function adminState(overrides: Partial<Admin> = {}, search: Partial<Admin['searc
    busyId: null,
    add: vi.fn(async () => {}),
    refresh: vi.fn(async () => {}),
-    approve: vi.fn(async () => {}),
-    decline: vi.fn(async () => {}),
    removing: null,
    askRemove: vi.fn(),
    cancelRemove: vi.fn(),
@@ -301,91 +295,6 @@ describe('PaddleRegionsPanel', () => {
  });
 });

-describe('PaddleRegionsPanel water network (PAD-11)', () => {
-  it('FE-ADMIN-PADDLEREG-022: a region with its network shows the water it holds, the rest in the tooltip', async () => {
-    const network = {
-      water_km: 1364.5,
-      lakes: 266,
-      portages: 14,
-      inferred_portages: 232,
-      gaps: 63,
-      locks: 17,
-      built_at: '2026-10-17T15:30:20Z',
-      bytes: 1496816,
-    };
-    show({ regions: [region({ network })] });
-    const pill = within(rowOf('Oberpfalz')).getByTestId('paddle-region-network');
-    expect(pill).toHaveTextContent('1,365 km of water');
-    fireEvent.mouseEnter(pill);
-    expect(await screen.findByRole('tooltip')).toHaveTextContent(
-      '266 lakes, 14 mapped portages, 232 assumed carries, 17 locks, 63 bridged gaps'
-    );
-  });
-
-  it('FE-ADMIN-PADDLEREG-023: a region read before routing existed asks to be read again; one never read or being read says nothing', () => {
-    show({
-      regions: [
-        region({ id: 'old', name: 'Old read', network: null }),
-        region({ id: 'new', name: 'Never read', imported_at: null, status: 'queued', network: null }),
-      ],
-    });
-    expect(within(rowOf('Old read')).getByText('No water network')).toBeInTheDocument();
-    expect(within(rowOf('Never read')).queryByText('No water network')).not.toBeInTheDocument();
-  });
-
-  it('FE-ADMIN-PADDLEREG-024: offers automatic, on request and off, with the size limit only for automatic', () => {
-    const save = vi.fn(async () => {});
-    show({ autoLoad: { settings: { mode: 'auto', max_mb: 500 }, saving: false, save } });
-    const auto = screen.getByTestId('paddle-auto-load');
-    expect(within(auto).getByRole('button', { name: /Automatic/ })).toHaveAttribute('aria-pressed', 'true');
-    expect(within(auto).getByText('Largest region loaded automatically')).toBeInTheDocument();
-    fireEvent.click(within(auto).getByRole('button', { name: /On request/ }));
-    expect(save).toHaveBeenCalledWith({ mode: 'ask' });
-    fireEvent.click(within(auto).getByRole('button', { name: '1 GB' }));
-    expect(save).toHaveBeenCalledWith({ max_mb: 1000 });
-  });
-
-  it('FE-ADMIN-PADDLEREG-025: hides the size limit unless loading is automatic, and shows nothing before the setting is read', () => {
-    show({ autoLoad: { settings: { mode: 'off', max_mb: 500 }, saving: false, save: vi.fn() } });
-    expect(screen.queryByText('Largest region loaded automatically')).not.toBeInTheDocument();
-    expect(screen.getByText(/TREK loads nothing by itself/)).toBeInTheDocument();
-  });
-
-  it('FE-ADMIN-PADDLEREG-026: lists the requests, the open ones first, to load or decline', () => {
-    const approve = vi.fn(async () => {});
-    const decline = vi.fn(async () => {});
-    const base = {
-      bytes: 734_003_200,
-      requested_by: 'elmo',
-      requested_at: '2026-10-18T09:00:00Z',
-    };
-    show({
-      approve,
-      decline,
-      requests: [
-        { ...base, id: 'norway', name: 'Norway', reason: 'too_large', declined: true },
-        { ...base, id: 'brandenburg', name: 'Brandenburg', reason: 'limit', declined: false },
-      ],
-    });
-    const rows = screen.getAllByTestId('paddle-region-request');
-    expect(rows[0]).toHaveTextContent('Brandenburg');
-    expect(rows[0]).toHaveTextContent('Daily limit');
-    expect(rows[0]).toHaveTextContent('by elmo');
-    expect(rows[1]).toHaveTextContent('Declined');
-    fireEvent.click(within(rows[0]).getByRole('button', { name: 'Decline' }));
-    expect(decline).toHaveBeenCalledWith('brandenburg');
-    fireEvent.click(within(rows[1]).getByRole('button', { name: /Load/ }));
-    expect(approve).toHaveBeenCalledWith('norway');
-    expect(within(rows[1]).queryByRole('button', { name: 'Decline' })).toBeNull();
-  });
-
-  it('FE-ADMIN-PADDLEREG-027: marks a region TREK loaded by itself', () => {
-    show({ regions: [region({ id: 'mv', name: 'Mecklenburg', origin: 'auto' }), READY] });
-    expect(within(rowOf('Mecklenburg')).getByTestId('paddle-region-auto')).toHaveTextContent('Automatic');
-    expect(within(rowOf('Oberpfalz')).queryByTestId('paddle-region-auto')).toBeNull();
-  });
-});
-
 describe('paddleRegionsModel', () => {
  it('FE-ADMIN-PADDLEREG-MODEL-001: a region waiting for its read or being read counts as reading', () => {
    expect(isReading({ status: 'queued' })).toBe(true);
@@ -15,7 +15,6 @@ import { EditorField, INPUT } from '../../shared/dialogParts';
 import { fs } from '../../shared/DialogShell';
 import ErrorBoundary from '../../shared/ErrorBoundary';
 import { Tooltip } from '../../shared/Tooltip';
-import { AutoLoadSettings, AutoOriginPill, RequestList } from './PaddleAutoLoadParts';
 import { progressPercent, regionStatusTone } from './paddleRegionsModel';
 import { usePaddleRegionsAdmin } from './usePaddleRegionsAdmin';

@@ -23,10 +22,8 @@ type Admin = ReturnType<typeof usePaddleRegionsAdmin>;

 /**
 * PAD-05A in the admin area: the regions TREK reads paddle obstacles for,
- * picked from Geofabrik's list, and (PAD-11C) how TREK loads the region of a
- * place a paddler plans in by itself, with the regions that wait for an admin.
- * Both the desktop and the phone admin show this one card under the addons,
- * while the Tours addon is on.
+ * picked from Geofabrik's list. Both the desktop and the phone admin show
+ * this one card under the addons, while the Tours addon is on.
 */
 export default function PaddleRegionsPanel() {
  return (
@@ -70,8 +67,6 @@ function Panel() {
        </div>
      )}
      <fieldset disabled={admin.offline} className="m-0 flex min-w-0 flex-col gap-4 border-0 p-0">
-        <AutoLoadSettings admin={admin} />
-        <RequestList admin={admin} />
        <CatalogSearch admin={admin} />
        <RegionList admin={admin} />
      </fieldset>
@@ -221,41 +216,6 @@ function RegionStatus({ region }: { region: PaddleRegion }) {
  );
 }

-/**
- * PAD-11: the water network the router follows in a region, as one figure
- * with the rest in its tooltip. A region read before routing existed says it
- * needs reading again; a network is never claimed where none was built.
- */
-function RegionNetwork({ region }: { region: PaddleRegion }) {
-  const { t, language } = useTranslation();
-  const { network } = region;
-  if (!network) {
-    if (!region.imported_at || region.status === 'importing') return null;
-    return (
-      <Tooltip label={t('admin.paddleRegions.network.missingHint')}>
-        <span className="inline-flex">
-          <StatusPill tone="warning">{t('admin.paddleRegions.network.missing')}</StatusPill>
-        </span>
-      </Tooltip>
-    );
-  }
-  const km = new Intl.NumberFormat(language, { maximumFractionDigits: 0 }).format(network.water_km);
-  const details = [
-    t('admin.paddleRegions.network.lakes', { count: network.lakes }),
-    t('admin.paddleRegions.network.portages', { count: network.portages }),
-    t('admin.paddleRegions.network.inferred', { count: network.inferred_portages }),
-    t('admin.paddleRegions.network.locks', { count: network.locks }),
-    t('admin.paddleRegions.network.gaps', { count: network.gaps }),
-  ].join(', ');
-  return (
-    <Tooltip label={details}>
-      <span className="inline-flex" data-testid="paddle-region-network">
-        <StatusPill>{t('admin.paddleRegions.network.km', { km })}</StatusPill>
-      </span>
-    </Tooltip>
-  );
-}
-
 function RegionRow({ region, admin }: { region: PaddleRegion; admin: Admin }) {
  const { t, language } = useTranslation();
  const busy = admin.busyId === region.id;
@@ -279,12 +239,10 @@ function RegionRow({ region, admin }: { region: PaddleRegion; admin: Admin }) {
        </span>
        <span className="flex flex-wrap items-center gap-1.5">
          <RegionStatus region={region} />
-          {region.origin === 'auto' && <AutoOriginPill />}
          {region.imported_at && (
            <StatusPill>{t('admin.paddleRegions.objects', { count: region.feature_count })}</StatusPill>
          )}
          {region.imported_at && date && <StatusPill>{t('admin.paddleRegions.asOf', { date })}</StatusPill>}
-          <RegionNetwork region={region} />
        </span>
        {region.status === 'failed' && region.error && (
          <p className="m-0 line-clamp-2 break-words text-danger" style={fs(11.5)} title={region.error}>
@@ -1,50 +0,0 @@
-// FE-HOOK-PADDLE-AUTOLOAD-001 to 003: how TREK loads regions by itself, read and saved in the admin area (PAD-11C).
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { createElement, type ReactNode } from 'react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { TranslationProvider } from '../../../i18n/TranslationContext';
-
-const repo = vi.hoisted(() => ({ settings: vi.fn(), saveSettings: vi.fn() }));
-const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn() }));
-vi.mock('../../../repo/paddleRegionRepo', () => ({ paddleRegionRepo: repo }));
-vi.mock('../../shared/Toast', () => ({ useToast: () => toast }));
-
-const { usePaddleAutoLoad } = await import('./usePaddleAutoLoad');
-
-const wrapper = ({ children }: { children: ReactNode }) => createElement(TranslationProvider, null, children);
-
-describe('usePaddleAutoLoad', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    repo.settings.mockResolvedValue({ mode: 'auto', max_mb: 500 });
-    repo.saveSettings.mockImplementation(async (settings: unknown) => settings);
-  });
-
-  it('FE-HOOK-PADDLE-AUTOLOAD-001: reads the setting once the card shows, and not offline', async () => {
-    const { result } = renderHook(() => usePaddleAutoLoad(true, false), { wrapper });
-    await waitFor(() => expect(result.current.settings).toEqual({ mode: 'auto', max_mb: 500 }));
-    renderHook(() => usePaddleAutoLoad(true, true), { wrapper });
-    expect(repo.settings).toHaveBeenCalledTimes(1);
-  });
-
-  it('FE-HOOK-PADDLE-AUTOLOAD-002: shows a change at once and keeps what the server saved', async () => {
-    const { result } = renderHook(() => usePaddleAutoLoad(true, false), { wrapper });
-    await waitFor(() => expect(result.current.settings).not.toBeNull());
-    await act(async () => {
-      await result.current.save({ mode: 'ask' });
-    });
-    expect(repo.saveSettings).toHaveBeenCalledWith({ mode: 'ask', max_mb: 500 });
-    expect(result.current.settings).toEqual({ mode: 'ask', max_mb: 500 });
-  });
-
-  it('FE-HOOK-PADDLE-AUTOLOAD-003: takes a refused change back and says so', async () => {
-    repo.saveSettings.mockRejectedValueOnce(new Error('nope'));
-    const { result } = renderHook(() => usePaddleAutoLoad(true, false), { wrapper });
-    await waitFor(() => expect(result.current.settings).not.toBeNull());
-    await act(async () => {
-      await result.current.save({ max_mb: 2000 });
-    });
-    expect(result.current.settings).toEqual({ mode: 'auto', max_mb: 500 });
-    expect(toast.error).toHaveBeenCalledTimes(1);
-  });
-});
@@ -1,59 +0,0 @@
-import type { PaddleRegionSettings } from '@trek/shared';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { useTranslation } from '../../../i18n';
-import { paddleRegionRepo } from '../../../repo/paddleRegionRepo';
-import { getApiErrorMessage } from '../../../types';
-import { useToast } from '../../shared/Toast';
-
-/**
- * PAD-11C in the admin area: how TREK loads the water data of a place a
- * paddler plans in, read once the card shows and saved on every change. A
- * change shows at once and goes back, with a toast, when the server refuses
- * it. While one is saved the controls rest, so two saves never cross.
- */
-export function usePaddleAutoLoad(active: boolean, offline: boolean) {
-  const { t } = useTranslation();
-  const toast = useToast();
-  const [settings, setSettings] = useState<PaddleRegionSettings | null>(null);
-  const [saving, setSaving] = useState(false);
-  const pending = useRef(false);
-
-  useEffect(() => {
-    if (!active || offline) return;
-    let cancelled = false;
-    paddleRegionRepo.settings().then(
-      (loaded) => {
-        if (!cancelled) setSettings(loaded);
-      },
-      (err: unknown) => {
-        if (!cancelled) toast.error(getApiErrorMessage(err, t('common.error')));
-      }
-    );
-    return () => {
-      cancelled = true;
-    };
-  }, [active, offline, t, toast]);
-
-  const save = useCallback(
-    async (change: Partial<PaddleRegionSettings>) => {
-      if (!settings || pending.current) return;
-      const before = settings;
-      const next = { ...settings, ...change };
-      pending.current = true;
-      setSaving(true);
-      setSettings(next);
-      try {
-        setSettings(await paddleRegionRepo.saveSettings(next));
-      } catch (err) {
-        setSettings(before);
-        toast.error(getApiErrorMessage(err, t('common.error')));
-      } finally {
-        pending.current = false;
-        setSaving(false);
-      }
-    },
-    [settings, t, toast]
-  );
-
-  return { settings, saving, save };
-}
@@ -24,15 +24,11 @@ const repo = vi.hoisted(() => ({
  add: vi.fn<(id: string) => Promise<PaddleRegion>>(),
  refresh: vi.fn<(id: string) => Promise<PaddleRegion>>(),
  remove: vi.fn<(id: string) => Promise<{ success: true }>>(),
-  decline: vi.fn<(id: string) => Promise<{ success: true }>>(),
-  settings: vi.fn(async () => ({ mode: 'auto' as const, max_mb: 500 })),
-  saveSettings: vi.fn(async (settings: { mode: 'auto' | 'ask' | 'off'; max_mb: number }) => settings),
 }));
 const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn() }));
 vi.mock('../../../repo/paddleRegionRepo', async (importOriginal) => ({
  ...(await importOriginal<typeof import('../../../repo/paddleRegionRepo')>()),
-  // The list answers its regions and no requests unless a test says otherwise (PAD-11C).
-  paddleRegionRepo: { ...repo, list: () => repo.list().then((regions) => ({ regions, requests: [] })) },
+  paddleRegionRepo: repo,
 }));
 vi.mock('../../shared/Toast', () => ({ useToast: () => toast }));

@@ -44,13 +40,11 @@ function region(id: string, status: PaddleRegion['status'], over: Partial<Paddle
    id,
    name: id,
    status,
-    origin: 'admin',
    source_timestamp: null,
    imported_at: null,
    feature_count: 0,
    error: null,
    progress: null,
-    network: null,
    ...over,
  };
 }
@@ -1,4 +1,4 @@
-import type { PaddleRegion, PaddleRegionCatalogEntry, PaddleRegionPending } from '@trek/shared';
+import type { PaddleRegion, PaddleRegionCatalogEntry } from '@trek/shared';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useNetworkMode } from '../../../hooks/useNetworkMode';
 import { useTranslation } from '../../../i18n';
@@ -7,7 +7,6 @@ import { useAddonStore } from '../../../store/addonStore';
 import { getApiErrorMessage } from '../../../types';
 import { useToast } from '../../shared/Toast';
 import { isReading } from './paddleRegionsModel';
-import { usePaddleAutoLoad } from './usePaddleAutoLoad';

 /** How often the list is asked again while a region waits or is read. */
 export const PADDLE_REGIONS_POLL_MS = import.meta.env.MODE === 'test' ? 50 : 3000;
@@ -24,14 +23,12 @@ function errorText(t: Translate, err: unknown): string {
 }

 /**
- * The regions as the server holds them, with those paddlers asked for, asked
- * again every few seconds while any of them is read, and on `reload` after a
- * change. Every answer is set
+ * The regions as the server holds them, asked again every few seconds while
+ * any of them is read, and on `reload` after a change. Every answer is set
 * from the request's own callback, so a slow one never overwrites a newer.
 */
 function useRegionList(active: boolean, offline: boolean, t: Translate) {
  const [regions, setRegions] = useState<PaddleRegion[]>([]);
-  const [requests, setRequests] = useState<PaddleRegionPending[]>([]);
  const [loaded, setLoaded] = useState(false);
  const [error, setError] = useState<string | null>(null);
  const [asked, setAsked] = useState(0);
@@ -41,8 +38,7 @@ function useRegionList(active: boolean, offline: boolean, t: Translate) {
    paddleRegionRepo.list().then(
      (list) => {
        if (cancelled) return;
-        setRegions(list.regions);
-        setRequests(list.requests);
+        setRegions(list);
        setError(null);
        setLoaded(true);
      },
@@ -63,7 +59,7 @@ function useRegionList(active: boolean, offline: boolean, t: Translate) {
    return () => window.clearInterval(timer);
  }, [active, offline, reading]);
  const reload = useCallback(() => setAsked((n) => n + 1), []);
-  return { regions, requests, loading: !loaded && !offline, error, reload };
+  return { regions, loading: !loaded && !offline, error, reload };
 }

 /** Geofabrik's list searched as the admin types, the last search winning. */
@@ -103,8 +99,7 @@ function useCatalogSearch(offline: boolean, t: Translate) {
 * PAD-05A in the admin area: the regions TREK reads paddle data for, a search
 * in Geofabrik's list to add one, reading a region again and removing it
 * after a confirmation. Shown only while the Tours addon is on; the status of
- * a read follows without reloading the page. PAD-11C: how TREK loads regions
- * for paddlers by itself, and the regions they asked for, to load or decline.
+ * a read follows without reloading the page.
 */
 export function usePaddleRegionsAdmin() {
  const { t } = useTranslation();
@@ -112,7 +107,6 @@ export function usePaddleRegionsAdmin() {
  const { offline } = useNetworkMode();
  const toursOn = useAddonStore((state) => state.isEnabled('tours'));
  const list = useRegionList(toursOn, offline, t);
-  const autoLoad = usePaddleAutoLoad(toursOn, offline);
  const search = useCatalogSearch(offline, t);
  const [busyId, setBusyId] = useState<string | null>(null);
  const [removing, setRemoving] = useState<PaddleRegion | null>(null);
@@ -152,12 +146,6 @@ export function usePaddleRegionsAdmin() {
    [run, setQuery, t]
  );
  const refresh = useCallback((id: string) => run(id, () => paddleRegionRepo.refresh(id)), [run]);
-  /** A paddler's request let through: the region is added like any other. */
-  const approve = useCallback(
-    (id: string) => run(id, () => paddleRegionRepo.add(id), t('admin.paddleRegions.toast.added')),
-    [run, t]
-  );
-  const decline = useCallback((id: string) => run(id, () => paddleRegionRepo.decline(id)), [run]);
  const confirmRemove = useCallback(() => {
    const region = removing;
    setRemoving(null);
@@ -169,8 +157,6 @@ export function usePaddleRegionsAdmin() {
    toursOn,
    offline,
    regions: list.regions,
-    requests: list.requests,
-    autoLoad,
    loading: list.loading,
    error: list.error,
    retry: reload,
@@ -179,8 +165,6 @@ export function usePaddleRegionsAdmin() {
    busyId,
    add,
    refresh,
-    approve,
-    decline,
    removing,
    askRemove: setRemoving,
    cancelRemove: () => setRemoving(null),
@@ -24,7 +24,7 @@ export const CATEGORIES = [
  { id: 'members', keys: ['member_manage'] },
  { id: 'files', keys: ['file_upload', 'file_edit', 'file_delete'] },
  { id: 'content', keys: ['place_edit', 'day_edit', 'reservation_edit'] },
-  { id: 'extras', keys: ['budget_edit', 'packing_edit', 'collab_edit', 'share_manage', 'journal_link'] },
+  { id: 'extras', keys: ['budget_edit', 'packing_edit', 'collab_edit', 'share_manage'] },
 ];

 /**
@@ -1,150 +0,0 @@
-// FE-STA2-PANE-001 to FE-STA2-PANE-006
-// STA-02: the Atlas tab of the user's own tour activities: the distance large
-// with how many tours at its corner, the climb, the types, what the numbers
-// rest on, and the full list in a dialog.
-import userEvent from '@testing-library/user-event';
-import { summarizeTourActivities, type TourActivityStatsEntry, type TourActivityStatsResponse } from '@trek/shared';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { buildSettings } from '../../../../tests/helpers/factories';
-import { render, screen } from '../../../../tests/helpers/render';
-import { resetAllStores, seedStore } from '../../../../tests/helpers/store';
-import { useSettingsStore } from '../../../store/settingsStore';
-import { AtlasTourActivityPane } from './AtlasTourActivityPane';
-import type { TourActivityStats } from './useTourActivityStats';
-
-const hook = vi.hoisted(() => ({ current: null as unknown, active: [] as boolean[] }));
-vi.mock('./useTourActivityStats', () => ({
-  useTourActivityStats: (active: boolean) => {
-    hook.active.push(active);
-    return hook.current;
-  },
-}));
-
-const TODAY = '2026-10-20';
-
-function entry(overrides: Partial<TourActivityStatsEntry> = {}): TourActivityStatsEntry {
-  return {
-    place_id: 1,
-    name: 'Ridge',
-    tour_type: 'hike',
-    trip: { id: 5, title: 'Alps' },
-    derived_from_place_id: null,
-    date: '2026-07-02',
-    basis: 'plan',
-    track: null,
-    day_count: 1,
-    distance_km: 12,
-    ascent_m: 800,
-    descent_m: 790,
-    excluded: false,
-    ...overrides,
-  };
-}
-
-function statsOf(data: TourActivityStatsResponse | null, overrides: Partial<TourActivityStats> = {}) {
-  const stats: TourActivityStats = {
-    status: data ? 'ready' : 'loading',
-    data,
-    summary: data ? summarizeTourActivities(data.entries, { today: TODAY }) : null,
-    period: 'all',
-    setPeriod: vi.fn(),
-    periods: ['all', 'thisYear', 'last12'],
-    type: 'all',
-    setType: vi.fn(),
-    types: ['all', 'hike', 'kayak'],
-    pending: new Set(),
-    setExcluded: vi.fn().mockResolvedValue(undefined),
-    retry: vi.fn(),
-    ...overrides,
-  };
-  hook.current = stats;
-  return stats;
-}
-
-const data: TourActivityStatsResponse = {
-  entries: [
-    entry(),
-    entry({ place_id: 2, name: 'Summit', date: '2026-08-01', distance_km: 20.5, ascent_m: 1200, descent_m: 1200 }),
-    entry({
-      place_id: 3,
-      name: 'Lake',
-      tour_type: 'kayak',
-      basis: 'track',
-      track: { place_id: 9, name: 'Watch' },
-      distance_km: 8,
-      ascent_m: null,
-      descent_m: null,
-    }),
-  ],
-  uncounted: { unassigned: 0, undated: 1 },
-};
-
-beforeEach(() => {
-  resetAllStores();
-  vi.clearAllMocks();
-  hook.active = [];
-  seedStore(useSettingsStore, { settings: buildSettings({ distance_unit: 'metric' }) });
-});
-
-describe('AtlasTourActivityPane', () => {
-  it('FE-STA2-PANE-001: follows whether the tab is shown, silent before, loading until the read is there', () => {
-    statsOf(null, { status: 'idle' });
-    const { rerender } = render(<AtlasTourActivityPane active={false} />);
-    expect(hook.active).toEqual([false]);
-    expect(screen.queryByRole('status')).not.toBeInTheDocument();
-    statsOf(null);
-    rerender(<AtlasTourActivityPane active />);
-    expect(hook.active).toEqual([false, true]);
-    expect(screen.getByRole('status')).toHaveTextContent('Loading');
-  });
-
-  it('FE-STA2-PANE-002: shows the distance large with the tour count at its corner, and the climb', () => {
-    statsOf(data);
-    render(<AtlasTourActivityPane active />);
-    expect(screen.getByTestId('atlas-tour-activity-distance')).toHaveTextContent('40.5km');
-    expect(screen.getByTestId('atlas-tour-activity-count')).toHaveTextContent('3');
-    expect(screen.getByTestId('atlas-tour-activity-ascent')).toHaveTextContent('2000m');
-    expect(screen.getByTestId('atlas-tour-activity-type-hike')).toHaveTextContent('2');
-    expect(screen.getByTestId('atlas-tour-activity-type-kayak')).toHaveTextContent('8 km');
-  });
-
-  it('FE-STA2-PANE-003: says what the numbers rest on and what does not count', () => {
-    statsOf(data);
-    render(<AtlasTourActivityPane active />);
-    expect(screen.getByTestId('tour-activity-basis-plan')).toHaveTextContent('Planned2');
-    expect(screen.getByTestId('tour-activity-basis-track')).toHaveTextContent('Recorded1');
-    expect(screen.getByTestId('tour-activity-undated')).toHaveTextContent('1');
-  });
-
-  it('FE-STA2-PANE-004: one type chosen leaves the type columns out; nothing done says so', () => {
-    statsOf(data, { type: 'hike', summary: summarizeTourActivities(data.entries, { today: TODAY, type: 'hike' }) });
-    const { rerender } = render(<AtlasTourActivityPane active />);
-    expect(screen.queryByTestId('atlas-tour-activity-type-hike')).not.toBeInTheDocument();
-
-    statsOf(data, { summary: summarizeTourActivities(data.entries, { today: TODAY, from: '2027-01-01' }) });
-    rerender(<AtlasTourActivityPane active />);
-    expect(screen.getByText('No completed tours in this period')).toBeInTheDocument();
-    expect(screen.queryByRole('button', { name: 'Show tours' })).not.toBeInTheDocument();
-  });
-
-  it('FE-STA2-PANE-005: the full list opens in the dialog', async () => {
-    statsOf(data);
-    const user = userEvent.setup();
-    render(<AtlasTourActivityPane active />);
-    await user.click(screen.getByRole('button', { name: 'Show tours' }));
-    expect(screen.getByRole('heading', { name: 'My tour activities' })).toBeInTheDocument();
-    expect(screen.getByTestId('tour-activity-list')).toBeInTheDocument();
-  });
-
-  it('FE-STA2-PANE-006: offline and failed reads say so, a failed one with a retry', async () => {
-    statsOf(null, { status: 'offline' });
-    const { rerender } = render(<AtlasTourActivityPane active />);
-    expect(screen.getByText(/needs a connection/i)).toBeInTheDocument();
-
-    const failed = statsOf(null, { status: 'error' });
-    rerender(<AtlasTourActivityPane active />);
-    expect(screen.getByRole('alert')).toHaveTextContent('Tour activities could not be loaded');
-    await userEvent.setup().click(screen.getByRole('button', { name: 'Try again' }));
-    expect(failed.retry).toHaveBeenCalled();
-  });
-});
@@ -1,223 +0,0 @@
-import type { TourActivitySummary } from '@trek/shared';
-import { Footprints, ListOrdered } from 'lucide-react';
-import { useState } from 'react';
-import { useTranslation } from '../../../i18n';
-import type { DistanceUnit } from '../../../types';
-import { fs } from '../../shared/DialogShell';
-import { Tooltip } from '../../shared/Tooltip';
-import { CardAction, InfoDot } from '../../Tours/tourParts';
-import { ActivityFilters, ActivityStatusLine, BasisBadges, UncountedBadges } from './tourActivityParts';
-import { distanceReading, heightReading, typeIcon, typeLabel, useDistanceUnit } from './tourActivityReading';
-import { TourActivityStatsDialog } from './TourActivityStatsDialog';
-import { splitMeasure } from './tourActivityStatsModel';
-import { useTourActivityStats, type TourActivityStats } from './useTourActivityStats';
-
-/** The wash the hero tile sits on, as the Atlas numbers do: the text colour, faintly, over the glass. */
-const HERO_TINT = 'color-mix(in srgb, var(--text-primary) 7%, transparent)';
-/** How many types the strip names before the dialog takes over. */
-const STRIP_TYPES = 3;
-const EYEBROW = 'mt-1.5 whitespace-nowrap font-semibold uppercase tracking-wide text-content-faint';
-
-function Divider() {
-  return <span aria-hidden="true" className="mx-3 my-3 w-0.5 flex-none rounded-full bg-edge-faint" />;
-}
-
-/**
- * The distance of the period, large, with how many tours at its corner; the
- * tour count stands in when no tour knows its distance.
- */
-function Hero({ summary, unit }: { summary: TourActivitySummary; unit: DistanceUnit }) {
-  const { t } = useTranslation();
-  const reading = distanceReading(summary.totals, unit);
-  const shown = reading ? splitMeasure(reading.text) : { value: String(summary.totals.count), unit: '' };
-  const countLabel = `${t('tours.mode.tours')}: ${summary.totals.count}`;
-  return (
-    <div
-      className="relative mx-2 my-2 flex flex-col justify-center rounded-xl px-5 py-4"
-      style={{ background: HERO_TINT }}
-    >
-      <div className="flex items-baseline gap-1.5" data-testid="atlas-tour-activity-distance">
-        <span className="font-black tabular-nums leading-none text-content" style={fs(40, 'title')}>
-          {shown.value}
-        </span>
-        {shown.unit && (
-          <span className="font-medium text-content-muted" style={fs(14, 'body')}>
-            {shown.unit}
-          </span>
-        )}
-      </div>
-      <span className={EYEBROW} style={fs(9)}>
-        {reading ? t('tours.detail.distance') : t('tours.mode.tours')}
-      </span>
-      {reading && (
-        <Tooltip label={countLabel}>
-          <span
-            aria-label={countLabel}
-            data-testid="atlas-tour-activity-count"
-            className="absolute -end-2 -top-2 inline-flex h-[22px] items-center gap-1 rounded-full bg-surface-card px-2 font-geist font-semibold tabular-nums text-content shadow-sm ring-1 ring-inset ring-edge-faint"
-            style={fs(11)}
-          >
-            <Footprints size={11} strokeWidth={2.2} className="flex-none text-content-muted" />
-            {summary.totals.count}
-          </span>
-        </Tooltip>
-      )}
-    </div>
-  );
-}
-
-/** A height sum as the Atlas numbers stand: the value, its unit, and what it is below. */
-function Figure({ label, text, testId }: { label: string; text: string; testId: string }) {
-  const { value, unit } = splitMeasure(text);
-  return (
-    <div className="flex flex-none flex-col items-center justify-center px-3 py-4" data-testid={testId}>
-      <span className="flex items-baseline gap-1">
-        <span className="font-black tabular-nums leading-none text-content" style={fs(24, 'subtitle')}>
-          {value}
-        </span>
-        <span className="font-medium text-content-muted" style={fs(11, 'body')}>
-          {unit}
-        </span>
-      </span>
-      <span className={EYEBROW} style={fs(9)}>
-        {label}
-      </span>
-    </div>
-  );
-}
-
-/** The types of the period, the most tours first: each an icon with its count at the corner, its distance below. */
-function TypeColumns({ summary, unit }: { summary: TourActivitySummary; unit: DistanceUnit }) {
-  const { t } = useTranslation();
-  return (
-    <div className="flex flex-none items-center gap-4 px-2 py-3">
-      {summary.types.slice(0, STRIP_TYPES).map((scope) => {
-        const Icon = typeIcon(scope.type);
-        const distance = distanceReading(scope, unit);
-        const label = `${typeLabel(scope.type, t)}: ${scope.count}${distance ? `, ${distance.text}` : ''}`;
-        return (
-          <Tooltip key={scope.type} label={label}>
-            <span
-              aria-label={label}
-              className="flex flex-col items-center gap-1.5"
-              data-testid={`atlas-tour-activity-type-${scope.type}`}
-            >
-              <span className="relative">
-                <span className="grid h-8 w-8 place-items-center rounded-full bg-surface-card text-content-secondary shadow-sm ring-1 ring-inset ring-edge-faint">
-                  <Icon size={15} strokeWidth={1.9} />
-                </span>
-                <span
-                  className="absolute -end-1.5 -top-1.5 grid h-4 min-w-4 place-items-center rounded-full bg-accent px-1 font-geist font-semibold tabular-nums text-accent-text ring-2 ring-surface-card"
-                  style={fs(9)}
-                >
-                  {scope.count}
-                </span>
-              </span>
-              {distance && (
-                <span
-                  className="whitespace-nowrap font-semibold tabular-nums text-content-secondary"
-                  style={fs(11, 'body')}
-                >
-                  {distance.text}
-                </span>
-              )}
-            </span>
-          </Tooltip>
-        );
-      })}
-    </div>
-  );
-}
-
-/** What the sums rest on, what does not count, and the way into the full list. */
-interface StripProps {
-  stats: TourActivityStats;
-  summary: TourActivitySummary;
-  onOpen: () => void;
-}
-
-function SideColumn({ stats, summary, onOpen }: StripProps) {
-  const { t } = useTranslation();
-  const uncounted = stats.data?.uncounted ?? { unassigned: 0, undated: 0 };
-  return (
-    <div className="flex flex-none flex-col items-start justify-center gap-1.5 px-3 py-3">
-      <div className="flex flex-wrap items-center gap-1.5">
-        <BasisBadges byBasis={summary.totals.byBasis} />
-        <InfoDot label={t('tours.stats.title')} description={t('tours.stats.basisInfo')} />
-      </div>
-      <div className="flex flex-wrap items-center gap-1.5">
-        <UncountedBadges upcoming={summary.upcoming} {...uncounted} />
-      </div>
-      {summary.done.length > 0 && (
-        <CardAction icon={<ListOrdered size={13} strokeWidth={2.2} />} onClick={onOpen}>
-          {t('tours.stats.showTours')}
-        </CardAction>
-      )}
-    </div>
-  );
-}
-
-/** The numbers of the period, or why there are none, with the filters before them. */
-function Strip({ stats, summary, onOpen }: StripProps) {
-  const { t } = useTranslation();
-  const unit = useDistanceUnit();
-  const ascent = heightReading(summary.totals.ascentM, unit);
-  const descent = heightReading(summary.totals.descentM, unit);
-  const counted = summary.totals.count > 0;
-  return (
-    <>
-      <div className="flex flex-none flex-col items-start justify-center gap-1.5 px-3 py-3">
-        <ActivityFilters stats={stats} quiet />
-      </div>
-      {counted ? (
-        <>
-          <Hero summary={summary} unit={unit} />
-          {ascent && <Figure label={t('tours.detail.ascent')} text={ascent.text} testId="atlas-tour-activity-ascent" />}
-          {descent && (
-            <Figure label={t('tours.detail.descent')} text={descent.text} testId="atlas-tour-activity-descent" />
-          )}
-          {stats.type === 'all' && summary.types.length > 1 && (
-            <>
-              <Divider />
-              <TypeColumns summary={summary} unit={unit} />
-            </>
-          )}
-        </>
-      ) : (
-        <p className="m-0 flex max-w-[260px] items-center px-4 py-5 text-content-muted" style={fs(12, 'body')}>
-          {t(stats.data?.entries.length ? 'tours.stats.none' : 'tours.stats.empty')}
-        </p>
-      )}
-      <Divider />
-      <SideColumn stats={stats} summary={summary} onOpen={onOpen} />
-    </>
-  );
-}
-
-/**
- * STA-02: the Atlas tab of the user's own tour activities: the period and type,
- * the distance done with how many tours at its corner, the climb, the types,
- * and what the numbers rest on (the trip planning, or recorded tracks where
- * linked). The full list, where a tour can be left out, opens in a dialog. The
- * read waits until the tab is first shown.
- */
-export function AtlasTourActivityPane({ active, maxWidth }: { active: boolean; maxWidth?: number }) {
-  const stats = useTourActivityStats(active);
-  const [open, setOpen] = useState(false);
-  return (
-    <div
-      className="flex w-full items-stretch justify-center overflow-x-auto px-2"
-      style={{ maxWidth }}
-      data-testid="atlas-tour-activity"
-    >
-      {stats.summary ? (
-        <Strip stats={stats} summary={stats.summary} onOpen={() => setOpen(true)} />
-      ) : (
-        <div className="flex items-center px-6 py-5">
-          <ActivityStatusLine stats={stats} />
-        </div>
-      )}
-      <TourActivityStatsDialog stats={stats} open={open} onClose={() => setOpen(false)} />
-    </div>
-  );
-}
@@ -1,159 +0,0 @@
-import type { TourActivityStatsEntry } from '@trek/shared';
-import { Ban, Briefcase, CalendarDays, Footprints, Loader2, Repeat, RotateCcw } from 'lucide-react';
-import { useNavigate } from 'react-router';
-import { useTranslation } from '../../../i18n';
-import { formatDate } from '../../../utils/formatters';
-import { formatDistance, formatElevation } from '../../../utils/units';
-import { SoftPill, WhiteBadge } from '../../Planner/planParts';
-import { fs } from '../../shared/DialogShell';
-import { Tooltip } from '../../shared/Tooltip';
-import { EntryTile, MeasurePills } from './tourActivityParts';
-import { useDistanceUnit } from './tourActivityReading';
-
-const ROW_BADGE_ICON = 'flex-none text-content-faint';
-
-/** What the entry's values rest on, as a pill: the plan, or the track that replaced it, named in the tooltip. */
-function BasisPill({ entry }: { entry: TourActivityStatsEntry }) {
-  const { t } = useTranslation();
-  const track = entry.basis === 'track';
-  const hint = track
-    ? t('tours.stats.basisTrackHint', { name: entry.track?.name ?? '' })
-    : t('tours.stats.basisPlanHint');
-  return (
-    <Tooltip label={hint}>
-      <span
-        className="inline-flex"
-        aria-label={hint}
-        data-testid={`tour-activity-basis-${entry.basis}-${entry.place_id}`}
-      >
-        <SoftPill
-          tone={track ? 'success' : 'neutral'}
-          icon={
-            track ? (
-              <Footprints size={10} strokeWidth={2.2} className="flex-none" />
-            ) : (
-              <CalendarDays size={10} strokeWidth={2.2} className={ROW_BADGE_ICON} />
-            )
-          }
-        >
-          {t(track ? 'tours.stats.basisTrack' : 'tours.stats.basisPlan')}
-        </SoftPill>
-      </span>
-    </Tooltip>
-  );
-}
-
-/** The day it counts on, the trip it is in (a way into that trip), and how many days the plan has it on. */
-function EntryFacts({ entry }: { entry: TourActivityStatsEntry }) {
-  const { t, locale } = useTranslation();
-  const navigate = useNavigate();
-  return (
-    <span className="mt-1 flex min-w-0 flex-wrap items-center gap-1">
-      <WhiteBadge icon={<CalendarDays size={10} strokeWidth={2.2} className={ROW_BADGE_ICON} />}>
-        {formatDate(entry.date, locale) ?? entry.date}
-      </WhiteBadge>
-      <Tooltip label={t('tours.stats.openTrip')}>
-        <button
-          type="button"
-          onClick={() => void navigate(`/trips/${entry.trip.id}`)}
-          className="inline-flex min-w-0 max-w-[220px] rounded-full transition-opacity hover:opacity-75 focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
-        >
-          <WhiteBadge
-            className="min-w-0 max-w-full"
-            icon={<Briefcase size={10} strokeWidth={2.2} className={ROW_BADGE_ICON} />}
-          >
-            <span className="truncate">{entry.trip.title}</span>
-          </WhiteBadge>
-        </button>
-      </Tooltip>
-      {entry.day_count > 1 && (
-        <Tooltip label={t('tours.stats.multiDayHint')}>
-          <span className="inline-flex" aria-label={t('tours.stats.multiDayHint')}>
-            <WhiteBadge icon={<Repeat size={10} strokeWidth={2.2} className={ROW_BADGE_ICON} />}>
-              {entry.day_count}
-            </WhiteBadge>
-          </span>
-        </Tooltip>
-      )}
-      <BasisPill entry={entry} />
-      {entry.excluded && <SoftPill caps>{t('tours.stats.excluded')}</SoftPill>}
-    </span>
-  );
-}
-
-/** The round button that leaves the tour out, or counts it again; named by its tooltip. */
-function ExcludeToggle({
-  entry,
-  busy,
-  onToggle,
-}: {
-  entry: TourActivityStatsEntry;
-  busy: boolean;
-  onToggle: () => void;
-}) {
-  const { t } = useTranslation();
-  const label = entry.excluded ? t('tours.stats.include') : t('tours.stats.exclude');
-  const hint = entry.excluded ? label : `${label}: ${t('tours.stats.excludeHint')}`;
-  let icon = <Ban size={14} strokeWidth={2} />;
-  if (busy) icon = <Loader2 size={14} strokeWidth={2} className="animate-spin" />;
-  else if (entry.excluded) icon = <RotateCcw size={14} strokeWidth={2} />;
-  return (
-    <Tooltip label={hint}>
-      <button
-        type="button"
-        onClick={onToggle}
-        disabled={busy}
-        aria-label={label}
-        aria-pressed={entry.excluded}
-        data-testid={`tour-activity-toggle-${entry.place_id}`}
-        className="grid h-8 w-8 flex-none place-items-center rounded-full bg-surface-card text-content-muted shadow-sm ring-1 ring-inset ring-edge-faint transition-colors hover:text-content focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent disabled:cursor-default disabled:opacity-50"
-      >
-        {icon}
-      </button>
-    </Tooltip>
-  );
-}
-
-/**
- * STA-02: one tour of the user's activities: its type, name and where it
- * counts, its distance and climb, and the switch to leave it out. A tour left
- * out stays in the list, dimmed, so it can be counted again in place.
- */
-export function TourActivityEntryRow({
-  entry,
-  busy,
-  onToggleExcluded,
-}: {
-  entry: TourActivityStatsEntry;
-  busy: boolean;
-  onToggleExcluded: (entry: TourActivityStatsEntry) => void;
-}) {
-  const unit = useDistanceUnit();
-  const key = entry.track ? `${entry.place_id}-${entry.track.place_id}` : String(entry.place_id);
-  return (
-    <li
-      data-testid={`tour-activity-row-${key}`}
-      className="flex min-w-0 items-center gap-3 rounded-[12px] px-2.5 py-2 transition-colors hover:bg-surface-hover"
-    >
-      <span
-        className={`flex min-w-0 flex-1 items-center gap-3 transition-opacity ${entry.excluded ? 'opacity-50' : ''}`}
-      >
-        <EntryTile entry={entry} />
-        <span className="min-w-0 flex-1">
-          <span className="block truncate font-semibold text-content" style={fs(13, 'body')}>
-            {entry.name}
-          </span>
-          <EntryFacts entry={entry} />
-        </span>
-        <span className="flex flex-none flex-col items-end gap-1">
-          <MeasurePills
-            distance={entry.distance_km === null ? null : formatDistance(entry.distance_km, unit)}
-            ascent={entry.ascent_m === null ? null : formatElevation(entry.ascent_m, unit)}
-            testId={`tour-activity-${key}`}
-          />
-        </span>
-      </span>
-      <ExcludeToggle entry={entry} busy={busy} onToggle={() => onToggleExcluded(entry)} />
-    </li>
-  );
-}
@@ -1,177 +0,0 @@
-// FE-STA2-DIALOG-001 to FE-STA2-DIALOG-008
-// STA-02: the full list of the user's tour activities: the sums with what they
-// rest on, the split by type, each tour with its basis and a switch to leave it
-// out (dimmed, never hidden), and the way into its trip.
-import userEvent from '@testing-library/user-event';
-import { summarizeTourActivities, type TourActivityStatsEntry, type TourActivityStatsResponse } from '@trek/shared';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { buildSettings } from '../../../../tests/helpers/factories';
-import { render, screen, within } from '../../../../tests/helpers/render';
-import { resetAllStores, seedStore } from '../../../../tests/helpers/store';
-import { useSettingsStore } from '../../../store/settingsStore';
-import { TourActivityStatsDialog } from './TourActivityStatsDialog';
-import type { TourActivityStats } from './useTourActivityStats';
-
-const navigate = vi.hoisted(() => vi.fn());
-vi.mock('react-router', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('react-router')>()),
-  useNavigate: () => navigate,
-}));
-
-const TODAY = '2026-10-20';
-
-function entry(overrides: Partial<TourActivityStatsEntry> = {}): TourActivityStatsEntry {
-  return {
-    place_id: 1,
-    name: 'Ridge',
-    tour_type: 'hike',
-    trip: { id: 5, title: 'Alps' },
-    derived_from_place_id: null,
-    date: '2026-07-02',
-    basis: 'plan',
-    track: null,
-    day_count: 1,
-    distance_km: 12,
-    ascent_m: 800,
-    descent_m: 790,
-    excluded: false,
-    ...overrides,
-  };
-}
-
-function statsOf(
-  data: TourActivityStatsResponse | null,
-  overrides: Partial<TourActivityStats> = {}
-): TourActivityStats {
-  return {
-    status: data ? 'ready' : 'loading',
-    data,
-    summary: data ? summarizeTourActivities(data.entries, { today: TODAY }) : null,
-    period: 'all',
-    setPeriod: vi.fn(),
-    periods: ['all', 'thisYear', 'last12'],
-    type: 'all',
-    setType: vi.fn(),
-    types: ['all', 'hike', 'kayak'],
-    pending: new Set(),
-    setExcluded: vi.fn().mockResolvedValue(undefined),
-    retry: vi.fn(),
-    ...overrides,
-  };
-}
-
-const data: TourActivityStatsResponse = {
-  entries: [
-    entry(),
-    entry({
-      place_id: 2,
-      name: 'Lake',
-      tour_type: 'kayak',
-      date: '2026-08-01',
-      basis: 'track',
-      track: { place_id: 9, name: 'Watch export' },
-      distance_km: 8.5,
-      ascent_m: null,
-      descent_m: null,
-    }),
-    entry({ place_id: 3, name: 'Long trail', date: '2026-06-01', day_count: 3, distance_km: null }),
-    entry({ place_id: 4, name: 'Rained off', date: '2026-05-01', excluded: true }),
-    entry({ place_id: 5, name: 'Next week', date: '2026-10-27' }),
-  ],
-  uncounted: { unassigned: 2, undated: 0 },
-};
-
-beforeEach(() => {
-  resetAllStores();
-  vi.clearAllMocks();
-  seedStore(useSettingsStore, { settings: buildSettings({ distance_unit: 'metric' }) });
-});
-
-describe('TourActivityStatsDialog', () => {
-  it('FE-STA2-DIALOG-001: shows the sums, at least where a tour lacks the distance, and what they rest on', () => {
-    render(<TourActivityStatsDialog stats={statsOf(data)} open onClose={vi.fn()} />);
-    expect(screen.getByRole('heading', { name: 'My tour activities' })).toBeInTheDocument();
-    expect(screen.getByText('≥ 20.5 km')).toBeInTheDocument();
-    expect(screen.getByTestId('tour-activity-basis-plan')).toHaveTextContent('2');
-    expect(screen.getByTestId('tour-activity-basis-track')).toHaveTextContent('1');
-    expect(screen.getByTestId('tour-activity-upcoming')).toHaveTextContent('1');
-    expect(screen.getByTestId('tour-activity-unassigned')).toHaveTextContent('2');
-    expect(screen.queryByTestId('tour-activity-undated')).not.toBeInTheDocument();
-  });
-
-  it('FE-STA2-DIALOG-002: splits by type, the count at the corner of each type', () => {
-    render(<TourActivityStatsDialog stats={statsOf(data)} open onClose={vi.fn()} />);
-    expect(within(screen.getByTestId('tour-activity-type-hike')).getByText('2')).toBeInTheDocument();
-    expect(screen.getByTestId('tour-activity-type-kayak-distance')).toHaveTextContent('8.5 km');
-    expect(screen.queryByTestId('tour-activity-type-kayak-ascent')).not.toBeInTheDocument();
-  });
-
-  it('FE-STA2-DIALOG-003: lists every done tour, newest first, with its basis; the one ahead is not there', () => {
-    render(<TourActivityStatsDialog stats={statsOf(data)} open onClose={vi.fn()} />);
-    const list = screen.getByTestId('tour-activity-list');
-    expect(within(list).getAllByRole('listitem')).toHaveLength(4);
-    expect(screen.queryByText('Next week')).not.toBeInTheDocument();
-    expect(screen.getByTestId('tour-activity-row-2-9')).toHaveTextContent('Recorded');
-    expect(screen.getByTestId('tour-activity-track-corner')).toBeInTheDocument();
-    expect(screen.getByTestId('tour-activity-row-1')).toHaveTextContent('Planned');
-    expect(
-      within(screen.getByTestId('tour-activity-row-3')).getByLabelText('Planned on several days, counted once')
-    ).toHaveTextContent('3');
-    expect(screen.queryByTestId('tour-activity-3-distance')).not.toBeInTheDocument();
-  });
-
-  it('FE-STA2-DIALOG-004: a tour left out stays listed and can be counted again, a counted one left out', async () => {
-    const stats = statsOf(data);
-    const user = userEvent.setup();
-    render(<TourActivityStatsDialog stats={stats} open onClose={vi.fn()} />);
-    expect(screen.getByTestId('tour-activity-row-4')).toHaveTextContent('Left out');
-    await user.click(screen.getByRole('button', { name: 'Count again' }));
-    expect(stats.setExcluded).toHaveBeenCalledWith(expect.objectContaining({ place_id: 4 }), false);
-    await user.click(within(screen.getByTestId('tour-activity-row-1')).getByRole('button', { name: 'Leave out' }));
-    expect(stats.setExcluded).toHaveBeenCalledWith(expect.objectContaining({ place_id: 1 }), true);
-  });
-
-  it('FE-STA2-DIALOG-005: a tour on its way to the server cannot be switched twice', () => {
-    render(<TourActivityStatsDialog stats={statsOf(data, { pending: new Set([1]) })} open onClose={vi.fn()} />);
-    expect(screen.getByTestId('tour-activity-toggle-1')).toBeDisabled();
-  });
-
-  it('FE-STA2-DIALOG-006: the trip of a tour opens from its badge', async () => {
-    const user = userEvent.setup();
-    render(<TourActivityStatsDialog stats={statsOf(data)} open onClose={vi.fn()} />);
-    await user.click(within(screen.getByTestId('tour-activity-row-1')).getByText('Alps'));
-    expect(navigate).toHaveBeenCalledWith('/trips/5');
-  });
-
-  it('FE-STA2-DIALOG-007: the filters sit on the head band and change period and type', async () => {
-    const stats = statsOf(data);
-    const user = userEvent.setup();
-    render(<TourActivityStatsDialog stats={stats} open onClose={vi.fn()} />);
-    await user.click(screen.getByRole('button', { name: /Period/ }));
-    await user.click(screen.getByRole('button', { name: 'This year' }));
-    expect(stats.setPeriod).toHaveBeenCalledWith('thisYear');
-    await user.click(screen.getByRole('button', { name: /Type/ }));
-    await user.click(screen.getByRole('button', { name: 'Paddle tour' }));
-    expect(stats.setType).toHaveBeenCalledWith('kayak');
-  });
-
-  it('FE-STA2-DIALOG-008: before the read, while empty, and closed', async () => {
-    const onClose = vi.fn();
-    const user = userEvent.setup();
-    const { rerender } = render(<TourActivityStatsDialog stats={statsOf(null)} open onClose={onClose} />);
-    expect(screen.getByRole('status')).toHaveTextContent('Loading');
-    rerender(
-      <TourActivityStatsDialog
-        stats={statsOf({ entries: [], uncounted: { unassigned: 0, undated: 0 } })}
-        open
-        onClose={onClose}
-      />
-    );
-    expect(screen.getByText('No completed tours yet')).toBeInTheDocument();
-    const [closeButton] = screen.getAllByRole('button', { name: 'Close' });
-    await user.click(closeButton as HTMLElement);
-    expect(onClose).toHaveBeenCalled();
-    rerender(<TourActivityStatsDialog stats={statsOf(null)} open={false} onClose={onClose} />);
-    expect(screen.queryByText('My tour activities')).not.toBeInTheDocument();
-  });
-});
@@ -1,181 +0,0 @@
-import type { TourActivityTotals, TourTypeKey } from '@trek/shared';
-import { Footprints } from 'lucide-react';
-import { createElement, useId } from 'react';
-import { useTranslation } from '../../../i18n';
-import type { DistanceUnit } from '../../../types';
-import {
-  DialogButton,
-  DialogFooter,
-  DialogHeader,
-  DialogSection,
-  DialogShell,
-  DialogTile,
-  FooterSpacer,
-  fs,
-  NEUTRAL_TINT,
-} from '../../shared/DialogShell';
-import { InfoDot, TourFactFields, type TourMetricField } from '../../Tours/tourParts';
-import { TourActivityEntryRow } from './TourActivityEntryRow';
-import { ActivityFilters, ActivityStatusLine, BasisBadges, MeasurePills, UncountedBadges } from './tourActivityParts';
-import { distanceReading, heightReading, partialHint, typeIcon, useDistanceUnit } from './tourActivityReading';
-import type { TourActivityStats } from './useTourActivityStats';
-
-type Translate = (key: string, params?: Record<string, unknown>) => string;
-
-/** The sums as labelled fields; a sum nobody knows is left out, a short one says at least and why. */
-function totalFields(totals: TourActivityTotals, unit: DistanceUnit, t: Translate): TourMetricField[] {
-  const fields: TourMetricField[] = [{ label: t('tours.mode.tours'), value: String(totals.count) }];
-  const sums = [
-    { label: t('tours.detail.distance'), sum: totals.distanceKm, reading: distanceReading(totals, unit) },
-    { label: t('tours.detail.ascent'), sum: totals.ascentM, reading: heightReading(totals.ascentM, unit) },
-    { label: t('tours.detail.descent'), sum: totals.descentM, reading: heightReading(totals.descentM, unit) },
-  ];
-  for (const { label, sum, reading } of sums) {
-    if (!reading) continue;
-    const info = reading.partial ? { label, description: partialHint(sum, t) } : undefined;
-    fields.push({ label, value: reading.text, info });
-  }
-  return fields;
-}
-
-/** One type of the period: its icon with how many tours at the corner, its name, its distance and climb. */
-function TypeLine({ type, totals }: { type: TourTypeKey; totals: TourActivityTotals }) {
-  const { t } = useTranslation();
-  const unit = useDistanceUnit();
-  const distance = distanceReading(totals, unit);
-  const ascent = heightReading(totals.ascentM, unit);
-  return (
-    <li className="flex min-w-0 items-center gap-3 py-1" data-testid={`tour-activity-type-${type}`}>
-      <span className="relative flex-none">
-        <span className="grid h-[30px] w-[30px] place-items-center rounded-full bg-edge text-content-secondary">
-          {createElement(typeIcon(type), { size: 14, strokeWidth: 1.9 })}
-        </span>
-        <span
-          aria-hidden="true"
-          className="absolute -end-1.5 -top-1.5 grid h-4 min-w-4 place-items-center rounded-full bg-surface-card px-1 font-geist font-semibold tabular-nums text-content shadow-sm ring-1 ring-edge-faint"
-          style={fs(9)}
-        >
-          {totals.count}
-        </span>
-      </span>
-      <span className="min-w-0 flex-1 truncate font-semibold text-content" style={fs(12.5, 'body')}>
-        {t(`tourTypes.${type}`)}
-        <span className="sr-only">{`: ${t('tours.mode.tours')} ${totals.count}`}</span>
-      </span>
-      <span className="flex flex-none items-center gap-1.5">
-        <MeasurePills
-          distance={distance?.text ?? null}
-          ascent={ascent?.text ?? null}
-          testId={`tour-activity-type-${type}`}
-        />
-      </span>
-    </li>
-  );
-}
-
-/** The sums, what they rest on, the split by type, and every tour of the period with its switch. */
-function StatsBody({ stats }: { stats: TourActivityStats }) {
-  const { t } = useTranslation();
-  const unit = useDistanceUnit();
-  const { summary, data } = stats;
-  if (!summary || !data) return <ActivityStatusLine stats={stats} />;
-  const showTypes = stats.type === 'all' && summary.types.length > 1;
-  return (
-    <>
-      <div className="flex flex-col gap-2.5">
-        <TourFactFields fields={totalFields(summary.totals, unit, t)} />
-        <div className="flex flex-wrap items-center gap-1.5">
-          <BasisBadges byBasis={summary.totals.byBasis} />
-          <UncountedBadges upcoming={summary.upcoming} {...data.uncounted} />
-          <InfoDot label={t('tours.stats.title')} description={t('tours.stats.basisInfo')} />
-        </div>
-      </div>
-      {showTypes && (
-        <DialogSection label={t('tours.stats.byType')}>
-          <ul className="m-0 flex list-none flex-col gap-1 p-0">
-            {summary.types.map(({ type, ...totals }) => (
-              <TypeLine key={type} type={type} totals={totals} />
-            ))}
-          </ul>
-        </DialogSection>
-      )}
-      <DialogSection
-        label={t('tours.mode.tours')}
-        action={
-          <span className="font-geist tabular-nums text-content-faint" style={fs(11)}>
-            {summary.done.length}
-          </span>
-        }
-      >
-        {summary.done.length === 0 ? (
-          <p className="m-0 py-4 text-center text-content-muted" style={fs(12.5, 'body')}>
-            {t(data.entries.length === 0 ? 'tours.stats.empty' : 'tours.stats.none')}
-          </p>
-        ) : (
-          <ul className="-mx-2.5 my-0 flex list-none flex-col gap-0.5 p-0" data-testid="tour-activity-list">
-            {summary.done.map((entry) => (
-              <TourActivityEntryRow
-                key={entry.track ? `${entry.place_id}-${entry.track.place_id}` : entry.place_id}
-                entry={entry}
-                busy={stats.pending.has(entry.place_id)}
-                onToggleExcluded={(target) => void stats.setExcluded(target, !target.excluded)}
-              />
-            ))}
-          </ul>
-        )}
-      </DialogSection>
-    </>
-  );
-}
-
-/**
- * STA-02: the user's tour activities in full, opened from the Atlas: the
- * period and type on the head band, the sums with what they rest on, the
- * split by type, and every tour done in the period, each one able to be left
- * out (a tour that fell through) and counted again without touching its plan.
- */
-export function TourActivityStatsDialog({
-  stats,
-  open,
-  onClose,
-}: {
-  stats: TourActivityStats;
-  open: boolean;
-  onClose: () => void;
-}) {
-  const { t } = useTranslation();
-  const labelId = useId();
-  return (
-    <DialogShell
-      open={open}
-      onClose={onClose}
-      labelledBy={labelId}
-      width="editor"
-      align="top"
-      header={
-        <DialogHeader
-          tile={
-            <DialogTile>
-              <Footprints size={20} strokeWidth={2} className="text-content" />
-            </DialogTile>
-          }
-          tint={NEUTRAL_TINT}
-          labelId={labelId}
-          onClose={onClose}
-          title={t('tours.stats.title')}
-          sub={t('tours.stats.sub')}
-          subWraps
-          pills={<ActivityFilters stats={stats} />}
-        />
-      }
-      footer={
-        <DialogFooter>
-          <FooterSpacer />
-          <DialogButton onClick={onClose}>{t('common.close')}</DialogButton>
-        </DialogFooter>
-      }
-    >
-      <StatsBody stats={stats} />
-    </DialogShell>
-  );
-}
@@ -1,232 +0,0 @@
-import type { TourActivityBasis, TourActivityStatsEntry } from '@trek/shared';
-import {
-  AlertTriangle,
-  ArrowUp,
-  CalendarClock,
-  CalendarDays,
-  CalendarRange,
-  Footprints,
-  Loader2,
-  Ruler,
-  WifiOff,
-} from 'lucide-react';
-import { createElement } from 'react';
-import { useTranslation } from '../../../i18n';
-import { PillSelect } from '../../shared/dialogParts';
-import { fs } from '../../shared/DialogShell';
-import { Tooltip } from '../../shared/Tooltip';
-import { FigureBadge } from '../../Tours/paddle/FigureBadge';
-import { TourDayRowPill } from '../../Tours/TourDayRowFacts';
-import { tourDayRowIcon } from '../../Tours/tourDayRowIcon';
-import { typeIcon, typeLabel, type Translate } from './tourActivityReading';
-import { periodYear, type ActivityPeriod, type ActivityType } from './tourActivityStatsModel';
-import type { TourActivityStats } from './useTourActivityStats';
-
-/** What a period is called in the filter. */
-function periodLabel(period: ActivityPeriod, t: Translate): string {
-  if (period === 'all') return t('tours.stats.period.all');
-  if (period === 'thisYear') return t('tours.stats.period.thisYear');
-  if (period === 'last12') return t('tours.stats.period.last12');
-  return String(periodYear(period));
-}
-
-/** The period and type filters, as head band pills or quiet ones in a panel. */
-export function ActivityFilters({ stats, quiet = false }: { stats: TourActivityStats; quiet?: boolean }) {
-  const { t } = useTranslation();
-  const typeOption = (type: ActivityType) => ({
-    value: type,
-    label: typeLabel(type, t),
-    icon: createElement(typeIcon(type), { size: 12, strokeWidth: 2.2, className: 'flex-none text-content-muted' }),
-  });
-  return (
-    <>
-      <PillSelect
-        quiet={quiet}
-        label={t('tours.stats.period')}
-        value={stats.period}
-        options={stats.periods.map((period) => ({
-          value: period,
-          label: periodLabel(period, t),
-          icon: <CalendarRange size={12} strokeWidth={2.2} className="flex-none text-content-muted" />,
-        }))}
-        fallback={{ label: periodLabel(stats.period, t) }}
-        onChange={stats.setPeriod}
-      />
-      <PillSelect
-        quiet={quiet}
-        label={t('tours.filter.type')}
-        value={stats.type}
-        options={stats.types.map(typeOption)}
-        fallback={typeOption(stats.type)}
-        onChange={stats.setType}
-      />
-    </>
-  );
-}
-
-/** A distance and a climb as white badges, each named in full by its tooltip; one not known is left out. */
-export function MeasurePills({
-  distance,
-  ascent,
-  testId,
-}: {
-  distance: string | null;
-  ascent: string | null;
-  /** Prefix of the badges' test ids: `<testId>-distance`, `<testId>-ascent`. */
-  testId: string;
-}) {
-  const { t } = useTranslation();
-  return (
-    <>
-      {distance !== null && (
-        <TourDayRowPill
-          icon={Ruler}
-          value={distance}
-          label={`${t('tours.detail.distance')}: ${distance}`}
-          testId={`${testId}-distance`}
-        />
-      )}
-      {ascent !== null && (
-        <TourDayRowPill
-          icon={ArrowUp}
-          value={ascent}
-          label={`${t('tours.detail.ascent')}: ${ascent}`}
-          testId={`${testId}-ascent`}
-        />
-      )}
-    </>
-  );
-}
-
-/**
- * What the sums rest on, each as a figure badge: how many tours count with
- * their planned values and how many with a recorded track. The planned values
- * are never passed off as measured, so they always say so.
- */
-export function BasisBadges({ byBasis }: { byBasis: Record<TourActivityBasis, number> }) {
-  const { t } = useTranslation();
-  return (
-    <>
-      {byBasis.plan > 0 && (
-        <FigureBadge
-          testId="tour-activity-basis-plan"
-          label={t('tours.stats.basisPlan')}
-          value={String(byBasis.plan)}
-          icon={<CalendarDays size={10} strokeWidth={2.2} className="flex-none text-content-faint" />}
-          info={t('tours.stats.basisPlanHint')}
-        />
-      )}
-      {byBasis.track > 0 && (
-        <FigureBadge
-          testId="tour-activity-basis-track"
-          label={t('tours.stats.basisTrack')}
-          value={String(byBasis.track)}
-          icon={<Footprints size={10} strokeWidth={2.2} className="flex-none text-success" />}
-          info={t('tours.stats.basisTrackCountHint')}
-        />
-      )}
-    </>
-  );
-}
-
-/** What does not count, said as quiet figure badges: tours still ahead, on no day, on days without a date. */
-export function UncountedBadges({
-  upcoming,
-  unassigned,
-  undated,
-}: {
-  upcoming: number;
-  unassigned: number;
-  undated: number;
-}) {
-  const { t } = useTranslation();
-  const badges = [
-    { key: 'upcoming', value: upcoming, labelKey: 'tours.stats.upcoming', infoKey: 'tours.stats.upcomingHint' },
-    {
-      key: 'unassigned',
-      value: unassigned,
-      labelKey: 'tours.stats.unassigned',
-      infoKey: 'tours.stats.unassignedHint',
-    },
-    { key: 'undated', value: undated, labelKey: 'tours.stats.undated', infoKey: 'tours.stats.undatedHint' },
-  ];
-  return (
-    <>
-      {badges
-        .filter((badge) => badge.value > 0)
-        .map((badge) => (
-          <FigureBadge
-            key={badge.key}
-            testId={`tour-activity-${badge.key}`}
-            label={t(badge.labelKey)}
-            value={String(badge.value)}
-            icon={<CalendarClock size={10} strokeWidth={2.2} className="flex-none text-content-faint" />}
-            info={t(badge.infoKey)}
-          />
-        ))}
-    </>
-  );
-}
-
-/**
- * A tour's type as a round tile; a tour done with a recorded track carries
- * the footprints at its corner, the way a waypoint's number carries its kind.
- */
-export function EntryTile({ entry }: { entry: Pick<TourActivityStatsEntry, 'tour_type' | 'basis'> }) {
-  const { t } = useTranslation();
-  return (
-    <Tooltip label={t(`tourTypes.${entry.tour_type}`)}>
-      <span className="relative flex-none" aria-label={t(`tourTypes.${entry.tour_type}`)}>
-        <span className="grid h-[34px] w-[34px] place-items-center rounded-full bg-edge text-content-secondary">
-          {createElement(tourDayRowIcon(entry.tour_type), { size: 15, strokeWidth: 1.9 })}
-        </span>
-        {entry.basis === 'track' && (
-          <span
-            aria-hidden="true"
-            data-testid="tour-activity-track-corner"
-            className="absolute -bottom-1 -end-1 grid h-4 w-4 place-items-center rounded-full bg-success-soft text-success ring-2 ring-surface-card"
-          >
-            <Footprints size={9} strokeWidth={2.6} />
-          </span>
-        )}
-      </span>
-    </Tooltip>
-  );
-}
-
-/**
- * Where the read stands while there is nothing to show yet: on its way, refused
- * offline, or failed with a way to try again.
- */
-export function ActivityStatusLine({ stats }: { stats: Pick<TourActivityStats, 'status' | 'retry'> }) {
-  const { t } = useTranslation();
-  // Not asked yet: the tab has not been shown, so there is nothing to say.
-  if (stats.status === 'idle') return null;
-  if (stats.status === 'offline')
-    return (
-      <p className="m-0 flex items-center gap-2 text-content-muted" style={fs(12, 'body')}>
-        <WifiOff size={13} strokeWidth={2} className="flex-none" />
-        {t('common.needsConnection')}
-      </p>
-    );
-  if (stats.status === 'error')
-    return (
-      <p role="alert" className="m-0 flex flex-wrap items-center gap-2 text-content-muted" style={fs(12, 'body')}>
-        <AlertTriangle size={13} strokeWidth={2} className="flex-none text-warning" />
-        {t('tours.stats.unavailable')}
-        <button
-          type="button"
-          onClick={stats.retry}
-          className="font-semibold text-content underline underline-offset-2 focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
-        >
-          {t('common.errorRetry')}
-        </button>
-      </p>
-    );
-  return (
-    <p role="status" className="m-0 flex items-center gap-2 text-content-faint" style={fs(12, 'body')}>
-      <Loader2 size={13} strokeWidth={2.2} className="flex-none animate-spin" />
-      {t('common.loading')}
-    </p>
-  );
-}
@@ -1,39 +0,0 @@
-import type { TourActivityTotals } from '@trek/shared';
-import { Layers, type LucideIcon } from 'lucide-react';
-import { useSettingsStore } from '../../../store/settingsStore';
-import type { DistanceUnit } from '../../../types';
-import { formatDistance, formatElevation } from '../../../utils/units';
-import { tourDayRowIcon } from '../../Tours/tourDayRowIcon';
-import { sumReading, type ActivityType } from './tourActivityStatsModel';
-
-export type Translate = (key: string, params?: Record<string, unknown>) => string;
-
-/** The distance unit the user reads in. */
-export function useDistanceUnit(): DistanceUnit {
-  return useSettingsStore((state) => state.settings.distance_unit) ?? 'metric';
-}
-
-/** What a type is called in the filter. */
-export function typeLabel(type: ActivityType, t: Translate): string {
-  return type === 'all' ? t('tours.stats.allTypes') : t(`tourTypes.${type}`);
-}
-
-/** The icon a type is drawn with; every type at once is a stack. */
-export function typeIcon(type: ActivityType): LucideIcon {
-  return type === 'all' ? Layers : tourDayRowIcon(type);
-}
-
-/** A distance as said, at least that much when some tours do not know theirs; null when none does. */
-export function distanceReading(totals: Pick<TourActivityTotals, 'distanceKm'>, unit: DistanceUnit) {
-  return sumReading(totals.distanceKm, (km) => formatDistance(km, unit));
-}
-
-/** A height sum as said, the same way. */
-export function heightReading(sum: TourActivityTotals['ascentM'], unit: DistanceUnit) {
-  return sumReading(sum, (metres) => formatElevation(metres, unit));
-}
-
-/** How a short sum explains itself: known for some of the tours only. */
-export function partialHint(sum: TourActivityTotals['distanceKm'], t: Translate): string {
-  return t('tours.scope.partialBody', { known: sum.known, of: sum.of });
-}
@@ -1,97 +0,0 @@
-// FE-STA2-MODEL-001 to FE-STA2-MODEL-007
-// STA-02: the periods and types the Atlas offers for the user's tour
-// activities, and how a sum reads when some tours do not know the value.
-import type { TourActivityStatsEntry } from '@trek/shared';
-import { describe, expect, it } from 'vitest';
-import {
-  periodOptions,
-  periodRange,
-  periodYear,
-  splitMeasure,
-  sumReading,
-  typeOptions,
-} from './tourActivityStatsModel';
-
-const TODAY = '2026-10-20';
-
-function entry(overrides: Partial<TourActivityStatsEntry> = {}): TourActivityStatsEntry {
-  return {
-    place_id: 1,
-    name: 'Ridge',
-    tour_type: 'hike',
-    trip: { id: 5, title: 'Alps' },
-    derived_from_place_id: null,
-    date: '2026-07-02',
-    basis: 'plan',
-    track: null,
-    day_count: 1,
-    distance_km: 10,
-    ascent_m: 500,
-    descent_m: 400,
-    excluded: false,
-    ...overrides,
-  };
-}
-
-describe('tourActivityStatsModel', () => {
-  it('FE-STA2-MODEL-001: each period covers its days, both ends included', () => {
-    expect(periodRange('all', TODAY)).toEqual({ from: null, to: null });
-    expect(periodRange('thisYear', TODAY)).toEqual({ from: '2026-01-01', to: '2026-12-31' });
-    expect(periodRange('last12', TODAY)).toEqual({ from: '2025-10-20', to: TODAY });
-    expect(periodRange('year:2024', TODAY)).toEqual({ from: '2024-01-01', to: '2024-12-31' });
-  });
-
-  it('FE-STA2-MODEL-002: offers the earlier years a done tour is in, the newest first, and no empty one', () => {
-    const entries = [
-      entry({ date: '2023-05-01' }),
-      entry({ date: '2025-08-01' }),
-      entry({ date: '2025-09-01' }),
-      entry({ date: '2026-03-01' }),
-    ];
-    expect(periodOptions(entries, TODAY)).toEqual(['all', 'thisYear', 'last12', 'year:2025', 'year:2023']);
-    expect(periodOptions([], TODAY)).toEqual(['all', 'thisYear', 'last12']);
-  });
-
-  it('FE-STA2-MODEL-003: offers the types of done tours only, in planning order, older types after them', () => {
-    const entries = [
-      entry({ tour_type: 'kayak' }),
-      entry({ tour_type: 'run' }),
-      entry({ tour_type: 'hike' }),
-      entry({ tour_type: 'bike', date: '2026-12-01' }),
-    ];
-    expect(typeOptions(entries, TODAY)).toEqual(['all', 'hike', 'run', 'kayak']);
-  });
-
-  it('FE-STA2-MODEL-004: reads the year of a year period only', () => {
-    expect(periodYear('year:2024')).toBe(2024);
-    expect(periodYear('thisYear')).toBeNull();
-  });
-
-  it('FE-STA2-MODEL-005: a sum nobody knows says nothing, a short one says at least', () => {
-    const km = (value: number) => `${value} km`;
-    expect(sumReading({ value: null, known: 0, of: 2 }, km)).toBeNull();
-    expect(sumReading({ value: 12, known: 2, of: 2 }, km)).toEqual({ text: '12 km', partial: false });
-    expect(sumReading({ value: 12, known: 1, of: 2 }, km)).toEqual({ text: '≥ 12 km', partial: true });
-  });
-
-  it('FE-STA2-MODEL-006: splits a measure into its number and unit', () => {
-    expect(splitMeasure('128.4 km')).toEqual({ value: '128.4', unit: 'km' });
-    expect(splitMeasure('≥ 12 km')).toEqual({ value: '≥ 12', unit: 'km' });
-    expect(splitMeasure('12')).toEqual({ value: '12', unit: '' });
-  });
-
-  it('FE-STA2-MODEL-007: a tour still ahead offers neither its year nor its type', () => {
-    expect(periodOptions([entry({ date: '2025-01-01' }), entry({ date: '2027-01-01' })], TODAY)).toEqual([
-      'all',
-      'thisYear',
-      'last12',
-      'year:2025',
-    ]);
-    expect(typeOptions([entry({ tour_type: 'walk', date: TODAY })], TODAY)).toEqual(['all']);
-  });
-
-  it('FE-STA2-MODEL-008: a planned ski tour is a type of its own, after the types planned before it', () => {
-    const entries = [entry({ tour_type: 'ski' }), entry({ tour_type: 'horse' }), entry({ tour_type: 'hike' })];
-    expect(typeOptions(entries, TODAY)).toEqual(['all', 'hike', 'horse', 'ski']);
-  });
-});
@@ -1,90 +0,0 @@
-import {
-  isTourActivityDone,
-  plannableTourTypeSchema,
-  type TourActivityStatsEntry,
-  type TourActivitySum,
-  type TourTypeKey,
-} from '@trek/shared';
-
-/**
- * STA-02: the periods and types the Atlas narrows the user's tour activities
- * by, and how a sum reads. Pure, so the hook and its views share one answer.
- */
-
-/** All time, the calendar year, the last twelve months, or one earlier year. */
-export type ActivityPeriod = 'all' | 'thisYear' | 'last12' | `year:${number}`;
-
-/** One type, or every type at once. */
-export type ActivityType = TourTypeKey | 'all';
-
-interface PeriodRange {
-  from: string | null;
-  to: string | null;
-}
-
-/** The days a period covers, both included, for `today` (YYYY-MM-DD in the user's own calendar). */
-export function periodRange(period: ActivityPeriod, today: string): PeriodRange {
-  const year = Number(today.slice(0, 4));
-  if (period === 'thisYear') return { from: `${year}-01-01`, to: `${year}-12-31` };
-  // A year back to the day, today included: the same day a year ago is the first one.
-  if (period === 'last12') return { from: `${year - 1}${today.slice(4)}`, to: today };
-  if (period.startsWith('year:')) {
-    const chosen = period.slice(5);
-    return { from: `${chosen}-01-01`, to: `${chosen}-12-31` };
-  }
-  return { from: null, to: null };
-}
-
-/**
- * The periods worth offering: all time, this year and the last twelve months,
- * then each earlier year a done tour is in, the newest first. A year without
- * a tour would only ever show nothing.
- */
-export function periodOptions(entries: readonly TourActivityStatsEntry[], today: string): ActivityPeriod[] {
-  const thisYear = today.slice(0, 4);
-  const years = new Set(
-    entries
-      .filter((entry) => isTourActivityDone(entry, today))
-      .map((entry) => entry.date.slice(0, 4))
-      .filter((year) => year < thisYear)
-  );
-  const earlier = [...years].sort((a, b) => b.localeCompare(a)).map((year): ActivityPeriod => `year:${Number(year)}`);
-  return ['all', 'thisYear', 'last12', ...earlier];
-}
-
-/** The types a done tour has, in the order tours are planned in, the older types after them. */
-export function typeOptions(entries: readonly TourActivityStatsEntry[], today: string): ActivityType[] {
-  const present = new Set(entries.filter((entry) => isTourActivityDone(entry, today)).map((entry) => entry.tour_type));
-  const planned: readonly string[] = plannableTourTypeSchema.options;
-  const ordered = [...present].sort((a, b) => rank(planned, a) - rank(planned, b) || a.localeCompare(b));
-  return ['all', ...ordered];
-}
-
-function rank(order: readonly string[], value: string): number {
-  const index = order.indexOf(value);
-  return index === -1 ? order.length : index;
-}
-
-/** The year of a `year:` period, or null for the others. */
-export function periodYear(period: ActivityPeriod): number | null {
-  return period.startsWith('year:') ? Number(period.slice(5)) : null;
-}
-
-/**
- * A sum as it is said: nothing when nobody knows the value, else the value,
- * marked as at least that much when some of the tours lack it.
- */
-export function sumReading(
-  sum: TourActivitySum,
-  format: (value: number) => string
-): { text: string; partial: boolean } | null {
-  if (sum.value === null) return null;
-  const partial = sum.known < sum.of;
-  return { text: partial ? `≥ ${format(sum.value)}` : format(sum.value), partial };
-}
-
-/** A formatted measure split into its number and its unit, so the number can stand large ("128.4", "km"). */
-export function splitMeasure(text: string): { value: string; unit: string } {
-  const at = text.lastIndexOf(' ');
-  return at === -1 ? { value: text, unit: '' } : { value: text.slice(0, at), unit: text.slice(at + 1) };
-}
@@ -1,226 +0,0 @@
-// FE-STA2-HOOK-001 to FE-STA2-HOOK-009
-// STA-02: the user's own tour activities are read when the tab is first shown,
-// narrowed by period and type, and a tour left out shows at once and comes back
-// with a message when the server refuses.
-import { act, renderHook, waitFor } from '@testing-library/react';
-import type { TourActivityStatsEntry, TourActivityStatsResponse } from '@trek/shared';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { useTourActivityStats } from './useTourActivityStats';
-
-const repo = vi.hoisted(() => ({ get: vi.fn(), setExcluded: vi.fn() }));
-const toast = vi.hoisted(() => ({ success: vi.fn(), error: vi.fn(), warning: vi.fn(), info: vi.fn() }));
-vi.mock('../../../repo/tourActivityStatsRepo', () => ({
-  tourActivityStatsRepo: repo,
-  TourActivityStatsOfflineError: class TourActivityStatsOfflineError extends Error {},
-}));
-vi.mock('../../shared/Toast', () => ({ useToast: () => toast }));
-
-function entry(overrides: Partial<TourActivityStatsEntry> = {}): TourActivityStatsEntry {
-  return {
-    place_id: 1,
-    name: 'Ridge',
-    tour_type: 'hike',
-    trip: { id: 5, title: 'Alps' },
-    derived_from_place_id: null,
-    date: '2026-07-02',
-    basis: 'plan',
-    track: null,
-    day_count: 1,
-    distance_km: 10,
-    ascent_m: 500,
-    descent_m: 400,
-    excluded: false,
-    ...overrides,
-  };
-}
-
-const stats: TourActivityStatsResponse = {
-  entries: [
-    entry(),
-    entry({ place_id: 2, name: 'Lake', tour_type: 'kayak', date: '2025-08-01', distance_km: 8 }),
-    entry({ place_id: 3, name: 'Summit', date: '2026-11-01' }),
-  ],
-  uncounted: { unassigned: 0, undated: 0 },
-};
-
-beforeEach(() => {
-  vi.clearAllMocks();
-  vi.useFakeTimers({ toFake: ['Date'] });
-  vi.setSystemTime(new Date(2026, 9, 20, 12));
-  repo.get.mockResolvedValue(stats);
-});
-afterEach(() => vi.useRealTimers());
-
-describe('useTourActivityStats', () => {
-  it('FE-STA2-HOOK-001: reads nothing until the tab is shown, then sums what is done', async () => {
-    const { result, rerender } = renderHook(({ active }) => useTourActivityStats(active), {
-      initialProps: { active: false },
-    });
-    expect(result.current.status).toBe('idle');
-    expect(repo.get).not.toHaveBeenCalled();
-
-    rerender({ active: true });
-    expect(result.current.status).toBe('loading');
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    expect(result.current.summary?.totals.count).toBe(2);
-    expect(result.current.summary?.totals.distanceKm.value).toBe(18);
-    expect(result.current.summary?.upcoming).toBe(1);
-    expect(result.current.periods).toEqual(['all', 'thisYear', 'last12', 'year:2025']);
-    expect(result.current.types).toEqual(['all', 'hike', 'kayak']);
-  });
-
-  it('FE-STA2-HOOK-002: narrows by period and by type', async () => {
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    act(() => result.current.setPeriod('thisYear'));
-    expect(result.current.summary?.done.map((item) => item.place_id)).toEqual([1]);
-    act(() => {
-      result.current.setPeriod('all');
-      result.current.setType('kayak');
-    });
-    expect(result.current.summary?.done.map((item) => item.place_id)).toEqual([2]);
-  });
-
-  it('FE-STA2-HOOK-003: offline and failed reads are told apart, and a retry reads again', async () => {
-    const { TourActivityStatsOfflineError } = await import('../../../repo/tourActivityStatsRepo');
-    repo.get.mockRejectedValueOnce(new TourActivityStatsOfflineError());
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('offline'));
-
-    repo.get.mockRejectedValueOnce(new Error('boom'));
-    act(() => result.current.retry());
-    expect(result.current.status).toBe('loading');
-    await waitFor(() => expect(result.current.status).toBe('error'));
-
-    act(() => result.current.retry());
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    expect(repo.get).toHaveBeenCalledTimes(3);
-  });
-
-  it('FE-STA2-HOOK-004: leaving a tour out shows at once and takes the server answer', async () => {
-    let answer: (value: TourActivityStatsResponse) => void = () => undefined;
-    repo.setExcluded.mockReturnValue(new Promise((resolve) => (answer = resolve)));
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-
-    let write: Promise<void> = Promise.resolve();
-    act(() => {
-      write = result.current.setExcluded(entry(), true);
-    });
-    expect(result.current.pending.has(1)).toBe(true);
-    expect(result.current.summary?.totals.count).toBe(1);
-    expect(repo.setExcluded).toHaveBeenCalledWith({ place_id: 1, excluded: true });
-
-    await act(async () => {
-      const entries = stats.entries.map((item) => (item.place_id === 1 ? { ...item, excluded: true } : item));
-      answer({ ...stats, entries });
-      await write;
-    });
-    expect(result.current.pending.size).toBe(0);
-    expect(result.current.summary?.done.find((item) => item.place_id === 1)?.excluded).toBe(true);
-    expect(toast.error).not.toHaveBeenCalled();
-  });
-
-  it('FE-STA2-HOOK-005: a refused exclusion counts the tour again and says so', async () => {
-    repo.setExcluded.mockRejectedValue(new Error('nope'));
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    await act(async () => {
-      await result.current.setExcluded(entry(), true);
-    });
-    expect(result.current.summary?.totals.count).toBe(2);
-    expect(result.current.pending.size).toBe(0);
-    expect(toast.error).toHaveBeenCalledWith('tours.stats.excludeFailed');
-  });
-
-  it('FE-STA2-HOOK-006: a read answered after the tab went away is dropped', async () => {
-    let answer: (value: TourActivityStatsResponse) => void = () => undefined;
-    repo.get.mockReturnValue(new Promise((resolve) => (answer = resolve)));
-    const { result, unmount } = renderHook(() => useTourActivityStats(true));
-    expect(result.current.status).toBe('loading');
-    unmount();
-    await act(async () => answer(stats));
-    expect(result.current.data).toBeNull();
-  });
-
-  it('FE-STA2-HOOK-007: a write before the first read leaves the empty state empty', async () => {
-    repo.get.mockReturnValue(new Promise(() => undefined));
-    repo.setExcluded.mockRejectedValue(new Error('offline'));
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await act(async () => {
-      await result.current.setExcluded(entry(), true);
-    });
-    expect(result.current.data).toBeNull();
-    expect(toast.error).toHaveBeenCalledTimes(1);
-  });
-
-  it('FE-STA2-HOOK-008: an older exclusion answered last never puts a newer one back', async () => {
-    const answers: Array<(value: TourActivityStatsResponse) => void> = [];
-    repo.setExcluded.mockImplementation(() => new Promise((resolve) => answers.push(resolve)));
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    const excludedOf = (placeId: number) =>
-      result.current.data?.entries.find((item) => item.place_id === placeId)?.excluded;
-    const withExcluded = (...ids: number[]) => ({
-      ...stats,
-      entries: stats.entries.map((item) => ({ ...item, excluded: ids.includes(item.place_id) })),
-    });
-
-    let first: Promise<void> = Promise.resolve();
-    let second: Promise<void> = Promise.resolve();
-    act(() => {
-      first = result.current.setExcluded(entry(), true);
-    });
-    act(() => {
-      second = result.current.setExcluded(stats.entries[1] as TourActivityStatsEntry, true);
-    });
-    // The second answer comes first and carries both; the first, from before the second, only its own.
-    await act(async () => {
-      answers[1]?.(withExcluded(1, 2));
-      await second;
-    });
-    await act(async () => {
-      answers[0]?.(withExcluded(1));
-      await first;
-    });
-    expect(excludedOf(1)).toBe(true);
-    expect(excludedOf(2)).toBe(true);
-
-    // The other way round: the first comes first, without the second still on its way, which stays left out.
-    act(() => {
-      first = result.current.setExcluded(entry(), false);
-    });
-    act(() => {
-      second = result.current.setExcluded(stats.entries[1] as TourActivityStatsEntry, false);
-    });
-    await act(async () => {
-      answers[2]?.(withExcluded(2));
-      await first;
-    });
-    expect(excludedOf(1)).toBe(false);
-    expect(excludedOf(2)).toBe(false);
-    await act(async () => {
-      answers[3]?.(withExcluded());
-      await second;
-    });
-    expect(excludedOf(2)).toBe(false);
-  });
-
-  it('FE-STA2-HOOK-009: a read asked before an exclusion and answered after it does not undo it', async () => {
-    const { result } = renderHook(() => useTourActivityStats(true));
-    await waitFor(() => expect(result.current.status).toBe('ready'));
-    let read: (value: TourActivityStatsResponse) => void = () => undefined;
-    repo.get.mockReturnValue(new Promise((resolve) => (read = resolve)));
-    act(() => result.current.retry());
-    repo.setExcluded.mockResolvedValue({
-      ...stats,
-      entries: stats.entries.map((item) => (item.place_id === 1 ? { ...item, excluded: true } : item)),
-    });
-    await act(async () => {
-      await result.current.setExcluded(entry(), true);
-    });
-    await act(async () => read(stats));
-    expect(result.current.status).toBe('ready');
-    expect(result.current.data?.entries.find((item) => item.place_id === 1)?.excluded).toBe(true);
-  });
-});
@@ -1,165 +0,0 @@
-import {
-  summarizeTourActivities,
-  type TourActivityStatsEntry,
-  type TourActivityStatsResponse,
-  type TourActivitySummary,
-} from '@trek/shared';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useTranslation } from '../../../i18n';
-import { TourActivityStatsOfflineError, tourActivityStatsRepo } from '../../../repo/tourActivityStatsRepo';
-import { localIsoDate } from '../../../utils/localDate';
-import { useToast } from '../../shared/Toast';
-import {
-  periodOptions,
-  periodRange,
-  typeOptions,
-  type ActivityPeriod,
-  type ActivityType,
-} from './tourActivityStatsModel';
-
-/** Where the read stands: not asked yet, on its way, there, refused offline, or failed. */
-type ActivityStatsStatus = 'idle' | 'loading' | 'ready' | 'offline' | 'error';
-
-export interface TourActivityStats {
-  status: ActivityStatsStatus;
-  data: TourActivityStatsResponse | null;
-  /** The sums of the chosen period and type; null until the first read is there. */
-  summary: TourActivitySummary | null;
-  period: ActivityPeriod;
-  setPeriod: (period: ActivityPeriod) => void;
-  periods: ActivityPeriod[];
-  type: ActivityType;
-  setType: (type: ActivityType) => void;
-  types: ActivityType[];
-  /** The tours whose exclusion is on its way to the server. */
-  pending: ReadonlySet<number>;
-  setExcluded: (entry: TourActivityStatsEntry, excluded: boolean) => Promise<void>;
-  retry: () => void;
-}
-
-/** What the latest read came back with, and the attempt it answered. */
-interface Answered {
-  attempt: number;
-  status: Exclude<ActivityStatsStatus, 'idle' | 'loading'>;
-}
-
-/** Every entry of the tour with the flag as asked, the rest as they were. */
-function flagged(data: TourActivityStatsResponse, placeId: number, excluded: boolean): TourActivityStatsResponse {
-  return {
-    ...data,
-    entries: data.entries.map((entry) => (entry.place_id === placeId ? { ...entry, excluded } : entry)),
-  };
-}
-
-/** Every entry with the flags of the exclusions still on their way laid over it, the way they show already. */
-function withFlags(data: TourActivityStatsResponse, flags: ReadonlyMap<number, boolean>): TourActivityStatsResponse {
-  if (flags.size === 0) return data;
-  return {
-    ...data,
-    entries: data.entries.map((entry) =>
-      flags.has(entry.place_id) ? { ...entry, excluded: flags.get(entry.place_id) === true } : entry
-    ),
-  };
-}
-
-/**
- * STA-02: the user's own tour activities in the Atlas. Read live when the tab
- * is first shown (and again on retry), never cached on the device; narrowed by
- * period and type here, summed by the shared summary the assistant uses too.
- * Leaving a tour out shows at once and is undone with a message when the
- * server refuses it; the plan of the tour never changes. Answers can come
- * back in any order: only the answer to the latest read or write is taken
- * whole, with the exclusions still on their way laid over it; an older one
- * only confirms its own tour's flag, so it never puts back a state from
- * before a newer change.
- */
-export function useTourActivityStats(active: boolean): TourActivityStats {
-  const { t } = useTranslation();
-  const toast = useToast();
-  // The answer to the latest read and which attempt it answered: a retry is loading until its own answer is there.
-  const [answered, setAnswered] = useState<Answered | null>(null);
-  const [data, setData] = useState<TourActivityStatsResponse | null>(null);
-  const [period, setPeriod] = useState<ActivityPeriod>('all');
-  const [type, setType] = useState<ActivityType>('all');
-  const [pending, setPending] = useState<ReadonlySet<number>>(() => new Set());
-  const [attempt, setAttempt] = useState(0);
-  const today = localIsoDate();
-  // Raised by every read and every write, so an answer knows whether a newer request went out after it.
-  const latest = useRef(0);
-  // The exclusions on their way to the server, by tour: the flag the user asked for.
-  const inFlight = useRef(new Map<number, boolean>());
-
-  useEffect(() => {
-    if (!active) return;
-    const controller = new AbortController();
-    const asked = ++latest.current;
-    tourActivityStatsRepo.get(controller.signal).then(
-      (answer) => {
-        if (controller.signal.aborted) return;
-        if (asked === latest.current) setData(withFlags(answer, inFlight.current));
-        setAnswered({ attempt, status: 'ready' });
-      },
-      (err: unknown) => {
-        if (controller.signal.aborted) return;
-        setAnswered({ attempt, status: err instanceof TourActivityStatsOfflineError ? 'offline' : 'error' });
-      }
-    );
-    return () => controller.abort();
-  }, [active, attempt]);
-
-  let status: ActivityStatsStatus = 'loading';
-  if (answered?.attempt === attempt) status = answered.status;
-  else if (!active && !answered) status = 'idle';
-
-  const summary = useMemo(() => {
-    if (!data) return null;
-    const range = periodRange(period, today);
-    return summarizeTourActivities(data.entries, { today, ...range, type: type === 'all' ? null : type });
-  }, [data, period, type, today]);
-  const periods = useMemo(() => periodOptions(data?.entries ?? [], today), [data, today]);
-  const types = useMemo(() => typeOptions(data?.entries ?? [], today), [data, today]);
-
-  const setExcluded = useCallback(
-    async (entry: TourActivityStatsEntry, excluded: boolean) => {
-      const placeId = entry.place_id;
-      const asked = ++latest.current;
-      inFlight.current.set(placeId, excluded);
-      setPending((current) => new Set(current).add(placeId));
-      setData((current) => (current ? flagged(current, placeId, excluded) : current));
-      try {
-        const answer = await tourActivityStatsRepo.setExcluded({ place_id: placeId, excluded });
-        inFlight.current.delete(placeId);
-        if (asked === latest.current) setData(withFlags(answer, inFlight.current));
-        else setData((current) => (current ? flagged(current, placeId, excluded) : current));
-      } catch {
-        inFlight.current.delete(placeId);
-        setData((current) => (current ? flagged(current, placeId, !excluded) : current));
-        toast.error(t('tours.stats.excludeFailed'));
-      } finally {
-        setPending((current) => {
-          const next = new Set(current);
-          next.delete(placeId);
-          return next;
-        });
-      }
-    },
-    [t, toast]
-  );
-
-  const retry = useCallback(() => setAttempt((count) => count + 1), []);
-
-  return {
-    status,
-    data,
-    summary,
-    period,
-    setPeriod,
-    periods,
-    type,
-    setType,
-    types,
-    pending,
-    setExcluded,
-    retry,
-  };
-}
@@ -1,13 +1,12 @@
 import { useId, useState } from 'react'
 import { AlertTriangle, Check, Loader2, Plug, ShieldAlert } from 'lucide-react'
 import { DialogButton, DialogFooter, DialogHeader, DialogShell, DialogTile, FooterSpacer, NEUTRAL_TINT } from '../../shared/DialogShell'
-import { Tooltip } from '../../shared/Tooltip'
 import ToggleSwitch from '../../Settings/ToggleSwitch'
 import { useTranslation } from '../../../i18n/TranslationContext'
 import { useConnectForm } from './useConnectForm'
 import { Badge } from './DocSyncBits'
 import { DOCUMENT_PROVIDER_ICONS } from '../../shared/DocumentProviderIcons'
-import type { DocSyncProvider, DocSyncVerdict, useDocSync } from './useDocSync'
+import type { DocSyncProvider, useDocSync } from './useDocSync'

 /**
 * Connecting a store, as a dialog rather than a panel that unfolds in place.
@@ -33,7 +32,7 @@ export default function DocSyncConnectModal({
  const Icon = DOCUMENT_PROVIDER_ICONS[provider.id]

  const form = useConnectForm(provider, existing, sync)
-  const [verdict, setVerdict] = useState<DocSyncVerdict | null>(null)
+  const [verdict, setVerdict] = useState<{ connected: boolean; account?: string; error?: string } | null>(null)

  const test = async () => setVerdict(await form.probe())
  const labelId = useId()
@@ -135,7 +134,7 @@ function Verdict({
  busy,
  failure,
 }: {
-  verdict: DocSyncVerdict | null
+  verdict: { connected: boolean; account?: string; error?: string } | null
  busy: boolean
  /** A call that failed outside the connection test (saving, most of all). */
  failure: string | null
@@ -173,16 +172,10 @@ function Verdict({
    )
  }
  const blocked = verdict.error === 'ssrf_blocked' || verdict.error === 'tls_untrusted'
-  const message = t(`docsync.error.${verdict.error || 'unknown'}`)
-  // The footer shares its row with the buttons, and a refusal cut to "The
-  // credentials were re..." with no way to read the rest left nothing to go on
-  // (#2666). Two lines, and the whole of it with the store's reason on hover.
  return (
-    <Tooltip label={verdict.detail ? `${message} ${verdict.detail}` : message} placement="top">
-      <span className="flex min-w-0 items-center gap-2 text-caption text-danger">
-        {blocked ? <ShieldAlert size={14} className="flex-none" /> : <AlertTriangle size={14} className="flex-none" />}
-        <span className="line-clamp-2 [overflow-wrap:anywhere]">{message}</span>
-      </span>
-    </Tooltip>
+    <span className="flex min-w-0 items-center gap-2 text-caption text-danger">
+      {blocked ? <ShieldAlert size={14} /> : <AlertTriangle size={14} />}
+      <span className="truncate">{t(`docsync.error.${verdict.error || 'unknown'}`)}</span>
+    </span>
  )
 }
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import type { DocSyncConnection, DocSyncProvider, DocSyncVerdict, useDocSync } from './useDocSync'
+import type { DocSyncConnection, DocSyncProvider, useDocSync } from './useDocSync'

 /**
 * The credential form's rules, for both shells.
@@ -39,7 +39,7 @@ export interface ConnectForm {
  setInsecureTls: (on: boolean) => void
  /** Every required field is either filled in or already stored. */
  complete: boolean
-  probe: () => Promise<DocSyncVerdict>
+  probe: () => Promise<{ connected: boolean; account?: string; error?: string }>
  save: () => Promise<boolean>
 }

@@ -12,14 +12,6 @@ import { useServerPing } from '../../../sync/useServerPing'
 * reason for the same problem.
 */

-/** What a connection test answers; `detail` is the store's own reason, for the person fixing it. */
-export interface DocSyncVerdict {
-  connected: boolean
-  account?: string
-  error?: string
-  detail?: string
-}
-
 export interface DocSyncField {
  field_key: string
  label: string
@@ -272,9 +264,11 @@ export function useDocSync(tripId: number | string, enabled: boolean) {
  const testConnection = useCallback(async (providerId: string, baseUrl: string, credentials: Record<string, string>, allowInsecureTls: boolean) => {
    setBusy('test')
    try {
-      return await docsyncApi.testConnection(tripId, { providerId, baseUrl, credentials, allowInsecureTls }) as DocSyncVerdict
+      return await docsyncApi.testConnection(tripId, { providerId, baseUrl, credentials, allowInsecureTls }) as {
+        connected: boolean; account?: string; error?: string; detail?: string
+      }
    } catch (e: unknown) {
-      return { connected: false, error: readError(e) } satisfies DocSyncVerdict
+      return { connected: false, error: readError(e) }
    } finally {
      setBusy(null)
    }
@@ -98,19 +98,6 @@ describe('JourneySettingsDialog', () => {
    await screen.findByRole('button', { name: /create share link/i })
  })

-  it('FE-JRN-SETTINGS-2683: lists the people a linked trip lets in under their own heading, and nothing without', () => {
-    const { unmount } = mountDialog()
-    expect(screen.queryByText('Through trips')).not.toBeInTheDocument()
-    unmount()
-
-    mountDialog(buildJourney({
-      trip_access: [{ user_id: 7, role: 'viewer', username: 'lena', avatar: null, trip_id: 5, trip_title: 'Italy Trip' }],
-    }))
-    expect(screen.getByText('Through trips')).toBeInTheDocument()
-    expect(screen.getByText('lena')).toBeInTheDocument()
-    expect(screen.getByText('via Italy Trip')).toBeInTheDocument()
-  })
-
  it('FE-JRN-SETTINGS-002: saves the edited title and subtitle', async () => {
    const user = userEvent.setup()
    const { onSaved } = mountDialog()
@@ -7,7 +7,7 @@ import { DeleteButton, DialogButton, DialogFooter, DialogHeader, DialogSection,
 import { AddRowButton, EditorField, INPUT, Segmented } from '../shared/dialogParts'
 import JourneyShareSection from './JourneyShareSection'
 import { useJourneySettings } from './useJourneySettings'
-import type { JourneyContributor, JourneyDetail, JourneyTripAccess } from '../../store/journeyStore'
+import type { JourneyContributor, JourneyDetail } from '../../store/journeyStore'
 import { pickGradient } from '../../pages/journeyDetail/JourneyDetailPage.helpers'
 import { AddTripDialog } from './JourneyDetailPageAddTripDialog'
 import ToggleSwitch from '../Settings/ToggleSwitch'
@@ -277,8 +277,6 @@ export function JourneySettingsDialog({ journey, onClose, onSaved, onOpenInvite,
              </div>
              <AddRowButton onClick={onOpenInvite}>{t('journey.contributors.invite')}</AddRowButton>
            </DialogSection>
-
-            <TripAccessSection access={journey.trip_access} roleLabel={roleLabel} />
          </div>
        </div>

@@ -326,32 +324,3 @@ export function JourneySettingsDialog({ journey, onClose, onSaved, onOpenInvite,
    </>
  )
 }
-
-/**
- * Who a trip's linked journal lets in (#2683), under its own heading below the
- * contributors: shown here, but managed in that trip's settings, so read only.
- */
-function TripAccessSection({ access, roleLabel }: {
-  access: JourneyTripAccess[] | undefined
-  roleLabel: (role: JourneyContributor['role']) => string
-}) {
-  const { t } = useTranslation()
-  if (!access?.length) return null
-  return (
-    <DialogSection label={t('journey.contributors.viaTrips')}>
-      <p className="m-0 mb-2.5 leading-normal text-content-faint" style={fs(11.5)}>{t('journey.contributors.viaTripsHint')}</p>
-      <div className={ROWS}>
-        {access.map(a => (
-          <div key={`${a.user_id}-${a.trip_id}`} className={ROW}>
-            <TripMemberAvatar username={a.username} avatarUrl={avatarSrc(a.avatar)} size={28} />
-            <div className="min-w-0 flex-1">
-              <div className="truncate font-semibold text-content" style={fs(13, 'body')}>{a.username}</div>
-              <div className="truncate text-content-faint" style={fs(11)}>{t('journey.contributors.viaTrip', { trip: a.trip_title })}</div>
-            </div>
-            <span className={`${BADGE} bg-surface-tertiary text-content-muted`} style={fs(10.5)}>{roleLabel(a.role)}</span>
-          </div>
-        ))}
-      </div>
-    </DialogSection>
-  )
-}
@@ -9,6 +9,7 @@ import { resolvePluginIcon } from '../shared/PluginIcon'
 import { useAuthStore } from '../../store/authStore'
 import { visibleManagedNavItems } from '../../managed'
 import { isNavItemActive, useCreateAction } from './useCreateAction'
+import { useIsDark } from '../../hooks/useIsDark'

 const ADDON_NAV: Record<string, { icon: LucideIcon; labelKey: string }> = {
  vacay:       { icon: CalendarDays, labelKey: 'admin.addons.catalog.vacay.name' },
@@ -22,8 +23,8 @@ interface NavItem { to: string; label: string; icon: LucideIcon }
 export default function BottomNav() {
  const { t } = useTranslation()
  const navigate = useNavigate()
-  const darkMode = useSettingsStore(s => s.settings.dark_mode)
-  const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  // Off the .dark class: a special theme is dark whatever the stored mode says.
+  const dark = useIsDark()
  const addons = useAddonStore(s => s.addons)
  const globalAddons = addons.filter(a => a.type === 'global' && a.enabled)
  // Page plugins are reachable from the mobile tab bar too, mirroring the desktop
@@ -7,13 +7,14 @@ import { useInAppNotificationStore } from '../../store/inAppNotificationStore.ts
 import { useSettingsStore } from '../../store/settingsStore'
 import { useAuthStore } from '../../store/authStore'
 import InAppNotificationItem from '../Notifications/InAppNotificationItem.tsx'
+import { useIsDark } from '../../hooks/useIsDark'

 export default function InAppNotificationBell(): React.ReactElement {
  const { t } = useTranslation()
  const navigate = useNavigate()
  const { settings } = useSettingsStore()
-  const darkMode = settings.dark_mode
-  const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  // Off the .dark class: a special theme is dark whatever the stored mode says.
+  const dark = useIsDark()

  const isAuthenticated = useAuthStore(s => s.isAuthenticated)
  const { notifications, unreadCount, isLoading, fetchNotifications, fetchUnreadCount, markAllRead, deleteAll } = useInAppNotificationStore()
@@ -169,24 +169,23 @@ describe('Navbar', () => {
    expect(adminLink).toHaveAttribute('href', '/admin');
  });

-  it('FE-COMP-NAVBAR-019: the trip settings button sits beside the back pill when onSettings is given', () => {
-    render(<Navbar tripTitle="Japan" showBack onBack={vi.fn()} onSettings={vi.fn()} />);
-    const back = screen.getByRole('button', { name: /back/i });
-    const settings = screen.getByRole('button', { name: 'Trip settings' });
-    expect(back.parentElement).toBe(settings.closest('div'));
+  it('FE-COMP-NAVBAR-019: share button rendered when onShare prop provided', () => {
+    render(<Navbar onShare={vi.fn()} />);
+    const shareBtn = screen.getByRole('button', { name: /share/i });
+    expect(shareBtn).toBeInTheDocument();
  });

-  it('FE-COMP-NAVBAR-020: the trip settings button calls onSettings', async () => {
+  it('FE-COMP-NAVBAR-020: share button click calls onShare', async () => {
    const user = userEvent.setup();
-    const onSettings = vi.fn();
-    render(<Navbar onSettings={onSettings} />);
-    await user.click(screen.getByRole('button', { name: 'Trip settings' }));
-    expect(onSettings).toHaveBeenCalled();
+    const onShare = vi.fn();
+    render(<Navbar onShare={onShare} />);
+    const shareBtn = screen.getByRole('button', { name: /share/i });
+    await user.click(shareBtn);
+    expect(onShare).toHaveBeenCalled();
  });

-  it('FE-COMP-NAVBAR-021: no trip settings button without onSettings, and no share button any more', () => {
+  it('FE-COMP-NAVBAR-021: share button NOT rendered when onShare prop omitted', () => {
    render(<Navbar />);
-    expect(screen.queryByRole('button', { name: 'Trip settings' })).not.toBeInTheDocument();
    expect(screen.queryByRole('button', { name: /share/i })).not.toBeInTheDocument();
  });

@@ -454,8 +453,8 @@ describe('Navbar styling and menu details', () => {
    expect(screen.queryByText('3.5.0-rc1')).not.toBeInTheDocument();
  });

-  it('FE-W5NAV-009: the back and theme buttons reset their hover background', () => {
-    render(<Navbar showBack onBack={vi.fn()} onSettings={vi.fn()} />);
+  it('FE-W5NAV-009: the back, share and theme buttons reset their hover background', () => {
+    render(<Navbar showBack onBack={vi.fn()} onShare={vi.fn()} />);

    const back = screen.getByRole('button', { name: /back/i });
    fireEvent.mouseEnter(back);
@@ -463,6 +462,11 @@ describe('Navbar styling and menu details', () => {
    fireEvent.mouseLeave(back);
    expect(back.style.background).toBe('transparent');

+    const share = screen.getByRole('button', { name: /share/i });
+    fireEvent.mouseEnter(share);
+    expect(share.style.background).toBe('var(--bg-hover)');
+    fireEvent.mouseLeave(share);
+    expect(share.style.background).toBe('var(--bg-card)');

    const theme = document.querySelector('button[title]:not([data-help-button])') as HTMLElement;
    fireEvent.mouseEnter(theme);
@@ -6,13 +6,14 @@ import { useSettingsStore } from '../../store/settingsStore'
 import { useAddonStore } from '../../store/addonStore'
 import { usePluginStore } from '../../store/pluginStore'
 import { useTranslation } from '../../i18n'
-import { Plane, LogOut, Settings, ChevronDown, Shield, ArrowLeft, ChevronLeft, Moon, Sun, Monitor, CalendarDays, Briefcase, Globe, Compass, BookOpen, Bookmark } from 'lucide-react'
+import { Plane, LogOut, Settings, ChevronDown, Shield, ArrowLeft, ChevronLeft, Users, Moon, Sun, Monitor, CalendarDays, Briefcase, Globe, Compass, BookOpen, Bookmark } from 'lucide-react'
 import type { LucideIcon } from 'lucide-react'
 import InAppNotificationBell from './InAppNotificationBell.tsx'
 import HelpButton from '../Help/HelpButton'
 import { resolvePluginIcon } from '../shared/PluginIcon'
 import { visibleManagedNavItems } from '../../managed'
 import { useCollapseOnOverflow } from '../../hooks/useCollapseOnOverflow'
+import { useIsDark } from '../../hooks/useIsDark'

 const ADDON_ICONS: Record<string, LucideIcon> = { CalendarDays, Briefcase, Globe, Compass, Bookmark }

@@ -21,8 +22,7 @@ interface NavbarProps {
  tripId?: number | string
  onBack?: () => void
  showBack?: boolean
-  /** The trip's Settings: who is on it, its links and its journal. */
-  onSettings?: () => void
+  onShare?: () => void
 }

 interface Addon {
@@ -33,7 +33,7 @@ interface Addon {
  enabled: boolean
 }

-export default function Navbar({ tripTitle, tripId, onBack, showBack, onSettings }: NavbarProps): React.ReactElement {
+export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare }: NavbarProps): React.ReactElement {
  const { user, logout, isPrerelease, appVersion } = useAuthStore()
  const { settings, updateSetting } = useSettingsStore()
  const { addons: allAddons, loadAddons } = useAddonStore()
@@ -42,8 +42,8 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onSettings
  const location = useLocation()
  const [userMenuOpen, setUserMenuOpen] = useState<boolean>(false)
  const [scrolled, setScrolled] = useState<boolean>(false)
-  const darkMode = settings.dark_mode
-  const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  // Off the .dark class: a special theme is dark whatever the stored mode says.
+  const dark = useIsDark()

  useEffect(() => {
    const onScroll = () => setScrolled(window.scrollY > 8 || (document.body.scrollTop || 0) > 8)
@@ -122,7 +122,7 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onSettings
      paddingTop: 'env(safe-area-inset-top, 0px)',
      height: 'var(--nav-h)',
      transition: 'background 240ms cubic-bezier(0.23,1,0.32,1), backdrop-filter 240ms cubic-bezier(0.23,1,0.32,1), box-shadow 240ms cubic-bezier(0.23,1,0.32,1)',
-    }} className="hidden md:flex items-center px-4 gap-4 fixed top-0 inset-x-0 z-[200]">
+    }} className="trek-navbar hidden md:flex items-center px-4 gap-4 fixed top-0 inset-x-0 z-[200]">
      {/* Left side. flex-1 basis-0, matching the action cluster on the right, so
          the tab pill between them sits in the middle of the bar rather than
          being centred on top of both (#1983). Both columns keep at least their
@@ -174,21 +174,6 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onSettings
            <span className="truncate text-caption font-semibold text-content">{tripTitle}</span>
          </span>
        ))}
-
-        {/* The trip's Settings sit with the trip, beside its pill: they are about this
-            trip, not about the app the right side of the bar belongs to. */}
-        {onSettings && (
-          // The same pill as the trip's own beside it, so the two read as one pair.
-          <button
-            type="button"
-            onClick={onSettings}
-            aria-label={t('trip.settings.title')}
-            className="inline-flex flex-none items-center gap-1.5 rounded-full bg-surface-card py-1 ps-2 pe-3 text-content shadow-sm ring-1 ring-inset ring-edge-faint transition-colors hover:bg-surface-hover focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
-          >
-            <Settings className="h-4 w-4 flex-none text-content-muted" aria-hidden="true" />
-            <span className="text-caption font-semibold">{t('nav.settings')}</span>
-          </button>
-        )}
      </div>

      {/* Centred liquid-glass tab menu (design handoff).
@@ -261,6 +246,17 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onSettings
          itself on top of them. */}
      <div className="flex items-center gap-4 flex-1 basis-0 min-w-max justify-end">

+      {/* Share button */}
+      {onShare && (
+        <button type="button" onClick={onShare}
+          className="flex items-center gap-1.5 py-1.5 px-3 rounded-lg border transition-colors text-sm font-medium flex-shrink-0 border-edge text-content-secondary bg-surface-card"
+          onMouseEnter={e => e.currentTarget.style.background = 'var(--bg-hover)'}
+          onMouseLeave={e => e.currentTarget.style.background = 'var(--bg-card)'}>
+          <Users className="w-4 h-4" />
+          <span className="hidden sm:inline">{t('nav.share')}</span>
+        </button>
+      )}
+
      {/* Contextual help for the current screen — same footprint as the theme toggle beside it */}
      {user && <HelpButton />}

@@ -1,10 +1,9 @@
-// FE-COMP-MAPLAYER-001 to FE-COMP-MAPLAYER-024
+// FE-COMP-MAPLAYER-001 to FE-COMP-MAPLAYER-017
 import React from 'react'
 import { describe, it, expect, vi } from 'vitest'
 import { render, screen, fireEvent } from '../../../tests/helpers/render'
 import { MapLayerSwitcher, TourMapLayerSwitcher, MAP_ROUND_CONTROL_SIZE } from './MapLayerSwitcher'
 import type { FerrataMapLayer } from '../Ferratas/useFerrataMapLayer'
-import type { ToggleableRasterOverlay } from './mapRasterOverlay'

 describe('MapLayerSwitcher', () => {
  it('FE-COMP-MAPLAYER-001: on the default layer, offers the switch to satellite', () => {
@@ -60,38 +59,6 @@ describe('MapLayerSwitcher', () => {
    expect(onChange).toHaveBeenCalledWith('topo')
  })

-  it('FE-COMP-MAPLAYER-018: offers the hiking map only where the tour type and the admin offer it (MAP-01)', () => {
-    const onChange = vi.fn()
-    const { rerender } = render(<TourMapLayerSwitcher active="default" onChange={onChange} layers={{ bases: ['default', 'topo', 'satellite'] }} />)
-    expect(screen.queryByRole('button', { name: 'Hiking' })).toBeNull()
-
-    rerender(<TourMapLayerSwitcher active="default" onChange={onChange} layers={{ bases: ['default', 'topo', 'hiking', 'satellite'] }} />)
-    fireEvent.click(screen.getByRole('button', { name: 'Hiking' }))
-    expect(onChange).toHaveBeenCalledWith('hiking')
-  })
-
-  it('FE-COMP-MAPLAYER-019: a hiking map that stopped answering says so on its segment, and only while it is shown', () => {
-    const baseHealth = { base: 'hiking' as const, down: true, onTileError: vi.fn(), onTileLoad: vi.fn() }
-    const layers = { bases: ['default', 'hiking'] as const, baseHealth }
-    const { rerender } = render(<TourMapLayerSwitcher active="hiking" onChange={() => {}} layers={layers} />)
-    const segment = screen.getByRole('button', { name: 'Hiking' })
-    expect(segment).toHaveAttribute('aria-pressed', 'true')
-    expect(segment).toHaveTextContent('!')
-    expect(screen.getByRole('status')).toHaveTextContent('OpenHikingMap is not answering right now')
-
-    rerender(<TourMapLayerSwitcher active="default" onChange={() => {}} layers={layers} />)
-    expect(screen.getByRole('button', { name: 'Hiking' })).not.toHaveTextContent('!')
-    expect(screen.queryByRole('status')).toBeNull()
-  })
-
-  it('FE-COMP-MAPLAYER-020: CyclOSM sits in the switch as Cycling and says so when it stops answering (BIK-06)', () => {
-    const baseHealth = { base: 'cycle' as const, down: true, onTileError: vi.fn(), onTileLoad: vi.fn() }
-    render(<TourMapLayerSwitcher active="cycle" onChange={() => {}} layers={{ bases: ['default', 'cycle'], baseHealth }} />)
-    expect(screen.getByRole('button', { name: 'Cycling' })).toHaveTextContent('!')
-    expect(screen.getByRole('status')).toHaveTextContent('CyclOSM is not answering right now')
-    expect(screen.queryByRole('button', { name: 'Hiking' })).toBeNull()
-  })
-
  it('FE-COMP-MAPLAYER-008: the shell is as wide as the size its neighbours are placed off', () => {
    render(<MapLayerSwitcher active="default" onToggle={() => {}} />)
    const button = screen.getByRole('button')
@@ -236,79 +203,3 @@ describe('TourMapLayerSwitcher via ferrata switch', () => {
    expect(screen.getByRole('button', { name: 'Set points' })).toHaveClass('text-content-muted')
  })
 })
-
-const pisteOverlay = (overrides: Partial<ToggleableRasterOverlay> = {}): ToggleableRasterOverlay => ({
-  id: 'pistes',
-  url: 'https://tiles.opensnowmap.org/pistes/{z}/{x}/{y}.png',
-  attribution: 'OpenSnowMap',
-  minZoom: 9,
-  maxZoom: 18,
-  active: false,
-  status: 'off',
-  belowMinZoom: false,
-  onToggle: vi.fn(),
-  onTileError: vi.fn(),
-  onTileLoad: vi.fn(),
-  ...overrides,
-})
-
-describe('TourMapLayerSwitcher piste switch (SKI-01)', () => {
-  it('FE-COMP-MAPLAYER-021: the pistes switch sits on its icon alone, named by its tooltip, and offers no key while off', async () => {
-    const overlay = pisteOverlay()
-    render(<TourMapLayerSwitcher active="default" onChange={() => {}} ferrataLayer={ferrataLayer()} layers={{ overlays: [overlay] }} />)
-    const toggle = screen.getByRole('button', { name: 'Pistes, cross-country trails and lifts' })
-    expect(toggle).toHaveAttribute('aria-pressed', 'false')
-    expect(toggle.textContent).toBe('')
-    expect(screen.queryByTestId('piste-key-button')).toBeNull()
-    fireEvent.click(toggle)
-    expect(overlay.onToggle).toHaveBeenCalledTimes(1)
-    fireEvent.mouseEnter(toggle)
-    expect(await screen.findByRole('tooltip')).toHaveTextContent('Pistes, cross-country trails and lifts')
-  })
-
-  it('FE-COMP-MAPLAYER-022: on, the switch is pressed in the accent and the key rides beside it in the same pill', () => {
-    render(<TourMapLayerSwitcher active="default" onChange={() => {}} layers={{ overlays: [pisteOverlay({ active: true, status: 'on' })] }} />)
-    const toggle = screen.getByRole('button', { name: 'Pistes, cross-country trails and lifts' })
-    expect(toggle).toHaveAttribute('aria-pressed', 'true')
-    expect(toggle).toHaveClass('bg-accent', 'text-accent-text')
-    const key = screen.getByTestId('piste-key-button')
-    expect(screen.getByRole('group')).toContainElement(key)
-    expect(key).toHaveAccessibleName('Piste key')
-  })
-
-  it('FE-COMP-MAPLAYER-023: a piste source that stopped answering shows the warning badge, says so, and hides the key', async () => {
-    render(<TourMapLayerSwitcher active="default" onChange={() => {}} layers={{ overlays: [pisteOverlay({ active: true, status: 'down' })] }} />)
-    const toggle = screen.getByRole('button', { name: 'Pistes, cross-country trails and lifts' })
-    expect(toggle).toHaveAttribute('data-status', 'down')
-    expect(toggle).toHaveTextContent('!')
-    expect(screen.queryByTestId('piste-key-button')).toBeNull()
-    expect(screen.getByRole('status')).toHaveTextContent('Pistes are not loading. The map and your route still work.')
-    fireEvent.mouseEnter(toggle)
-    expect(await screen.findByRole('tooltip')).toHaveTextContent('Pistes are not loading.')
-  })
-
-  it('FE-COMP-MAPLAYER-024: on further out than the pistes reach, the switch stays pressed in the soft accent and says to zoom in', async () => {
-    const { rerender } = render(
-      <TourMapLayerSwitcher active="default" onChange={() => {}} layers={{ overlays: [pisteOverlay({ active: true, status: 'on', belowMinZoom: true })] }} />
-    )
-    const toggle = screen.getByRole('button', { name: 'Pistes, cross-country trails and lifts' })
-    expect(toggle).toHaveAttribute('aria-pressed', 'true')
-    expect(toggle).toHaveAttribute('data-below-min-zoom', 'true')
-    expect(toggle).toHaveClass('bg-accent-soft', 'text-accent')
-    expect(screen.getByRole('status')).toHaveTextContent('Zoom in to see the pistes')
-    fireEvent.mouseEnter(toggle)
-    expect(await screen.findByRole('tooltip')).toHaveTextContent('Zoom in to see the pistes')
-    // The key stays at hand and opens with the same line on top.
-    fireEvent.click(screen.getByTestId('piste-key-button'))
-    expect(await screen.findByTestId('piste-key-zoom-in')).toHaveTextContent('Zoom in to see the pistes')
-
-    // A source that stopped answering says so instead, and close enough the switch is plainly on.
-    rerender(<TourMapLayerSwitcher active="default" onChange={() => {}} layers={{ overlays: [pisteOverlay({ active: true, status: 'down', belowMinZoom: true })] }} />)
-    expect(screen.getByRole('status')).toHaveTextContent('Pistes are not loading.')
-    rerender(<TourMapLayerSwitcher active="default" onChange={() => {}} layers={{ overlays: [pisteOverlay({ active: true, status: 'on' })] }} />)
-    const plain = screen.getByRole('button', { name: 'Pistes, cross-country trails and lifts' })
-    expect(plain).not.toHaveAttribute('data-below-min-zoom')
-    expect(plain).toHaveClass('bg-accent', 'text-accent-text')
-    expect(screen.getByRole('status')).toHaveTextContent('')
-  })
-})
@@ -1,7 +1,6 @@
-import { Anchor, Bike, Footprints, Loader2, Map as MapIcon, MapPinPlus, Mountain, MountainSnow, Rotate3d, Satellite } from 'lucide-react'
+import { Anchor, Loader2, Map as MapIcon, MapPinPlus, Mountain, Rotate3d, Satellite } from 'lucide-react'
 import type { PaddleMapLayer } from '../Tours/paddle/paddleMapLayer'
-import { PisteKeyButton } from '../Tours/winter/PisteKey'
-import type { ComponentType, CSSProperties } from 'react'
+import type { CSSProperties } from 'react'
 import { useTranslation } from '../../i18n'
 import { FerrataLineIcon } from '../Ferratas/FerrataGlyph'
 import type { FerrataMapLayer } from '../Ferratas/useFerrataMapLayer'
@@ -10,10 +9,9 @@ import { fs } from '../shared/DialogShell'
 import { Tooltip } from '../shared/Tooltip'
 import { MAP_CONTROL_SHADOW } from './mapControlShadow'
 import type { ToggleableRasterOverlay } from './mapRasterOverlay'
-import type { BaseMapHealth, TourRasterBase } from './tourRasterBases'

 export type BaseLayer = 'default' | 'satellite'
-export type TourBaseLayer = BaseLayer | TourRasterBase
+export type TourBaseLayer = BaseLayer | 'topo'

 /** What a tour's type offers on the planner map (P2B-06): its base layers, and the overlays beside the ferratas. */
 export interface TourLayerOffer {
@@ -21,8 +19,6 @@ export interface TourLayerOffer {
  overlays?: readonly ToggleableRasterOverlay[]
  /** PAD-05B: the paddle obstacles around a paddle tour, drawn by every renderer. */
  paddle?: PaddleMapLayer
-  /** MAP-01, BIK-06: whether the map on terms shown (OpenHikingMap, CyclOSM) answers; the maps report into it. */
-  baseHealth?: BaseMapHealth
 }

 const FROSTED_SHELL = {
@@ -87,8 +83,6 @@ export function MapLayerSwitcher({ active, onToggle }: { active: BaseLayer; onTo
 const TOUR_LAYERS = [
  { id: 'default', labelKey: 'map.baseLayer.default', Icon: MapIcon },
  { id: 'topo', labelKey: null, Icon: Mountain },
-  { id: 'hiking', labelKey: 'map.baseLayer.hiking', Icon: Footprints },
-  { id: 'cycle', labelKey: 'map.baseLayer.cycle', Icon: Bike },
  { id: 'satellite', labelKey: 'map.baseLayer.satellite', Icon: Satellite },
 ] as const

@@ -194,49 +188,16 @@ function PlaceToolToggle({ tool }: { tool: MapPlaceTool }) {
  )
 }

-/** How an overlay the planner can offer is named and drawn on its switch. */
-interface OverlayLook {
-  Icon: typeof Anchor
-  labelKey: string
-  downKey: string
-  /** On its icon alone, named by its tooltip, so the row stays short beside a type's other switches. */
-  iconOnly?: boolean
-  /** What the switch says while the map is further out than the overlay's first tiles. */
-  zoomInKey?: string
-  /** The overlay's key, beside its switch while the layer is on; told when nothing of it is drawn yet. */
-  Key?: ComponentType<{ belowMinZoom: boolean }>
-}
-
-const OVERLAY_LOOK: Record<string, OverlayLook> = {
+/** How each overlay the planner can offer is named and drawn on its switch. */
+const OVERLAY_LOOK: Record<string, { Icon: typeof Anchor; labelKey: string; downKey: string }> = {
  seamarks: { Icon: Anchor, labelKey: 'tours.map.seamarks', downKey: 'tours.map.seamarksDown' },
-  // SKI-01: the row already holds the maps and 3D, so the pistes go by their icon.
-  pistes: {
-    Icon: MountainSnow,
-    labelKey: 'tours.map.pistes',
-    downKey: 'tours.map.pistesDown',
-    zoomInKey: 'tours.map.pistesZoomIn',
-    iconOnly: true,
-    Key: PisteKeyButton,
-  },
-}
-
-/** The warning mark on a switch whose source stopped answering; the tooltip says what it means. */
-function DownBadge() {
-  return (
-    <span aria-hidden className="inline-flex h-[18px] min-w-[18px] items-center justify-center rounded-full bg-warning-soft px-1 font-semibold leading-none text-warning" style={fs(10)}>
-      !
-    </span>
-  )
 }

 /**
- * The switch for a transparent overlay (the seamarks, the pistes), the way the via
+ * The switch for a transparent overlay (the seamarks), the way the via
 * ferrata switch looks: on in the accent, and in the warning tone with a badge
 * once its source stopped answering, which the tooltip names. The map and the
- * planning go on without it. Switched on further out than its first tiles, it
- * stays pressed in the soft accent and its tooltip says to zoom in, so an empty
- * map does not read as broken. An overlay with a key shows the key's button
- * beside the switch while it is on and answering.
+ * planning go on without it.
 */
 function OverlayToggle({ overlay, compact }: { overlay: ToggleableRasterOverlay; compact: boolean }) {
  const { t } = useTranslation()
@@ -245,12 +206,9 @@ function OverlayToggle({ overlay, compact }: { overlay: ToggleableRasterOverlay;
  const label = t(look.labelKey)
  const down = overlay.status === 'down'
  const on = overlay.status !== 'off'
-  const zoomIn = !down && overlay.belowMinZoom && look.zoomInKey ? t(look.zoomInKey) : null
-  const notice = down ? t(look.downKey) : zoomIn
-  const tone = zoomIn ? 'bg-accent-soft text-accent' : 'bg-accent text-accent-text'
  return (
    <>
-      <Tooltip label={notice ?? label} placement="top">
+      <Tooltip label={down ? t(look.downKey) : label} placement="top">
        <button
          type="button"
          onClick={overlay.onToggle}
@@ -258,17 +216,19 @@ function OverlayToggle({ overlay, compact }: { overlay: ToggleableRasterOverlay;
          aria-pressed={on}
          data-testid={`map-overlay-${overlay.id}`}
          data-status={overlay.status}
-          data-below-min-zoom={zoomIn ? true : undefined}
-          className={on ? tone : 'text-content-muted'}
+          className={on ? 'bg-accent text-accent-text' : 'text-content-muted'}
          style={segmentStyle(on)}
        >
          <look.Icon size={15} strokeWidth={2} />
-          {!compact && !look.iconOnly && <span>{label}</span>}
-          {down && <DownBadge />}
+          {!compact && <span>{label}</span>}
+          {down && (
+            <span aria-hidden className="inline-flex h-[18px] min-w-[18px] items-center justify-center rounded-full bg-warning-soft px-1 font-semibold leading-none text-warning" style={fs(10)}>
+              !
+            </span>
+          )}
        </button>
      </Tooltip>
-      {look.Key && overlay.status === 'on' && <look.Key belowMinZoom={!!zoomIn} />}
-      <span role="status" aria-live="polite" className="sr-only">{notice ?? ''}</span>
+      <span role="status" aria-live="polite" className="sr-only">{down ? t(look.downKey) : ''}</span>
    </>
  )
 }
@@ -305,18 +265,14 @@ export function TourMapLayerSwitcher({
  const { t } = useTranslation()
  const bases = layers?.bases
  const overlays = layers?.overlays
-  // A map on terms is a best-effort service: while it is shown and stops answering, its segment says so.
-  const health = layers?.baseHealth

  return (
    <div style={{ ...FROSTED_SHELL, gap: 2 }} role="group" aria-label={t('settings.mapStyle')}>
      {TOUR_LAYERS.filter(({ id }) => !bases || bases.includes(id)).map(({ id, labelKey, Icon }) => {
        const selected = active === id
        const label = labelKey ? t(labelKey) : 'Topo'
-        const down = !!health?.down && health.base === id && active === id
-        const downLabel = id === 'cycle' ? t('map.baseLayer.cycleDown') : t('map.baseLayer.hikingDown')
        return (
-          <Tooltip key={id} label={down ? downLabel : label} placement="top" disabled={!compact && !down}>
+          <Tooltip key={id} label={label} placement="top" disabled={!compact}>
            <button
              type="button"
              onClick={() => onChange(id)}
@@ -327,16 +283,10 @@ export function TourMapLayerSwitcher({
            >
              <Icon size={15} strokeWidth={2} />
              {!compact && <span>{label}</span>}
-              {down && <DownBadge />}
            </button>
          </Tooltip>
        )
      })}
-      {health?.down && active === health.base && (
-        <span role="status" aria-live="polite" className="sr-only">
-          {health.base === 'cycle' ? t('map.baseLayer.cycleDown') : t('map.baseLayer.hikingDown')}
-        </span>
-      )}
      {(ferrataLayer || onToggleTerrain || placeTool || !!overlays?.length) && <span aria-hidden className="mx-0.5 h-5 w-px bg-edge" />}
      {placeTool && <PlaceToolToggle tool={placeTool} />}
      {ferrataLayer && <FerrataToggle layer={ferrataLayer} compact={compact} />}
@@ -252,7 +252,7 @@ describe('MapView', () => {
    const route = [[[39.9042, 116.4074], [39.9052, 116.4084]]] as [number, number][][]
    const plannerWaypoints = [{ id: 'start', lat: 39.9042, lng: 116.4074, role: 'start' as const }]
    const routeProfileFocus = { distanceMeters: 100, elevationMeters: 0, lat: 39.9047, lng: 116.4079, sampleIndex: 0 }
-    const props = (viewBaseLayer: 'default' | 'topo' | 'hiking' | 'satellite') => ({
+    const props = (viewBaseLayer: 'default' | 'topo' | 'satellite') => ({
      places: [beijing], center: [39.9042, 116.4074] as [number, number], zoom: 15,
      route, plannerWaypoints, routeProfileFocus, tileUrl: AMAP_ROAD, viewBaseLayer, onViewBaseLayerChange,
    })
@@ -279,11 +279,6 @@ describe('MapView', () => {
    expect(screen.getAllByTestId('polyline').every(polyline => polyline.getAttribute('data-points') === JSON.stringify(route[0]))).toBe(true)
    expect(screen.getByTestId('profile-focus-marker')).toHaveAttribute('data-center', JSON.stringify([routeProfileFocus.lat, routeProfileFocus.lng]))

-    // MAP-01: OpenHikingMap is drawn in WGS-84 like topo, from its own template.
-    rerender(<MapView {...props('hiking')} />)
-    expect(screen.getByTestId('map-container')).toHaveAttribute('data-crs', 'EPSG:3857')
-    expect(screen.getByTestId('tile-layer')).toHaveAttribute('data-url', 'https://tile.openmaps.fr/openhikingmap/{z}/{x}/{y}.png')
-
    rerender(<MapView {...props('satellite')} />)
    const satelliteMap = screen.getByTestId('map-container')
    expect(satelliteMap).not.toBe(topoMap)
@@ -1141,11 +1136,10 @@ describe('MapView plugin route vias', () => {
 })

 describe('MapView map event wiring', () => {
-  it('FE-COMP-MAPVIEW-043: reports the viewport bbox and its zoom once the map is ready and again on every move', () => {
+  it('FE-COMP-MAPVIEW-043: reports the viewport bbox once the map is ready and again on every move', () => {
    const onViewportChange = vi.fn()
-    mapMock.getZoom.mockReturnValue(10)
    render(<MapView onViewportChange={onViewportChange} />)
-    expect(onViewportChange).toHaveBeenCalledWith({ south: 47, west: 1, north: 49, east: 3 }, 10)
+    expect(onViewportChange).toHaveBeenCalledWith({ south: 47, west: 1, north: 49, east: 3 })

    const moveend = handlerFor('moveend')
    const zoomend = handlerFor('zoomend')
@@ -8,7 +8,6 @@ import { CLUSTER_OPTIONS, createClusterIcon, revealInCluster, type ClusterGroupL
 import RoadtripViaMarkers from './RoadtripViaMarkers'
 import PlannerWaypointMarker from './PlannerWaypointMarker'
 import HazardLayers from './HazardLayers'
-import { RouteHitBand } from './RouteHitBand'
 import { formatViaDwell } from './routeViaDwell'
 import { ALT_CASING, ALT_LABEL_TEXT } from '../Roadtrip/alternativeColors'
 import { serviceMarkerHtml, serviceMarkerOuter } from '../Roadtrip/serviceMarker'
@@ -63,8 +62,7 @@ import { poiDetailRowKey, poiDetailRows, poiPinCacheKey, poiPinParts } from './p
 import { resolveTrackColor, hasManualTrackColor } from './trackColors'
 import { SelectedTrackLine, TrackLines } from './TrackLines'
 import DawarichTrailLayer from './DawarichTrailLayer'
-import { OFM_POSITRON, DEFAULT_MAP_CENTER, DEFAULT_MAP_ZOOM, MAP_MAX_ZOOM, SATELLITE_TILE_URL, SATELLITE_TILE_MAXZOOM, AMAP_SATELLITE, attributionForTile } from '../../constants/mapDefaults'
-import { tileHealthHandlers, tourRasterBaseOf } from './tourRasterBases'
+import { OFM_POSITRON, DEFAULT_MAP_CENTER, DEFAULT_MAP_ZOOM, MAP_MAX_ZOOM, OPENTOPOMAP_TILE_URL, OPENTOPOMAP_TILE_ATTRIBUTION, OPENTOPOMAP_TILE_MAXZOOM, SATELLITE_TILE_URL, SATELLITE_TILE_MAXZOOM, AMAP_SATELLITE, attributionForTile } from '../../constants/mapDefaults'
 import { crsForBasemap } from './gcj02Crs'
 import { isGcj02Basemap, resolveBasemap } from '../../utils/tileUrl'
 import VectorBasemap from './VectorBasemap'
@@ -340,14 +338,14 @@ function PoiDropTarget({ onPoiDropOnRoute }: { onPoiDropOnRoute?: (osmId: string
 }

 // Emits the current viewport bbox on pan/zoom so the POI-explore pill can fetch
-// OSM places for the visible area, with the zoom an overlay's minimum is read against.
-function ViewportController({ onViewportChange }: { onViewportChange?: MapViewProps['onViewportChange'] }) {
+// OSM places for the visible area.
+function ViewportController({ onViewportChange }: { onViewportChange?: (b: { south: number; west: number; north: number; east: number }) => void }) {
  const map = useMap()
  useEffect(() => {
    if (!onViewportChange) return
    const emit = () => {
      const b = map.getBounds()
-      onViewportChange({ south: b.getSouth(), west: b.getWest(), north: b.getNorth(), east: b.getEast() }, map.getZoom())
+      onViewportChange({ south: b.getSouth(), west: b.getWest(), north: b.getNorth(), east: b.getEast() })
    }
    map.whenReady(emit) // ensure the first bbox is captured once the map is laid out
    map.on('moveend', emit)
@@ -840,7 +838,7 @@ export const MapView = memo(function MapView({
  const baseLayer = (viewBaseLayer ?? globalBaseLayer) as TourBaseLayer
  const hasViewBaseLayer = viewBaseLayer !== undefined && typeof onViewBaseLayerChange === 'function'
  const isSatellite = baseLayer === 'satellite'
-  const tourRaster = tourRasterBaseOf(baseLayer) // topo, OpenHikingMap or CyclOSM, the Tours planner's own
+  const isTopo = baseLayer === 'topo'
  // The caller hands over whatever the user configured; what kind of basemap
  // that is decides which layer draws it. A saved raster template still wins,
  // the default is a vector style.
@@ -852,7 +850,7 @@ export const MapView = memo(function MapView({
   * decided before the map is constructed, because Leaflet cannot change a map's
   * CRS afterwards — hence the whole map, not just the tile layer.
   */
-  const isGcjBasemap = !tourRaster && basemap.kind === 'raster' && isGcj02Basemap(basemap.url)
+  const isGcjBasemap = !isTopo && basemap.kind === 'raster' && isGcj02Basemap(basemap.url)
  const gcjCrs = useMemo(() => crsForBasemap(isGcjBasemap), [isGcjBasemap])
  const poiMarkers = useMemo(() => (pois as Poi[]).map((poi: Poi) => (
    <Marker
@@ -1117,16 +1115,17 @@ export const MapView = memo(function MapView({
          updateWhenIdle={true}
          referrerPolicy="strict-origin-when-cross-origin"
        />
-      ) : tourRaster ? (
+      ) : isTopo ? (
        <TileLayer
-          key={baseLayer}
-          url={tourRaster.url}
-          attribution={tourRaster.attribution}
-          maxNativeZoom={tourRaster.maxZoom}
+          key="topo"
+          url={OPENTOPOMAP_TILE_URL}
+          attribution={OPENTOPOMAP_TILE_ATTRIBUTION}
+          maxNativeZoom={OPENTOPOMAP_TILE_MAXZOOM}
          maxZoom={MAP_MAX_ZOOM}
-          keepBuffer={8} updateWhenZooming={false} updateWhenIdle={true}
+          keepBuffer={8}
+          updateWhenZooming={false}
+          updateWhenIdle={true}
          referrerPolicy="strict-origin-when-cross-origin"
-          eventHandlers={tileHealthHandlers(tourLayers?.baseHealth, baseLayer)}
        />
      ) : basemap.kind === 'vector' ? (
        <VectorBasemap style={basemap.style} />
@@ -1159,7 +1158,8 @@ export const MapView = memo(function MapView({
      </MarkerClusterGroup>

      {/* Apple-Maps style: darker-blue casing under a bright-blue core, rounded.
-          When the route can be reshaped an invisible band wider than both takes the click. */}
+          The casing carries the click when the route can be reshaped: it is the wider of
+          the two, so it is the one a pointer actually lands on. */}
      {route && route.length > 0 && route.flatMap((seg, i) => seg.length < 2 ? [] : routeWalking?.[i] ? [
        // Walked, so dashed and without the casing: the drive is the solid line (#2532).
        <Polyline
@@ -1173,7 +1173,15 @@ export const MapView = memo(function MapView({
          key={`${i}-casing`}
          positions={seg}
          pathOptions={{ color: routeColors?.[i]?.casing ?? '#0a5cc2', weight: 8, opacity: 1, lineCap: 'round', lineJoin: 'round' }}
-          interactive={false}
+          interactive={!!onRouteClick}
+          eventHandlers={onRouteClick ? {
+            click: (e: { latlng: { lat: number; lng: number }; originalEvent: MouseEvent }) => {
+              // Stops the map's own click, which would otherwise open the add-place menu
+              // underneath the new via.
+              e.originalEvent.stopPropagation()
+              onRouteClick(e.latlng.lat, e.latlng.lng)
+            },
+          } : undefined}
        />,
        <Polyline
          key={`${i}-core`}
@@ -1181,7 +1189,6 @@ export const MapView = memo(function MapView({
          pathOptions={{ color: routeColors?.[i]?.line ?? '#0a84ff', weight: 5, opacity: 1, lineCap: 'round', lineJoin: 'round' }}
          interactive={false}
        />,
-        ...(onRouteClick ? [<RouteHitBand key={`${i}-hit`} positions={seg} onRouteClick={onRouteClick} />] : []),
      ])}

      {/* The last bit to a place the road does not reach.
@@ -257,7 +257,6 @@ beforeEach(() => {
  glMap.querySourceFeatures.mockReturnValue([])
  glMap.getCanvas.mockImplementation(() => document.createElement('canvas'))
  glMap.getBearing.mockReturnValue(0)
-  glMap.getZoom.mockReturnValue(10)
  glMap.queryTerrainElevation.mockReturnValue(null)
  // A busy style, a refused source and a custom layer list are each set by one test
  // for the case it covers. Put back here, or every test after it would silently run
@@ -1576,6 +1575,7 @@ describe('MapViewGL', () => {
    const list = calls[calls.length - 1][0]
    act(() => { list.querySelectorAll('button')[1].click() })
    expect(onPoiClick).toHaveBeenCalledWith(other)
+    vi.mocked(glMap.getZoom).mockReturnValue(10)
  })

  const pinGlyph = (Icon: LucideIcon) => renderIconMarkup(React.createElement(Icon, { size: 13, color: 'white', strokeWidth: 2.5 }))
@@ -2215,13 +2215,13 @@ describe('MapViewGL', () => {
    expect((window as any).__trek_map).toBeUndefined()
  })

-  it('FE-COMP-MAPVIEWGL-059: pan and zoom report the visible bbox and tile zoom for the POI explore pill', async () => {
+  it('FE-COMP-MAPVIEWGL-059: pan and zoom report the visible bbox for the POI explore pill', async () => {
    const onViewportChange = vi.fn()
    render(<MapViewGL places={[]} fitKey={1} onViewportChange={onViewportChange} />)
    await act(async () => {})

    act(() => { mapHandler('moveend')() })
-    expect(onViewportChange).toHaveBeenCalledWith({ south: 0, west: 0, north: 1, east: 1 }, 11)
+    expect(onViewportChange).toHaveBeenCalledWith({ south: 0, west: 0, north: 1, east: 1 })
  })

  it('FE-COMP-MAPVIEWGL-060: a new POI or via set replaces the previous overlay markers', async () => {
@@ -8,8 +8,7 @@ import { renderIconMarkup } from '../../utils/iconMarkup'
 import type mapboxgl from 'mapbox-gl'
 import { useSettingsStore } from '../../store/settingsStore'
 import { useTranslation } from '../../i18n/TranslationContext'
-import { applyBaseLayer } from './glRasterLayers'
-import { reportGlViewport } from './glViewport'
+import { applySatellite } from './glRasterLayers'
 import { isTourLayerHit, useTourMapLayersGL } from './mapRasterOverlay'
 import { MapLayerSwitcher, TourMapLayerSwitcher, MAP_LAYER_SWITCHER_INSET, type BaseLayer, type TourBaseLayer } from './MapLayerSwitcher'
 import { MapLockPill } from './MapLockPill'
@@ -613,7 +612,7 @@ export function MapViewGL({
  const mapRef = useRef<any | null>(null)
  const hazardPopupFactory = useCallback(() => new gl.Popup({ className: 'map-tooltip trek-hazard-popup', maxWidth: '320px' }), [gl])
  useHazardLayerGL(mapRef.current, mapReady, hazards, hazardPopupFactory)
-  useTourMapLayersGL(mapReady ? readyMap : null, ferrataLayer, tourLayers)
+  useTourMapLayersGL(mapReady ? readyMap : null, ferrataLayer, tourLayers?.overlays, tourLayers?.paddle)
  // Beneath the planned route's casing, the GL twin of the Leaflet pane order.
  useDawarichTrailGL(mapRef.current, mapReady, dawarichTrack, dawarichSelectedDate, 'trip-route-casing', dawarichHiddenDates)
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1433,8 +1432,12 @@ export function MapViewGL({
      if (isTourLayerHit(map, e.point)) return // a picked via ferrata or paddle obstacle opens its card instead
      onClickRefs.current.map?.({ latlng: { lat: e.lngLat.lat, lng: e.lngLat.lng } })
    })
-    // Emit the viewport (pan/zoom + once on first idle) for the POI-explore pill.
-    const emitViewport = () => reportGlViewport(map, onViewportChangeRef.current)
+    // Emit the viewport bbox (pan/zoom + once on first idle) so the POI-explore
+    // pill can fetch OSM places for the visible area.
+    const emitViewport = () => {
+      const b = map.getBounds()
+      onViewportChangeRef.current?.({ south: b.getSouth(), west: b.getWest(), north: b.getNorth(), east: b.getEast() })
+    }
    map.on('moveend', emitViewport)
    map.once('idle', emitViewport)
    // Clear the hover card (and the anchored POI popup) as soon as the camera
@@ -2182,11 +2185,14 @@ export function MapViewGL({
  useEffect(() => {
    const map = mapRef.current
    if (!map || !mapReady) return
-    const apply = () => applyBaseLayer(map, baseLayer)
+    const apply = () => {
+      applySatellite(map, isSatellite)
+      applySatellite(map, baseLayer === 'topo', true)
+    }
    apply()
    map.on('styledata', apply)
    return () => { map.off('styledata', apply) }
-  }, [baseLayer, mapReady, glProvider])
+  }, [isSatellite, baseLayer, mapReady, glProvider])

  if (!isMapLibre && !mapboxToken) {
    return (
@@ -2,25 +2,18 @@ import L from 'leaflet';
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { Marker, Tooltip, useMap } from 'react-leaflet';
 import { MAP_LABEL_BADGE_CLASS } from './mapHoverLabel';
-import { plannerPinBadge, plannerPinShape, type PlannerPinPoint } from './plannerPinShape';
 import { wirePlannerWaypointDrag } from './plannerWaypointDrag';

 /** The pin's inline style for a size and selection; the renderer owns the colour. */
 export type PinCss = (size: number, selected: boolean) => string;

-function plannerWaypointIcon(
-  pinCss: PinCss,
-  point: PlannerPinPoint,
-  index: number,
-  selected: boolean,
-  draggable: boolean
-): L.DivIcon {
-  const { size, text } = plannerPinShape(point, index, selected);
+function plannerWaypointIcon(pinCss: PinCss, index: number, selected: boolean, draggable: boolean): L.DivIcon {
+  const size = selected ? 30 : 26;
  return L.divIcon({
    className: 'tour-planner-waypoint-marker',
    iconSize: [size, size],
    iconAnchor: [size / 2, size / 2],
-    html: `<span style="${pinCss(size, selected)};cursor:${draggable ? 'grab' : 'pointer'};touch-action:${draggable ? 'none' : 'auto'};user-select:none">${text}</span>${plannerPinBadge(point)}`,
+    html: `<span style="${pinCss(size, selected)};cursor:${draggable ? 'grab' : 'pointer'};touch-action:${draggable ? 'none' : 'auto'};user-select:none">${index + 1}</span>`,
  });
 }

@@ -32,7 +25,7 @@ export default function PlannerWaypointMarker({
  onMove,
  pinCss,
 }: {
-  point: { id: string; lat: number; lng: number; name?: string; detail?: string } & PlannerPinPoint;
+  point: { id: string; lat: number; lng: number; name?: string; detail?: string };
  index: number;
  selected: boolean;
  onClick?: (id: string) => void;
@@ -46,11 +39,7 @@ export default function PlannerWaypointMarker({
    handlersRef.current = { onClick, onMove };
  }, [onClick, onMove]);
  const position = useMemo(() => [point.lat, point.lng] as [number, number], [point.lat, point.lng]);
-  const { label, shaping, stageEnd } = point;
-  const icon = useMemo(
-    () => plannerWaypointIcon(pinCss, { label, shaping, stageEnd }, index, selected, !!onMove),
-    [index, label, onMove, pinCss, selected, shaping, stageEnd]
-  );
+  const icon = useMemo(() => plannerWaypointIcon(pinCss, index, selected, !!onMove), [index, onMove, pinCss, selected]);
  const eventHandlers = useMemo(
    () => ({
      click: (event: { originalEvent: MouseEvent }) => {
@@ -23,8 +23,6 @@ function RasterOverlaysLeaflet({ overlays }: { overlays?: readonly MapRasterOver
            maxNativeZoom={overlay.maxZoom}
            maxZoom={22}
            zIndex={OVERLAY_Z_INDEX}
-            // The page's origin as the referer, which the overlays' operators ask for (OpenSnowMap names it).
-            referrerPolicy="strict-origin-when-cross-origin"
            eventHandlers={{ tileerror: overlay.onTileError, tileload: overlay.onTileLoad }}
          />
        ))}
@@ -1,35 +0,0 @@
-import { Polyline } from 'react-leaflet';
-
-/**
- * P2A-03: an invisible band along a route segment on the Leaflet map, wider
- * than the drawn line, that takes the click which reshapes the route, as the
- * GL renderer's hit layer does: an 8 px line is too thin to aim at.
- */
-export function RouteHitBand({
-  positions,
-  onRouteClick,
-}: {
-  positions: [number, number][];
-  onRouteClick: (lat: number, lng: number) => void;
-}) {
-  return (
-    <Polyline
-      positions={positions}
-      pathOptions={{
-        color: 'transparent',
-        weight: 20,
-        opacity: 0,
-        lineCap: 'round',
-        lineJoin: 'round',
-        className: 'cursor-copy',
-      }}
-      eventHandlers={{
-        click: (e: { latlng: { lat: number; lng: number }; originalEvent: MouseEvent }) => {
-          // Stops the map's own click, which would otherwise open the add-place menu underneath the new via.
-          e.originalEvent.stopPropagation();
-          onRouteClick(e.latlng.lat, e.latlng.lng);
-        },
-      }}
-    />
-  );
-}
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import { buildDayRouteRuns, hotelBookendOf } from './dayRoutePlan'
-import { projectDayItinerary, tourStageStopsByPlace } from './dayTourProjection'
+import { projectDayItinerary } from './dayTourProjection'
 import { resolveLegMode } from '../Planner/legMode'
 import { planTripRoute, assembleTripRoute, emptyAnswers, summariseTripRoute } from './tripRouteGeometry'
 import { buildAssignment, buildDay, buildPlace, buildReservation } from '../../../tests/helpers/factories'
@@ -437,54 +437,6 @@ describe('Tour day itinerary segments', () => {
  })
 })

-// MDT-02: a day holding one stage of a multi-day tour routes to that stage and draws its stretch.
-describe('A stage of a multi-day tour on a day', () => {
-  const line: [number, number][] = [[48, 11], [48.01, 11], [48.02, 11], [48.03, 11], [48.04, 11]]
-  const stops = [
-    { key: 'stop-start', lat: 48, lng: 11 },
-    { key: 'stop-hut', lat: 48.02, lng: 11 },
-    { key: 'stop-end', lat: 48.04, lng: 11 },
-  ]
-  const hutToHut = (order: number, tour_stage_key: string | null) => {
-    const assignment = at(48, 11, order)
-    return { ...assignment, tour_place_id: assignment.place.id, tour_route_geometry: JSON.stringify(line), tour_stage_key }
-  }
-
-  it('FE-MAP-DRP-017: draws and routes to the stretch of the stage, the stops telling where it runs', () => {
-    const second = hutToHut(1, 'stop-hut')
-    const stageStops = new Map([[second.place.id, stops]])
-    expect(projectDayItinerary([second], true, [], stageStops)[0]).toMatchObject({
-      kind: 'tour', valid: true, start: { lat: 48.02, lng: 11 }, end: { lat: 48.04, lng: 11 }, geometry: line.slice(2),
-    })
-    const first = hutToHut(1, 'stop-start')
-    expect(projectDayItinerary([first], true, [], new Map([[first.place.id, stops]]))[0]).toMatchObject({
-      start: { lat: 48, lng: 11 }, end: { lat: 48.02, lng: 11 },
-    })
-    const runs = buildDayRouteRuns(1, {
-      ...inputs({ assignments: { '1': [at(47.99, 11, 0), second, at(48.05, 11, 2)] } }),
-      toursEnabled: true, tourStageStops: stageStops,
-    })
-    expect(runs.map(run => run.map(point => [point.lat, point.lng]))).toEqual([[[47.99, 11], [48.02, 11]], [[48.04, 11], [48.05, 11]]])
-  })
-
-  it('FE-MAP-DRP-018: keeps the whole tour where the stops do not tell the stage', () => {
-    const whole = hutToHut(1, null)
-    const unknown = hutToHut(1, 'stop-gone')
-    const last = hutToHut(1, 'stop-end')
-    for (const assignment of [whole, unknown, last]) {
-      expect(projectDayItinerary([assignment], true, [], new Map([[assignment.place.id, stops]]))[0]).toMatchObject({ geometry: line })
-    }
-    const noStops = hutToHut(1, 'stop-hut')
-    expect(projectDayItinerary([noStops], true)[0]).toMatchObject({ geometry: line })
-  })
-
-  it('FE-MAP-DRP-019: reads the stage stops of the multi-day tours off the tour list, none for a day tour', () => {
-    const stages = tourStageStopsByPlace([{ place_id: 4, stage_stops: stops }, { place_id: 5, stage_stops: null }, { place_id: 6 }])
-    expect([...stages.keys()]).toEqual([4])
-    expect(stages.get(4)).toBe(stops)
-  })
-})
-
 // #2600: an imported GPX/KML place sits at its track's first point, so routing it as a
 // plain stop drew a second road from the track start to the next stop, alongside the
 // track itself. Any assigned place with a track now leaves that stretch to the track.
@@ -3,7 +3,7 @@ import { getTransportRouteEndpoints, getTransportForDay, getMergedItems, isCarri
 import { getDayBookendHotels, shouldDrawMorningLeg, shouldDrawEveningLeg, type CarrierEdge } from '../../utils/dayOrder'
 import { withinDriveRange } from '@trek/shared/roadtrip'
 import type { Accommodation, AssignmentsMap, Day, Place, Reservation } from '../../types'
-import { projectedById, type TourStageStops } from './dayTourProjection'
+import { projectDayItinerary } from './dayTourProjection'

 export const TRANSPORT_TYPES = ['flight', 'train', 'bus', 'car', 'taxi', 'bicycle', 'cruise', 'ferry', 'cable_car', 'transit', 'transport_other']

@@ -41,8 +41,6 @@ export interface DayRouteInputs {
  optimizeFromAccommodation: boolean | undefined
  toursEnabled?: boolean
  places?: Place[]
-  /** MDT-02: where the stages of the trip's multi-day tours run, so a day holding one routes to it. */
-  tourStageStops?: TourStageStops
 }

 /**
@@ -85,7 +83,7 @@ export function buildDayRouteRuns(dayId: number, input: DayRouteInputs): DayRout
    days: allDays,
  })
  const merged = getMergedItems({ dayAssignments: da, dayNotes: [], dayTransports, dayId })
-  const projected = projectedById(da, input.toursEnabled ?? false, input.places, input.tourStageStops)
+  const projected = new Map(projectDayItinerary(da, input.toursEnabled ?? false, input.places).map(item => [item.assignment.id, item]))

  type Entry =
    | { kind: 'place'; id: number; lat: number; lng: number; pos: number; time: string | null; mode: string | null; incoming: string | null }
@@ -1,32 +1,5 @@
-import type { TourListItem, TourStageStop } from '@trek/shared'
 import { analyzeRouteGeometry } from '../../utils/routeGeometry'
 import type { Assignment, Place } from '../../types'
-import { vertexIndicesOf } from '../Tours/stages/tourStages'
-
-/** MDT-02: the stops each multi-day tour's stages run between, by the tour's place id. */
-export type TourStageStops = ReadonlyMap<number, readonly TourStageStop[]>
-
-/** The stage stops of the trip's multi-day tours, from the tour list; a day tour has none. */
-export function tourStageStopsByPlace(tours: readonly Pick<TourListItem, 'place_id' | 'stage_stops'>[]): TourStageStops {
-  return new Map(tours.flatMap(tour => (tour.stage_stops ? [[tour.place_id, tour.stage_stops] as const] : [])))
-}
-
-/**
- * MDT-02: the stretch of a tour's line one stage runs, from the stop it starts
- * at to the stop the next one starts at; null where the stops do not tell it
- * (a stage the tour no longer has, a line that has not reached them yet).
- */
-function stageStretch(
-  line: [number, number][],
-  stops: readonly TourStageStop[] | undefined,
-  stageKey: string | null | undefined,
-): [number, number][] | null {
-  if (!stageKey || !stops || line.length < 2) return null
-  const index = stops.findIndex(stop => stop.key === stageKey)
-  if (index < 0 || index >= stops.length - 1) return null
-  const at = vertexIndicesOf(stops, line)
-  return at[index + 1] > at[index] ? line.slice(at[index], at[index + 1] + 1) : null
-}

 export type DayItineraryItem =
  | { kind: 'stop'; assignment: Assignment }
@@ -41,17 +14,10 @@ export type DayItineraryItem =
      valid: boolean
    }

-/**
- * A day's stops with each tour projected onto its line: the day's route runs
- * to where the tour starts and on from where it ends. A day holding one stage
- * of a multi-day tour (MDT-02) runs to that stage's start and on from its end,
- * and draws that stage's stretch, where `stageStops` tells them.
- */
 export function projectDayItinerary(
  assignments: Assignment[],
  toursEnabled: boolean,
  places: readonly Place[] = [],
-  stageStops?: TourStageStops,
 ): DayItineraryItem[] {
  const placesById = new Map(places.map(place => [place.id, place]))
  return assignments.map(assignment => {
@@ -71,8 +37,7 @@ export function projectDayItinerary(
        loop: start.lat === end.lat && start.lng === end.lng, valid: true } as const
    }
    const analysis = analyzeRouteGeometry(currentPlace ? currentPlace.route_geometry : assignment.tour_route_geometry)
-    const whole = analysis?.routeCoordinates ?? []
-    const geometry = stageStretch(whole, stageStops?.get(placeId), assignment.tour_stage_key) ?? whole
+    const geometry = analysis?.routeCoordinates ?? []
    const start = geometry.length >= 2
      ? { lat: geometry[0][0], lng: geometry[0][1] }
      : assignment.place?.lat != null && assignment.place?.lng != null
@@ -85,14 +50,4 @@ export function projectDayItinerary(
      loop: !!start && !!end && start.lat === end.lat && start.lng === end.lng,
      valid: !!end } as const
  })
-}
-
-/** The day's stops projected as `projectDayItinerary` does, by assignment id, for the route that runs through them. */
-export function projectedById(
-  assignments: Assignment[],
-  toursEnabled: boolean,
-  places?: readonly Place[],
-  stageStops?: TourStageStops,
-): Map<number, DayItineraryItem> {
-  return new Map(projectDayItinerary(assignments, toursEnabled, places, stageStops).map(item => [item.assignment.id, item]))
 }
@@ -1,62 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { applyBaseLayer, rasterTileZoom, tourRasterSourceId } from './glRasterLayers';
-
-/** Enough of a GL map for the base layers: sources, layers with their visibility, and the style's order. */
-function fakeMap(styleLayers: Array<{ id: string }> = [{ id: 'water' }, { id: 'trip-route' }]) {
-  const sources = new Map<string, Record<string, unknown>>();
-  const layers = new Map<string, string>();
-  const map = {
-    getSource: vi.fn((id: string) => sources.get(id)),
-    addSource: vi.fn((id: string, source: Record<string, unknown>) => sources.set(id, source)),
-    getLayer: vi.fn((id: string) => (layers.has(id) ? { id } : undefined)),
-    addLayer: vi.fn((layer: { id: string }, _before?: string) => layers.set(layer.id, 'visible')),
-    setLayoutProperty: vi.fn((id: string, _key: string, value: string) => layers.set(id, value)),
-    getStyle: vi.fn(() => ({ layers: styleLayers })),
-  };
-  return { map, sources, layers };
-}
-
-describe('applyBaseLayer (MAP-01)', () => {
-  it('lays OpenHikingMap with its credit under the first thing TREK draws', () => {
-    const { map, sources } = fakeMap();
-    applyBaseLayer(map, 'hiking');
-    expect(tourRasterSourceId('hiking')).toBe('trip-hiking');
-    expect(sources.get('trip-hiking')).toMatchObject({
-      type: 'raster',
-      tiles: ['https://tile.openmaps.fr/openhikingmap/{z}/{x}/{y}.png'],
-      maxzoom: 18,
-    });
-    expect(String(sources.get('trip-hiking')?.attribution)).toContain('openmaps.fr/donate');
-    expect(map.addLayer).toHaveBeenCalledWith(expect.objectContaining({ id: 'trip-hiking-raster' }), 'trip-route');
-    // Nothing else is built while it is off.
-    expect(sources.has('trip-topo')).toBe(false);
-    expect(sources.has('trip-satellite')).toBe(false);
-  });
-
-  it('switching away hides it, and back shows the same layer again without a second source', () => {
-    const { map, layers } = fakeMap();
-    applyBaseLayer(map, 'hiking');
-    applyBaseLayer(map, 'topo');
-    expect(layers.get('trip-hiking-raster')).toBe('none');
-    expect(layers.get('trip-topo-raster')).toBe('visible');
-    applyBaseLayer(map, 'hiking');
-    expect(layers.get('trip-hiking-raster')).toBe('visible');
-    expect(layers.get('trip-topo-raster')).toBe('none');
-    expect(map.addSource).toHaveBeenCalledTimes(2);
-  });
-
-  it("keeps the user's own map when the style refuses the layer", () => {
-    const { map } = fakeMap();
-    map.addLayer.mockImplementation(() => {
-      throw new Error('style not loaded');
-    });
-    expect(() => applyBaseLayer(map, 'hiking')).not.toThrow();
-  });
-});
-
-describe('rasterTileZoom', () => {
-  it('puts a GL zoom on the 256 px tile scale one step further in, where a raster minimum is read', () => {
-    expect(rasterTileZoom(8)).toBe(9);
-    expect(rasterTileZoom(7.5)).toBe(8.5);
-  });
-});
@@ -1,9 +1,15 @@
-import { SATELLITE_TILE_ATTRIBUTION, SATELLITE_TILE_MAXZOOM, SATELLITE_TILE_URL } from '../../constants/mapDefaults';
-import { TOUR_RASTER_BASE_IDS, TOUR_RASTER_BASES, type TourRasterBase } from './tourRasterBases';
+import {
+  OPENTOPOMAP_TILE_ATTRIBUTION,
+  OPENTOPOMAP_TILE_MAXZOOM,
+  OPENTOPOMAP_TILE_URL,
+  SATELLITE_TILE_ATTRIBUTION,
+  SATELLITE_TILE_MAXZOOM,
+  SATELLITE_TILE_URL,
+} from '../../constants/mapDefaults';

 /*
 * The raster layers a GL map draws between its basemap style and what TREK
- * adds on top: the satellite, topo and hiking base layers, and (in mapRasterOverlay.ts)
+ * adds on top: the satellite and topo base layers, and (in mapRasterOverlay.ts)
 * the transparent overlays such as the seamarks.
 */

@@ -27,16 +33,6 @@ const SATELLITE_LAYER_ID = 'trip-satellite-raster';
 // `trip-` layer, and anchoring the imagery there painted right over them.
 export const OWN_LAYER_PREFIXES = ['trip-', 'trek-', 'route-alt-'];

-/**
- * A GL map's zoom on the 256 px tile scale that raster tile URLs, their
- * min and max zoom, and Leaflet count in. The GL engines count on 512 px
- * tiles, so the same view is one step further in on that scale, and a 256 px
- * raster source is drawn from its tiles one level up.
- */
-export function rasterTileZoom(glZoom: number): number {
-  return glZoom + 1;
-}
-
 /**
 * Puts the imagery on the map, or takes it off again.
 *
@@ -54,10 +50,9 @@ export function rasterTileZoom(glZoom: number): number {
 * yet. The catch covers that case, and `styledata` brings the pass back once it is in.
 */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function applySatellite(map: any, on: boolean, raster?: TourRasterBase): void {
-  const layerId = raster ? `trip-${raster}-raster` : SATELLITE_LAYER_ID;
-  const sourceId = raster ? tourRasterSourceId(raster) : SATELLITE_SOURCE_ID;
-  const source = raster ? TOUR_RASTER_BASES[raster] : null;
+export function applySatellite(map: any, on: boolean, topo = false): void {
+  const layerId = topo ? 'trip-topo-raster' : SATELLITE_LAYER_ID;
+  const sourceId = topo ? 'trip-topo' : SATELLITE_SOURCE_ID;
  try {
    if (map.getLayer(layerId)) {
      map.setLayoutProperty(layerId, 'visibility', on ? 'visible' : 'none');
@@ -70,10 +65,12 @@ export function applySatellite(map: any, on: boolean, raster?: TourRasterBase):
    if (!map.getSource(sourceId)) {
      map.addSource(sourceId, {
        type: 'raster',
-        tiles: source ? source.tiles : [SATELLITE_TILE_URL],
+        tiles: topo
+          ? ['a', 'b', 'c'].map((subdomain) => OPENTOPOMAP_TILE_URL.replace('{s}', subdomain))
+          : [SATELLITE_TILE_URL],
        tileSize: 256,
-        maxzoom: source ? source.maxZoom : SATELLITE_TILE_MAXZOOM,
-        attribution: source ? source.attribution : SATELLITE_TILE_ATTRIBUTION,
+        maxzoom: topo ? OPENTOPOMAP_TILE_MAXZOOM : SATELLITE_TILE_MAXZOOM,
+        attribution: topo ? OPENTOPOMAP_TILE_ATTRIBUTION : SATELLITE_TILE_ATTRIBUTION,
      });
    }
    // Under the first thing TREK draws, over everything the basemap style draws.
@@ -93,14 +90,3 @@ export function applySatellite(map: any, on: boolean, raster?: TourRasterBase):
    /* a style that refuses the layer keeps the plain basemap */
  }
 }
-
-/** The GL source a Tours raster base map is drawn from, which its tile events name. */
-export function tourRasterSourceId(raster: TourRasterBase): string {
-  return `trip-${raster}`;
-}
-
-/** The base layer on a GL map: the imagery, a Tours raster map, or neither over the user's own style. */
-export function applyBaseLayer(map: Parameters<typeof applySatellite>[0], baseLayer: string): void {
-  applySatellite(map, baseLayer === 'satellite');
-  for (const raster of TOUR_RASTER_BASE_IDS) applySatellite(map, baseLayer === raster, raster);
-}
@@ -1,35 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { reportGlViewport } from './glViewport';
-
-/** A GL map showing the given box at the given zoom, or no box yet. */
-function fakeMap(zoom: number, box: { south: number; west: number; north: number; east: number } | null) {
-  const bounds = box && {
-    getSouth: () => box.south,
-    getWest: () => box.west,
-    getNorth: () => box.north,
-    getEast: () => box.east,
-  };
-  return { getBounds: () => bounds, getZoom: () => zoom };
-}
-
-describe('reportGlViewport', () => {
-  it('reports the visible box with the zoom on the raster tile scale', () => {
-    const report = vi.fn();
-    reportGlViewport(fakeMap(10, { south: 47, west: 11, north: 48, east: 12 }), report);
-    // The GL engine counts on 512 px tiles; a raster tile's zoom is one step further in.
-    expect(report).toHaveBeenCalledWith({ south: 47, west: 11, north: 48, east: 12 }, 11);
-  });
-
-  it('says nothing while the map has no bounds yet', () => {
-    const report = vi.fn();
-    reportGlViewport(fakeMap(10, null), report);
-    expect(report).not.toHaveBeenCalled();
-  });
-
-  it('asks nothing of the map when no one listens', () => {
-    const map = fakeMap(10, { south: 47, west: 11, north: 48, east: 12 });
-    const getZoom = vi.spyOn(map, 'getZoom');
-    reportGlViewport(map, undefined);
-    expect(getZoom).not.toHaveBeenCalled();
-  });
-});
@@ -1,21 +0,0 @@
-import { rasterTileZoom } from './glRasterLayers';
-import type { MapViewProps } from './mapViewContract';
-
-/** Enough of a GL map to say what it shows: its bounds and its zoom. */
-interface ViewportSource {
-  getBounds(): { getSouth(): number; getWest(): number; getNorth(): number; getEast(): number } | null;
-  getZoom(): number;
-}
-
-/**
- * Tells the page what a GL map shows, so the POI explore pill can fetch the
- * OSM places of the visible area: its bounds, and its zoom on the raster tile
- * scale Leaflet reports too, so both maps ask for the same places at the
- * same view. A map without bounds yet says nothing.
- */
-export function reportGlViewport(map: ViewportSource, report: MapViewProps['onViewportChange']): void {
-  const bounds = map.getBounds();
-  if (!report || !bounds) return;
-  const bbox = { south: bounds.getSouth(), west: bounds.getWest(), north: bounds.getNorth(), east: bounds.getEast() };
-  report(bbox, rasterTileZoom(map.getZoom()));
-}
@@ -1,11 +1,6 @@
 import { renderHook } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
-import {
-  useRasterOverlaysGL,
-  useSourceTileHealthGL,
-  type MapRasterOverlay,
-  type RasterOverlayGlMap,
-} from './mapRasterOverlay';
+import { useRasterOverlaysGL, type MapRasterOverlay, type RasterOverlayGlMap } from './mapRasterOverlay';

 type Handler = (event: Record<string, unknown>) => void;

@@ -108,27 +103,3 @@ describe('useRasterOverlaysGL', () => {
    expect(map.on).not.toHaveBeenCalled();
  });
 });
-
-describe('useSourceTileHealthGL (MAP-01)', () => {
-  it("reports one source's failed and arrived tiles into its health, nothing else's", () => {
-    const { gl, fire } = fakeMap();
-    const health = { down: false, onTileError: vi.fn(), onTileLoad: vi.fn() };
-    renderHook(() => useSourceTileHealthGL(gl, 'trip-hiking', health));
-    fire('error', { sourceId: 'trip-hiking', error: new Error('503') });
-    fire('error', { sourceId: 'trip-topo', error: new Error('503') });
-    fire('sourcedata', { sourceId: 'trip-hiking', tile: {} });
-    fire('sourcedata', { sourceId: 'trip-hiking' });
-    expect(health.onTileError).toHaveBeenCalledTimes(1);
-    expect(health.onTileLoad).toHaveBeenCalledTimes(1);
-  });
-
-  it('listens to nothing while the map is not shown, and lets go when it goes', () => {
-    const { map, gl } = fakeMap();
-    const health = { down: false, onTileError: vi.fn(), onTileLoad: vi.fn() };
-    renderHook(() => useSourceTileHealthGL(gl, 'trip-hiking', undefined));
-    expect(map.on).not.toHaveBeenCalled();
-    const { unmount } = renderHook(() => useSourceTileHealthGL(gl, 'trip-hiking', health));
-    unmount();
-    expect(map.off).toHaveBeenCalledTimes(2);
-  });
-});
@@ -4,8 +4,7 @@ import { isFerrataHit, useFerrataMapLayerGL } from '../Ferratas/useFerrataLayerG
 import type { FerrataMapLayer } from '../Ferratas/useFerrataMapLayer';
 import type { PaddleMapLayer } from '../Tours/paddle/paddleMapLayer';
 import { isPaddleHit, type PaddleGlMap, usePaddleLayerGL } from '../Tours/paddle/usePaddleLayerGL';
-import { OWN_LAYER_PREFIXES, tourRasterSourceId } from './glRasterLayers';
-import type { BaseMapHealth, TileHealth } from './tourRasterBases';
+import { OWN_LAYER_PREFIXES } from './glRasterLayers';

 /**
 * A transparent raster layer laid over the basemap and under the route, such
@@ -31,8 +30,6 @@ type RasterOverlayStatus = 'off' | 'on' | 'down';
 /** An overlay with its switch: whether it is on, and whether its source stopped answering. */
 export interface ToggleableRasterOverlay extends MapRasterOverlay {
  status: RasterOverlayStatus;
-  /** On, but the map is further out than its first tiles, so nothing of it is drawn yet. */
-  belowMinZoom: boolean;
  onToggle: () => void;
 }

@@ -107,47 +104,16 @@ export function useRasterOverlaysGL(map: RasterOverlayGlMap | null, overlays: re
  }, [map, overlays]);
 }

-/**
- * Reports the tiles of one GL source into its health while `health` is given:
- * a failure carries the source it came from, an arrival a tile. The base layer
- * itself is drawn by applyBaseLayer.
- */
-export function useSourceTileHealthGL(
-  map: RasterOverlayGlMap | null,
-  sourceId: string,
-  health: TileHealth | undefined
-) {
-  const { onTileError, onTileLoad } = health ?? {};
-  useEffect(() => {
-    if (!map || !onTileError || !onTileLoad) return;
-    const failed = (event: { error?: Error; sourceId?: string }) => {
-      if (event.sourceId === sourceId) onTileError();
-    };
-    const loaded = (event: { sourceId?: string; tile?: unknown }) => {
-      if (event.sourceId === sourceId && event.tile) onTileLoad();
-    };
-    map.on('error', failed);
-    map.on('sourcedata', loaded);
-    return () => {
-      map.off('error', failed);
-      map.off('sourcedata', loaded);
-    };
-  }, [map, sourceId, onTileError, onTileLoad]);
-}
-
-/**
- * The tour planner's layers on a GL map: the via ferratas, the raster overlays its type offers,
- * the paddle obstacles, and whether the map on terms (OpenHikingMap, CyclOSM) answers while it is the base map.
- */
+/** The tour planner's layers on a GL map: the via ferratas, the raster overlays its type offers and the paddle obstacles. */
 export function useTourMapLayersGL(
  map: RasterOverlayGlMap | null,
  ferrataLayer: FerrataMapLayer | undefined,
-  layers: { overlays?: readonly MapRasterOverlay[]; paddle?: PaddleMapLayer; baseHealth?: BaseMapHealth } | undefined
+  overlays: readonly MapRasterOverlay[] | undefined,
+  paddle?: PaddleMapLayer
 ) {
  useFerrataMapLayerGL(map, ferrataLayer);
-  useRasterOverlaysGL(map, layers?.overlays);
-  usePaddleLayerGL(map as unknown as PaddleGlMap | null, layers?.paddle);
-  useSourceTileHealthGL(map, tourRasterSourceId(layers?.baseHealth?.base ?? 'hiking'), layers?.baseHealth);
+  useRasterOverlaysGL(map, overlays);
+  usePaddleLayerGL(map as unknown as PaddleGlMap | null, paddle);
 }

 /**
@@ -110,17 +110,7 @@ export interface MapViewProps {
  onHighlightAlternative?: (index: number | null) => void;
  /** Generic numbered control points for list-first route editors. */
  /** `name` and `detail` (its role) show on hover; without a name the pin is named by its number. */
-  plannerWaypoints?: Array<{
-    id: string;
-    lat: number;
-    lng: number;
-    name?: string;
-    detail?: string;
-    label?: string;
-    shaping?: boolean;
-    /** MDT-01: a stage of a multi-day tour ends here; the pin carries a moon at its corner. */
-    stageEnd?: boolean;
-  }>;
+  plannerWaypoints?: Array<{ id: string; lat: number; lng: number; name?: string; detail?: string }>;
  selectedPlannerWaypointId?: string | null;
  onPlannerWaypointClick?: (id: string) => void;
  /** Drops a dragged control point; returns false when the move was refused. */
@@ -182,11 +172,7 @@ export interface MapViewProps {
  roadtripVias?: Record<number, RoadtripVia[]>;
  onMoveVia?: (dayId: number, id: number, lat: number, lng: number) => void;
  onRemoveVia?: (dayId: number, id: number) => void;
-  /**
-   * The visible area after every move, and the zoom on the 256 px tile scale
-   * raster tile URLs count in (a GL map's own zoom is one step lower there).
-   */
-  onViewportChange?: (bbox: { south: number; west: number; north: number; east: number }, zoom: number) => void;
+  onViewportChange?: (bbox: { south: number; west: number; north: number; east: number }) => void;
  /**
   * The raster tile URL template. Only the Leaflet renderer draws raster tiles;
   * the GL renderer draws the style of the chosen provider and ignores it.
@@ -1,22 +0,0 @@
-// FE-PLANNER-PIN-001: a stop is a numbered pin, a shaping point a small dot without a number (P2A-03).
-// FE-PLANNER-PIN-002: the stop where a stage of a multi-day tour ends carries the moon at its corner (MDT-01).
-import { describe, expect, it } from 'vitest';
-import { plannerPinBadge, plannerPinShape } from './plannerPinShape';
-
-describe('plannerPinShape', () => {
-  it('FE-PLANNER-PIN-001: numbers a stop by its label or its place, and leaves a shaping point blank and small', () => {
-    expect(plannerPinShape({}, 2, false)).toEqual({ size: 26, text: '3' });
-    expect(plannerPinShape({ label: '2' }, 4, true)).toEqual({ size: 30, text: '2' });
-    expect(plannerPinShape({ shaping: true, label: '9' }, 1, false)).toEqual({ size: 14, text: '' });
-    expect(plannerPinShape({ shaping: true }, 1, true)).toEqual({ size: 18, text: '' });
-  });
-
-  it('FE-PLANNER-PIN-002: marks a stage end with the moon at the corner, and nothing else', () => {
-    const badge = plannerPinBadge({ stageEnd: true, label: '3' });
-    expect(badge).toContain('data-stage-end="true"');
-    expect(badge).toContain('<svg');
-    expect(badge).toContain('inset-inline-end');
-    expect(plannerPinBadge({ label: '3' })).toBe('');
-    expect(plannerPinBadge({ stageEnd: true, shaping: true })).toBe('');
-  });
-});
@@ -1,34 +0,0 @@
-import { Moon } from 'lucide-react';
-import { createElement } from 'react';
-import { renderIconMarkup } from '../../utils/iconMarkup';
-
-/** What a planner pin shows: its stop number, or (P2A-03) nothing on a shaping point, which only steers the route. */
-export interface PlannerPinPoint {
-  /** The stop number to print; shaping points do not count, so stops keep their numbers. */
-  label?: string;
-  shaping?: boolean;
-  /** MDT-01: a stage of a multi-day tour ends at this stop. */
-  stageEnd?: boolean;
-}
-
-/** A stop is a numbered pin; a shaping point a small dot of the same colour, without a number. */
-export function plannerPinShape(
-  point: PlannerPinPoint,
-  index: number,
-  selected: boolean
-): { size: number; text: string } {
-  if (point.shaping) return { size: selected ? 18 : 14, text: '' };
-  return { size: selected ? 30 : 26, text: point.label ?? String(index + 1) };
-}
-
-const MOON = renderIconMarkup(createElement(Moon, { size: 9, strokeWidth: 2.6, 'aria-hidden': true }));
-
-/**
- * MDT-01: the moon at the corner of a pin where a stage ends, the night
- * between two days of the tour, as the planner's list marks the stop's number.
- * Laid over the pin, so it needs no room of its own and moves with it.
- */
-export function plannerPinBadge(point: PlannerPinPoint): string {
-  if (!point.stageEnd || point.shaping) return '';
-  return `<span data-stage-end="true" aria-hidden="true" style="position:absolute;bottom:-4px;inset-inline-end:-4px;display:grid;place-items:center;width:15px;height:15px;border-radius:9999px;background:var(--bg-card);color:var(--text-primary);box-shadow:var(--shadow-sm);pointer-events:none">${MOON}</span>`;
-}
@@ -1,5 +1,4 @@
-import { Utensils, Coffee, Wine, BedDouble, Camera, Landmark, Trees, Ticket, Fuel, Zap, ParkingSquare, Tent, Binoculars, Mountain, Warehouse, Droplet, Toilet, Sandwich, Anchor, Sailboat, Wrench, Store, type LucideIcon } from 'lucide-react'
-import type { TourPoiCategory } from '@trek/shared'
+import { Utensils, Coffee, Wine, BedDouble, Camera, Landmark, Trees, Ticket, Fuel, Zap, ParkingSquare, Tent, type LucideIcon } from 'lucide-react'
 import { parsePluginPoiCategoryKey, type PluginPoiDetail } from '@trek/shared'
 // The road-trip kinds take their colour from the one place that defines it, so the
 // search result, the map pin and the road-trip rail cannot drift apart.
@@ -41,41 +40,9 @@ export const ROADTRIP_POI_CATEGORIES: PoiCategory[] = CORRIDOR_CATEGORIES.map(
  ({ key, labelKey, Icon, color }) => ({ key, labelKey, Icon, color }),
 )

-const CORE_COLOR = new Map(POI_CATEGORIES.map(c => [c.key, c.color] as const))
-const coreColor = (key: string) => CORE_COLOR.get(key) ?? POI_DEFAULT_COLOR
-
-/**
- * What a hike, a ride or a paddle tour stops for (PLN-02), searched along a tour in the
- * planner and drawn on its map. Each takes the colour of the explore category
- * it is closest to, so the map keeps one palette.
- */
-export const TOUR_POI_LOOKS: Record<TourPoiCategory, PoiCategory> = {
-  viewpoint: { key: 'viewpoint', labelKey: 'tours.poi.cat.viewpoint', Icon: Binoculars, color: coreColor('sights') },
-  peak: { key: 'peak', labelKey: 'tours.poi.cat.peak', Icon: Mountain, color: coreColor('nature') },
-  shelter: { key: 'shelter', labelKey: 'tours.poi.cat.shelter', Icon: Warehouse, color: HOTEL_COLOR },
-  drinking_water: { key: 'drinking_water', labelKey: 'tours.poi.cat.drinking_water', Icon: Droplet, color: coreColor('museum') },
-  food: { key: 'food', labelKey: 'tours.poi.cat.food', Icon: Utensils, color: coreColor('restaurant') },
-  toilets: { key: 'toilets', labelKey: 'tours.poi.cat.toilets', Icon: Toilet, color: coreColor('bar') },
-  picnic: { key: 'picnic', labelKey: 'tours.poi.cat.picnic', Icon: Sandwich, color: coreColor('nature') },
-  campsite: { key: 'campsite', labelKey: 'tours.poi.cat.campsite', Icon: Tent, color: coreColor('activity') },
-  sights: { key: 'sights', labelKey: 'tours.poi.cat.sights', Icon: Camera, color: coreColor('sights') },
-  slipway: { key: 'slipway', labelKey: 'tours.poi.cat.slipway', Icon: Anchor, color: coreColor('museum') },
-  boat_rental: { key: 'boat_rental', labelKey: 'tours.poi.cat.boat_rental', Icon: Sailboat, color: coreColor('cafe') },
-  bike_repair: { key: 'bike_repair', labelKey: 'tours.poi.cat.bike_repair', Icon: Wrench, color: coreColor('activity') },
-  // CW-05: a city walk's own, each in the colour of the explore category it comes from.
-  museum: { key: 'museum', labelKey: 'tours.poi.cat.museum', Icon: Landmark, color: coreColor('museum') },
-  park: { key: 'park', labelKey: 'tours.poi.cat.park', Icon: Trees, color: coreColor('nature') },
-  cafe: { key: 'cafe', labelKey: 'tours.poi.cat.cafe', Icon: Coffee, color: coreColor('cafe') },
-  restaurant: { key: 'restaurant', labelKey: 'tours.poi.cat.restaurant', Icon: Utensils, color: coreColor('restaurant') },
-  market: { key: 'market', labelKey: 'tours.poi.cat.market', Icon: Store, color: coreColor('shopping') },
-}
-
 // A Map rather than an object, so a category named after an Object.prototype member
-// (`constructor`, `toString`) finds nothing rather than a function. A Tours category
-// that shares a key with an explore one (`sights`, `campsite`) keeps the explore look.
-const CATEGORY_BY_KEY = new Map(
-  [...Object.values(TOUR_POI_LOOKS), ...POI_CATEGORIES, ...ROADTRIP_POI_CATEGORIES].map(c => [c.key, c] as const),
-)
+// (`constructor`, `toString`) finds nothing rather than a function.
+const CATEGORY_BY_KEY = new Map([...POI_CATEGORIES, ...ROADTRIP_POI_CATEGORIES].map(c => [c.key, c] as const))

 // One POI result from /api/maps/pois (mirror of the server's OverpassPoi).
 export interface Poi {
@@ -1,85 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { calculateRouteWithLegs, RoutingRefusedError } from './RouteCalculator';
-import { calculateRouteWithRetries, ROUTE_RETRY_DELAYS_MS } from './routeRetry';
-
-vi.mock('./RouteCalculator', async (importActual) => {
-  const actual = await importActual<typeof import('./RouteCalculator')>();
-  return { ...actual, calculateRouteWithLegs: vi.fn() };
-});
-
-const WAYPOINTS = [
-  { lat: 47.5, lng: 19.04 },
-  { lat: 47.49, lng: 19.05 },
-];
-const ROUTED = {
-  coordinates: [
-    [47.5, 19.04],
-    [47.49, 19.05],
-  ],
-  legs: [],
-} as unknown as Awaited<ReturnType<typeof calculateRouteWithLegs>>;
-
-beforeEach(() => {
-  vi.useFakeTimers();
-  vi.mocked(calculateRouteWithLegs).mockReset();
-});
-afterEach(() => vi.useRealTimers());
-
-describe('calculateRouteWithRetries', () => {
-  it('waits out a rate limit and answers with the road (Discord, 16.10.2026)', async () => {
-    vi.mocked(calculateRouteWithLegs)
-      .mockRejectedValueOnce(new RoutingRefusedError(429, null))
-      .mockResolvedValueOnce(ROUTED);
-
-    const answer = calculateRouteWithRetries(WAYPOINTS, { profile: 'driving' });
-    await vi.advanceTimersByTimeAsync(ROUTE_RETRY_DELAYS_MS[0]);
-
-    await expect(answer).resolves.toBe(ROUTED);
-    expect(calculateRouteWithLegs).toHaveBeenCalledTimes(2);
-  });
-
-  it('waits as long as the host asks when that is longer', async () => {
-    vi.mocked(calculateRouteWithLegs)
-      .mockRejectedValueOnce(new RoutingRefusedError(503, 3000))
-      .mockResolvedValueOnce(ROUTED);
-
-    const answer = calculateRouteWithRetries(WAYPOINTS, {});
-    await vi.advanceTimersByTimeAsync(ROUTE_RETRY_DELAYS_MS[0]);
-    expect(calculateRouteWithLegs).toHaveBeenCalledTimes(1);
-    await vi.advanceTimersByTimeAsync(3000 - ROUTE_RETRY_DELAYS_MS[0]);
-
-    await expect(answer).resolves.toBe(ROUTED);
-  });
-
-  it('gives up after the last delay and throws the refusal', async () => {
-    vi.mocked(calculateRouteWithLegs).mockRejectedValue(new RoutingRefusedError(429, null));
-
-    const answer = calculateRouteWithRetries(WAYPOINTS, {});
-    const settled = expect(answer).rejects.toBeInstanceOf(RoutingRefusedError);
-    for (const ms of ROUTE_RETRY_DELAYS_MS) await vi.advanceTimersByTimeAsync(ms);
-
-    await settled;
-    expect(calculateRouteWithLegs).toHaveBeenCalledTimes(ROUTE_RETRY_DELAYS_MS.length + 1);
-  });
-
-  it('throws a refusal the host meant at once', async () => {
-    vi.mocked(calculateRouteWithLegs).mockRejectedValue(new RoutingRefusedError(400, null));
-
-    await expect(calculateRouteWithRetries(WAYPOINTS, {})).rejects.toBeInstanceOf(RoutingRefusedError);
-    expect(calculateRouteWithLegs).toHaveBeenCalledTimes(1);
-  });
-
-  it('stops waiting when the day changes', async () => {
-    const controller = new AbortController();
-    vi.mocked(calculateRouteWithLegs)
-      .mockRejectedValueOnce(new RoutingRefusedError(429, null))
-      .mockRejectedValueOnce(new DOMException('aborted', 'AbortError'));
-
-    const answer = calculateRouteWithRetries(WAYPOINTS, { signal: controller.signal });
-    const settled = expect(answer).rejects.toMatchObject({ name: 'AbortError' });
-    await vi.advanceTimersByTimeAsync(10);
-    controller.abort();
-
-    await settled;
-  });
-});
@@ -1,48 +0,0 @@
-import { calculateRouteWithLegs, RoutingRefusedError } from './RouteCalculator';
-
-// The profile a caller hands in, so a hook routing through here needs nothing else from Map/.
-export type { RouteProfileKey } from './RouteCalculator';
-
-/** How often a rate-limited route is asked for again, and how long after. */
-export const ROUTE_RETRY_DELAYS_MS = [1500, 4000];
-
-/** A pause that ends early, without throwing, when the signal aborts. */
-export const sleepUnlessAborted = (ms: number, signal?: AbortSignal): Promise<void> =>
-  new Promise((resolve) => {
-    if (signal?.aborted || ms <= 0) {
-      resolve();
-      return;
-    }
-    const timer = setTimeout(done, ms);
-    function done(): void {
-      clearTimeout(timer);
-      signal?.removeEventListener('abort', done);
-      resolve();
-    }
-    signal?.addEventListener('abort', done, { once: true });
-  });
-
-/**
- * `calculateRouteWithLegs`, asked again while the host says it is busy.
- *
- * The public OSRM hosts allow about one request a second and answer 429 above that. A
- * day with a change of mode, or a quick switch between days, asks more often than that,
- * and the day route used to give up on the first refusal and keep its straight lines
- * until the next edit (reported on Discord, 16.10.2026). A rate limit is waited out, for
- * as long as the host asks when it says; a refusal the host meant is thrown at once,
- * because the same request earns the same answer. An abort ends the wait, and the next
- * attempt then throws the AbortError the caller already handles.
- */
-export async function calculateRouteWithRetries(
-  ...[waypoints, opts]: Parameters<typeof calculateRouteWithLegs>
-): ReturnType<typeof calculateRouteWithLegs> {
-  for (let attempt = 0; ; attempt++) {
-    try {
-      return await calculateRouteWithLegs(waypoints, opts);
-    } catch (err) {
-      const rateLimit = err instanceof RoutingRefusedError && err.isRateLimit ? err : null;
-      if (!rateLimit || attempt >= ROUTE_RETRY_DELAYS_MS.length || opts?.signal?.aborted) throw err;
-      await sleepUnlessAborted(Math.max(ROUTE_RETRY_DELAYS_MS[attempt], rateLimit.retryAfterMs ?? 0), opts?.signal);
-    }
-  }
-}
@@ -1,38 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { isOnTermsBase, tileHealthHandlers, TOUR_RASTER_BASES, tourRasterBaseOf } from './tourRasterBases';
-
-// FE-MAP-TOURBASES-001 to FE-MAP-TOURBASES-003
-
-describe('tourRasterBases (MAP-01, BIK-06)', () => {
-  it('FE-MAP-TOURBASES-001: knows topo, OpenHikingMap and CyclOSM, CyclOSM on its three shards', () => {
-    expect(tourRasterBaseOf('topo')).toBe(TOUR_RASTER_BASES.topo);
-    expect(tourRasterBaseOf('cycle')?.tiles).toEqual([
-      'https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
-      'https://b.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
-      'https://c.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
-    ]);
-    expect(tourRasterBaseOf('cycle')?.maxZoom).toBe(20);
-    expect(tourRasterBaseOf('satellite')).toBeNull();
-    // Inherited names are no base map.
-    expect(tourRasterBaseOf('toString')).toBeNull();
-  });
-
-  it('FE-MAP-TOURBASES-002: the maps on terms carry their credit; topo is no map on terms', () => {
-    expect(isOnTermsBase('hiking')).toBe(true);
-    expect(isOnTermsBase('cycle')).toBe(true);
-    expect(isOnTermsBase('topo')).toBe(false);
-    expect(isOnTermsBase('default')).toBe(false);
-    expect(TOUR_RASTER_BASES.cycle.onTerms?.credit.map((part) => part.href)).toEqual([
-      'https://www.cyclosm.org',
-      'https://www.openstreetmap.org/copyright',
-    ]);
-    expect(TOUR_RASTER_BASES.hiking.onTerms?.credit).toHaveLength(3);
-  });
-
-  it('FE-MAP-TOURBASES-003: a Leaflet layer reports into the health of the map watched, and only of that one', () => {
-    const health = { base: 'cycle' as const, down: false, onTileError: vi.fn(), onTileLoad: vi.fn() };
-    expect(tileHealthHandlers(health, 'cycle')).toEqual({ tileerror: health.onTileError, tileload: health.onTileLoad });
-    expect(tileHealthHandlers(health, 'hiking')).toBeUndefined();
-    expect(tileHealthHandlers(undefined, 'cycle')).toBeUndefined();
-  });
-});
@@ -1,98 +0,0 @@
-import {
-  CYCLOSM_TILE_ATTRIBUTION,
-  CYCLOSM_TILE_MAXZOOM,
-  CYCLOSM_TILE_URL,
-  OPENHIKINGMAP_TILE_ATTRIBUTION,
-  OPENHIKINGMAP_TILE_MAXZOOM,
-  OPENHIKINGMAP_TILE_URL,
-  OPENTOPOMAP_TILE_ATTRIBUTION,
-  OPENTOPOMAP_TILE_MAXZOOM,
-  OPENTOPOMAP_TILE_URL,
-} from '../../constants/mapDefaults';
-
-/** The raster base maps only the Tours planner offers, drawn the same way by Leaflet, GL and the 3D map. */
-export type TourRasterBase = 'topo' | 'hiking' | 'cycle';
-
-export interface TourRasterBaseSource {
-  /** The Leaflet template; `{s}` is a shard Leaflet fills in. */
-  url: string;
-  /** The same tiles spelled out for a GL source, which knows no shards. */
-  tiles: string[];
-  attribution: string;
-  maxZoom: number;
-  /**
-   * A map its operator offers on terms (MAP-01, BIK-06): loaded only as viewed, never
-   * prefetched or kept offline, its credit readable without a click, and watched for whether it
-   * answers. `credit` is what the 3D map shows above its controls.
-   */
-  onTerms?: { credit: ReadonlyArray<{ label: string; href: string }> };
-}
-
-export const TOUR_RASTER_BASES: Record<TourRasterBase, TourRasterBaseSource> = {
-  topo: {
-    url: OPENTOPOMAP_TILE_URL,
-    tiles: ['a', 'b', 'c'].map((shard) => OPENTOPOMAP_TILE_URL.replace('{s}', shard)),
-    attribution: OPENTOPOMAP_TILE_ATTRIBUTION,
-    maxZoom: OPENTOPOMAP_TILE_MAXZOOM,
-  },
-  hiking: {
-    url: OPENHIKINGMAP_TILE_URL,
-    tiles: [OPENHIKINGMAP_TILE_URL],
-    attribution: OPENHIKINGMAP_TILE_ATTRIBUTION,
-    maxZoom: OPENHIKINGMAP_TILE_MAXZOOM,
-    onTerms: {
-      credit: [
-        { label: '\u00a9 OpenHikingMap', href: 'https://wiki.openstreetmap.org/wiki/OpenHikingMap' },
-        { label: '\u00a9 OpenStreetMap', href: 'https://www.openstreetmap.org/copyright' },
-        { label: '\u2764\ufe0f Donation', href: 'https://openmaps.fr/donate' },
-      ],
-    },
-  },
-  cycle: {
-    url: CYCLOSM_TILE_URL,
-    tiles: ['a', 'b', 'c'].map((shard) => CYCLOSM_TILE_URL.replace('{s}', shard)),
-    attribution: CYCLOSM_TILE_ATTRIBUTION,
-    maxZoom: CYCLOSM_TILE_MAXZOOM,
-    onTerms: {
-      credit: [
-        { label: '\u00a9 CyclOSM', href: 'https://www.cyclosm.org' },
-        { label: '\u00a9 OpenStreetMap', href: 'https://www.openstreetmap.org/copyright' },
-      ],
-    },
-  },
-};
-
-export const TOUR_RASTER_BASE_IDS = Object.keys(TOUR_RASTER_BASES) as TourRasterBase[];
-
-/** The raster source of a base layer, or null for the user's own map and the imagery. */
-export function tourRasterBaseOf(layer: string): TourRasterBaseSource | null {
-  return Object.prototype.hasOwnProperty.call(TOUR_RASTER_BASES, layer)
-    ? TOUR_RASTER_BASES[layer as TourRasterBase]
-    : null;
-}
-
-/** Whether the layer is a map its operator offers on terms (OpenHikingMap, CyclOSM). */
-export function isOnTermsBase(layer: string): layer is TourRasterBase {
-  return !!tourRasterBaseOf(layer)?.onTerms;
-}
-
-/**
- * Whether a best-effort tile source still answers: a run of failed tiles marks
- * it down, one tile arriving clears that. The maps report into it, the switch
- * shows it.
- */
-export interface TileHealth {
-  down: boolean;
-  onTileError: () => void;
-  onTileLoad: () => void;
-}
-
-/** The health of the map on terms that is the base map now, with which one it is. */
-export interface BaseMapHealth extends TileHealth {
-  base: TourRasterBase;
-}
-
-/** A Leaflet tile layer's events that report into the health of `layer`, while it is the map watched. */
-export function tileHealthHandlers(health: BaseMapHealth | undefined, layer: string) {
-  return health?.base === layer ? { tileerror: health.onTileError, tileload: health.onTileLoad } : undefined;
-}
@@ -1,5 +1,4 @@
-import type { RouteProfileKey } from './RouteCalculator'
-import { calculateRouteWithRetries, sleepUnlessAborted as sleep } from './routeRetry'
+import { calculateRouteWithLegs, RoutingRefusedError, type RouteProfileKey } from './RouteCalculator'
 import { buildDayRouteRuns, type DayRouteInputs, type DayRoutePoint } from './dayRoutePlan'
 import { dayViaLookup, foldViaLegs, threadVias, viasOnDayLeg, type DayViaLookup } from '../../utils/dayRouteVias'
 import { projectDayItinerary } from './dayTourProjection'
@@ -107,7 +106,6 @@ export function planTripRoute(input: TripRouteInputs, profile: RouteProfileKey):
        (input.assignments[String(day.id)] ?? []).filter(assignment => assignment.accommodation_id == null),
        input.toursEnabled ?? false,
        input.places,
-        input.tourStageStops,
      ).flatMap(item => item.kind === 'tour' && item.geometry.length >= 2 ? [item.geometry] : []),
    }))
    .filter(entry => entry.runs.length > 0 || entry.tourLines.length > 0)
@@ -187,6 +185,20 @@ export function summariseTripRoute(days: TripOverviewDay[]): TripRouteSummary {
 const REQUEST_SPACING_MS = 1100
 /** Anything answered faster than this came out of RouteCalculator's cache, not the network. */
 const CACHE_HIT_MS = 60
+/** How often a rate-limited leg is tried again, and how long after. */
+const RETRY_DELAYS_MS = [1500, 4000]
+
+const sleep = (ms: number, signal?: AbortSignal): Promise<void> =>
+  new Promise(resolve => {
+    if (signal?.aborted || ms <= 0) { resolve(); return }
+    const timer = setTimeout(done, ms)
+    function done(): void {
+      clearTimeout(timer)
+      signal?.removeEventListener('abort', done)
+      resolve()
+    }
+    signal?.addEventListener('abort', done, { once: true })
+  })

 /**
 * Ask the router for every leg of every day, one at a time.
@@ -221,16 +233,23 @@ export async function routeTripLegs(
    runs.forEach((chunks, r) => {
      chunks.forEach((chunk, c) => {
        tasks.push(async () => {
-          if (signal?.aborted) return
-          try {
-            const answer = await calculateRouteWithRetries(
-              chunk.waypoints,
-              { signal, profile: chunk.mode, tripId, dayId: day.id },
-            )
-            routed[d][r][c] = { coordinates: answer.coordinates, legs: foldViaLegs(answer.legs, chunk.stopAt, unit) }
-            onAnswer?.(routed)
-          } catch {
-            // Refused for good, or aborted: the leg keeps its straight line.
+          for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt++) {
+            if (signal?.aborted) return
+            try {
+              const answer = await calculateRouteWithLegs(
+                chunk.waypoints,
+                { signal, profile: chunk.mode, tripId, dayId: day.id },
+              )
+              routed[d][r][c] = { coordinates: answer.coordinates, legs: foldViaLegs(answer.legs, chunk.stopAt, unit) }
+              onAnswer?.(routed)
+              return
+            } catch (err) {
+              if (signal?.aborted) return
+              const rateLimit = err instanceof RoutingRefusedError && err.isRateLimit ? err : null
+              if (!rateLimit || attempt === RETRY_DELAYS_MS.length) return
+              // When the host says how long to wait, waiting less is just a second refusal.
+              await sleep(Math.max(RETRY_DELAYS_MS[attempt], rateLimit.retryAfterMs ?? 0), signal)
+            }
          }
        })
      })
@@ -1,35 +0,0 @@
-// FE-PLANNER-PIN-GL-001: the GL map's planner pins carry the moon where a stage of a multi-day tour ends (MDT-01).
-import { renderHook } from '@testing-library/react';
-import { describe, expect, it, vi } from 'vitest';
-import { usePlannerWaypointMarkersGL } from './usePlannerWaypointMarkersGL';
-
-describe('usePlannerWaypointMarkersGL', () => {
-  it('FE-PLANNER-PIN-GL-001: puts the moon on the pin of a stage end only, numbered as the list numbers it', () => {
-    const container = document.createElement('div');
-    const map = { getContainer: () => container, unproject: () => ({ lat: 0, lng: 0 }) };
-    const attached: HTMLElement[] = [];
-    renderHook(() =>
-      usePlannerWaypointMarkersGL({
-        mapRef: { current: map },
-        mapReady: true,
-        pinsRef: { current: [] },
-        attachPin: (el) => {
-          attached.push(el);
-          return { remove: vi.fn(), setLngLat: vi.fn() };
-        },
-        pinCss: () => 'display:flex',
-        plannerWaypoints: [
-          { id: 'a', lat: 47, lng: 11, label: '1' },
-          { id: 'b', lat: 47.1, lng: 11, label: '2', stageEnd: true },
-        ],
-        selectedPlannerWaypointId: null,
-        onPlannerWaypointClick: vi.fn(),
-        onPlannerWaypointMove: undefined,
-      })
-    );
-    expect(attached).toHaveLength(2);
-    expect(attached[0].querySelector('[data-stage-end]')).toBeNull();
-    expect(attached[1].querySelector('[data-stage-end]')).not.toBeNull();
-    expect(attached[1].textContent).toBe('2');
-  });
-});
@@ -2,7 +2,6 @@ import { useEffect, useLayoutEffect, useRef } from 'react';

 import { bindPinHoverLabel, mapHoverLabel } from './mapHoverLabel';
 import type { MapViewProps } from './mapViewContract';
-import { plannerPinBadge, plannerPinShape } from './plannerPinShape';
 import { wirePlannerWaypointDrag } from './plannerWaypointDrag';

 /** The slice of the GL map the waypoint pins need: its box and screen-to-ground lookup. */
@@ -72,16 +71,13 @@ export function usePlannerWaypointMarkersGL<Pin extends PlannerWaypointPin>({

    for (const [index, point] of plannerWaypoints.entries()) {
      const selected = point.id === selectedPlannerWaypointId;
-      const { size, text } = plannerPinShape(point, index, selected);
+      const size = selected ? 30 : 26;
      const el = document.createElement('button');
      el.type = 'button';
-      el.textContent = text;
+      el.textContent = String(index + 1);
      const name = point.name ?? `Waypoint ${index + 1}`;
      el.setAttribute('aria-label', name);
      el.style.cssText = `${pinCss(size, selected)};cursor:pointer;padding:0`;
-      // MDT-01: the moon where a stage ends; the pin is positioned, so the badge sits at its corner.
-      const badge = plannerPinBadge(point);
-      if (badge) el.insertAdjacentHTML('beforeend', badge);
      const swallow = (event: Event) => event.stopPropagation();
      const select = (event: Event) => {
        event.stopPropagation();
@@ -8,7 +8,6 @@ import { useSettingsStore } from '../../store/settingsStore'
 import { useAddonStore } from '../../store/addonStore'
 import type { RoadtripVia } from '@trek/shared'
 import type { Accommodation, AssignmentsMap, Day, Place, Reservation } from '../../types'
-import type { TourStageStops } from './dayTourProjection'

 export type { TripOverviewDay, TripRouteSummary } from './tripRouteGeometry'

@@ -47,8 +46,6 @@ export function useTripRouteOverview(
  enabled: boolean,
  places: Place[] = EMPTY_PLACES,
  vias?: TripRouteVias,
-  /** MDT-02: where the stages of the trip's multi-day tours run, so a day holding one draws that stage. */
-  tourStageStops?: TourStageStops,
 ): TripRouteOverview {
  const optimizeFromAccommodation = useSettingsStore(s => s.settings.optimize_from_accommodation)
  const toursEnabled = useAddonStore(s => s.isEnabled('tours'))
@@ -69,9 +66,9 @@ export function useTripRouteOverview(
  const viasByDay = vias?.viasByDay
  const plan = useMemo(
    () => (enabled
-      ? planTripRoute({ days, assignments, reservations, accommodations, optimizeFromAccommodation, toursEnabled, places, storedAssignments, viasByDay, tourStageStops }, profile)
+      ? planTripRoute({ days, assignments, reservations, accommodations, optimizeFromAccommodation, toursEnabled, places, storedAssignments, viasByDay }, profile)
      : []),
-    [enabled, days, assignments, reservations, accommodations, optimizeFromAccommodation, profile, toursEnabled, places, storedAssignments, viasByDay, tourStageStops],
+    [enabled, days, assignments, reservations, accommodations, optimizeFromAccommodation, profile, toursEnabled, places, storedAssignments, viasByDay],
  )

  // Only geometry and mode decide whether legs have to be fetched again: renaming a
@@ -2,7 +2,7 @@ import { describe, it, expect, afterEach, vi } from 'vitest'
 import { http, HttpResponse } from 'msw'
 import { server } from '../../../tests/helpers/msw/server'
 import { useSettingsStore } from '../../store/settingsStore'
-import { valhallaBase, valhallaAvailable, valhallaTurn, resetValhallaTurns, valhallaRouteAvoiding, valhallaRun, valhallaAlternates, alternatesFrom, runFrom, legAvoids, valhallaTraceAttributes } from './valhallaRoute'
+import { valhallaBase, valhallaAvailable, valhallaTurn, resetValhallaTurns, valhallaRouteAvoiding, valhallaRun, valhallaAlternates, alternatesFrom, runFrom, legAvoids } from './valhallaRoute'

 const FOSSGIS_VALHALLA = 'https://valhalla1.openstreetmap.de/route'

@@ -519,23 +519,6 @@ describe('valhallaAlternates', () => {
    expect(bodies[1]).not.toHaveProperty('alternates')
  })

-  it('VALHALLA-ALT-005: a section of a hike is offered ways on foot under its own limit and preferences (RTE-02)', async () => {
-    const bodies: Record<string, unknown>[] = []
-    server.use(http.post(FOSSGIS_VALHALLA, async ({ request }) => {
-      bodies.push(await request.json() as Record<string, unknown>)
-      return HttpResponse.json(withAlternates([answer({ time: 12_000 })]))
-    }))
-
-    const ways = await valhallaAlternates(HAMBURG, BERLIN, 'walking', [], 3, undefined, { max_hiking_difficulty: 4, use_hills: 0.2 })
-
-    expect(ways).toHaveLength(2)
-    expect(bodies[0]).toMatchObject({
-      alternates: 3,
-      costing: 'pedestrian',
-      costing_options: { pedestrian: { max_hiking_difficulty: 4, use_hills: 0.2 } },
-    })
-  })
-
  it('VALHALLA-ALT-004: a refusal is asked once more, then is no answer; an instance with its own OSRM asks nothing', async () => {
    let calls = 0
    server.use(http.post(FOSSGIS_VALHALLA, () => { calls++; return new HttpResponse(null, { status: 429 }) }))
@@ -548,85 +531,3 @@ describe('valhallaAlternates', () => {
    expect(calls).toBe(2)
  })
 })
-
-describe('valhallaTraceAttributes (BIK-01)', () => {
-  const TRACE = 'https://valhalla1.openstreetmap.de/trace_attributes'
-
-  it('VALHALLA-TRACE-001: asks for the ways under the line, matched as a mountain bike rides, and hands the answer on', async () => {
-    const bodies: Record<string, unknown>[] = []
-    server.use(http.post(TRACE, async ({ request }) => {
-      bodies.push(await request.json() as Record<string, unknown>)
-      return HttpResponse.json({ shape: SHAPE, edges: [] })
-    }))
-    await expect(valhallaTraceAttributes(SHAPE_POINTS)).resolves.toEqual({ shape: SHAPE, edges: [] })
-    expect(bodies[0]).toMatchObject({
-      costing: 'bicycle',
-      costing_options: { bicycle: { bicycle_type: 'Mountain' } },
-      shape_match: 'map_snap',
-      filters: { action: 'include' },
-    })
-    expect(bodies[0].shape).toEqual(SHAPE_POINTS.map(([lat, lon]) => ({ lat, lon })))
-  })
-
-  it('VALHALLA-TRACE-005: a run is matched on foot without a hiking limit, and every line is asked its hiking grades (RUN-02)', async () => {
-    const bodies: Record<string, unknown>[] = []
-    server.use(http.post(TRACE, async ({ request }) => {
-      bodies.push(await request.json() as Record<string, unknown>)
-      return HttpResponse.json({ shape: SHAPE, edges: [] })
-    }))
-    await valhallaTraceAttributes(SHAPE_POINTS, undefined, 'run')
-    expect(bodies[0]).toMatchObject({
-      costing: 'pedestrian',
-      costing_options: { pedestrian: { max_hiking_difficulty: 6 } },
-      shape_match: 'map_snap',
-    })
-    expect((bodies[0].filters as { attributes: string[] }).attributes).toContain('edge.sac_scale')
-  })
-
-  it('VALHALLA-TRACE-002: a long line is thinned evenly to what one request carries, its ends kept', async () => {
-    let shape: unknown[] = []
-    server.use(http.post(TRACE, async ({ request }) => {
-      shape = ((await request.json()) as { shape: unknown[] }).shape
-      return HttpResponse.json({})
-    }))
-    const line = Array.from({ length: 9001 }, (_, i): [number, number] => [47 + i / 1e5, 11])
-    await valhallaTraceAttributes(line)
-    expect(shape.length).toBeLessThanOrEqual(4001)
-    expect(shape[0]).toEqual({ lat: 47, lon: 11 })
-    expect(shape[shape.length - 1]).toEqual({ lat: line[9000][0], lon: 11 })
-  })
-
-  it('VALHALLA-TRACE-003: null for a refusal, a network failure, a line of one point or a router that is not Valhalla', async () => {
-    server.use(http.post(TRACE, () => new HttpResponse(null, { status: 400 })))
-    await expect(valhallaTraceAttributes(SHAPE_POINTS)).resolves.toBeNull()
-    server.use(http.post(TRACE, () => HttpResponse.error()))
-    await expect(valhallaTraceAttributes(SHAPE_POINTS)).resolves.toBeNull()
-    await expect(valhallaTraceAttributes(SHAPE_POINTS.slice(0, 1))).resolves.toBeNull()
-    setSettings({ routing_base_url: 'https://osrm.example' })
-    await expect(valhallaTraceAttributes(SHAPE_POINTS)).resolves.toBeNull()
-  })
-
-  it('VALHALLA-TRACE-006: a hike is matched on foot with every grade of path open, never by its routing limit (MAP-03)', async () => {
-    const bodies: Record<string, unknown>[] = []
-    server.use(http.post(TRACE, async ({ request }) => {
-      bodies.push(await request.json() as Record<string, unknown>)
-      return HttpResponse.json({ shape: SHAPE, edges: [] })
-    }))
-    await valhallaTraceAttributes(SHAPE_POINTS, undefined, 'foot')
-    expect(bodies[0]).toMatchObject({
-      costing: 'pedestrian',
-      costing_options: { pedestrian: { max_hiking_difficulty: 6 } },
-      shape_match: 'map_snap',
-    })
-    expect(JSON.stringify(bodies[0])).not.toContain('sac_scale')
-  })
-
-  it('VALHALLA-TRACE-004: a caller gone before its turn asks nothing', async () => {
-    let asked = false
-    server.use(http.post(TRACE, () => { asked = true; return HttpResponse.json({}) }))
-    const controller = new AbortController()
-    controller.abort()
-    await expect(valhallaTraceAttributes(SHAPE_POINTS, controller.signal)).resolves.toBeNull()
-    expect(asked).toBe(false)
-  })
-})
@@ -55,9 +55,6 @@ const COSTING: Record<'driving' | 'walking' | 'cycling', string> = {
  cycling: 'bicycle',
 }

-/** What a caller tunes in the costing model: a weighting, a switch, or a bicycle type by name. */
-export type CostingOptions = Record<string, number | string | boolean>
-
 /**
 * What a caller can ask to be left out, against the costing option that asks for it.
 *
@@ -194,7 +191,7 @@ export async function valhallaRun(
  profile: 'driving' | 'walking' | 'cycling',
  avoid: readonly AvoidClass[],
  signal?: AbortSignal,
-  costingOptions: Readonly<CostingOptions> = {},
+  costingOptions: Readonly<Record<string, number>> = {},
 ): Promise<ValhallaRun | null> {
  const base = valhallaBase()
  if (!base || notValhalla.has(base) || waypoints.length < 2) return null
@@ -318,14 +315,14 @@ function routeBody(
  waypoints: Waypoint[],
  profile: 'driving' | 'walking' | 'cycling',
  avoid: readonly AvoidClass[],
-  costingOptions: Readonly<CostingOptions> = {},
+  costingOptions: Readonly<Record<string, number>> = {},
 ): Record<string, unknown> {
  const costing = COSTING[profile]
  // All of them in one request: the options are independent weightings, so asking to
  // leave out tolls and ferries together is one question rather than two routes to
  // reconcile. Measured Hamburg to Copenhagen: tolls, motorways and ferries weighted
  // away together answered 656.9 km against 339.2 km for the plain route.
-  const options: CostingOptions = { ...costingOptions }
+  const options: Record<string, number> = { ...costingOptions }
  for (const cls of avoid) options[AVOID_OPTION[cls]] = 0
  return {
    locations: waypoints.map(w => ({ lat: w.lat, lon: w.lng, radius: SNAP_RADIUS_M })),
@@ -362,83 +359,6 @@ async function postRoute(base: string, body: Record<string, unknown>, signal?: A
  }
 }

-/** The most points a description of a line asks about; a longer line is thinned evenly, its ends kept. */
-const TRACE_MAX_POINTS = 4000
-/** How long a description may take before it counts as failed, so a router that hangs does not leave its card waiting. */
-const TRACE_TIMEOUT_MS = 30_000
-
-/**
- * How a line is matched to the ways under it: as a mountain bike rides, the
- * bicycle costing that refuses the fewest ways, so a road bike's route and a
- * gravel one are described alike; or on foot with every grade of path open,
- * since a hike's line (MAP-03) may run on a T6 ridge the matcher must not
- * refuse, and steps and mountain paths a run takes (RUN-02) stay on the line
- * (matched as a bike, a trail run over steps was described as the street
- * beside them). Matching is no routing: the limit a hike was planned with
- * plays no part. A hike and a run are matched alike; they differ in whether
- * the router's own hiking grade is asked for.
- */
-const TRACE_COSTING = {
-  bike: { costing: 'bicycle', costing_options: { bicycle: { bicycle_type: 'Mountain' } } },
-  foot: { costing: 'pedestrian', costing_options: { pedestrian: { max_hiking_difficulty: 6 } } },
-  run: { costing: 'pedestrian', costing_options: { pedestrian: { max_hiking_difficulty: 6 } } },
-} as const
-
-export type TraceMatching = keyof typeof TRACE_COSTING
-
-const TRACE_ATTRIBUTES = ['shape', 'edge.surface', 'edge.use', 'edge.road_class', 'edge.cycle_lane', 'edge.length',
-  'edge.way_id', 'edge.begin_shape_index', 'edge.end_shape_index']
-
-/** The router's hiking grade is asked along a bike tour's and a run's line, never a hike's (MAP-03 reads OpenStreetMap). */
-function traceAttributesFor(matching: TraceMatching): string[] {
-  return matching === 'foot' ? TRACE_ATTRIBUTES : [...TRACE_ATTRIBUTES, 'edge.sac_scale']
-}
-
-/**
- * BIK-01, RUN-02 and MAP-03: how the router describes the ways under a line
- * (`trace_attributes`): the surface, the use and road class, the cycle lane,
- * the OpenStreetMap way of every edge and, but for a hike, the router's
- * hiking grade (`sac_scale`, 0 where the way has none), with the line as
- * matched. A run's grade shares (RUN-02) read the router's grade; the grade a
- * hike shows (MAP-03) comes from OpenStreetMap itself, since the router's
- * reading may be normalised or derived, so it is not asked for there. Null for
- * every failure: the description is an addition beside a route that already
- * exists.
- */
-export async function valhallaTraceAttributes(
-  line: readonly [number, number][],
-  signal?: AbortSignal,
-  matching: TraceMatching = 'bike'
-): Promise<unknown> {
-  const base = valhallaBase()
-  if (!base || line.length < 2) return null
-  const step = Math.max(1, Math.ceil(line.length / TRACE_MAX_POINTS))
-  const shape = line.filter((_, index) => index % step === 0 || index === line.length - 1).map(([lat, lon]) => ({ lat, lon }))
-  const bounded = signal ? AbortSignal.any([signal, AbortSignal.timeout(TRACE_TIMEOUT_MS)]) : AbortSignal.timeout(TRACE_TIMEOUT_MS)
-  try {
-    await valhallaTurn(base, signal)
-    if (signal?.aborted) return null
-    const response = await fetch(`${base}/trace_attributes`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'X-Client-Id': 'trek' },
-      body: JSON.stringify({
-        shape,
-        ...TRACE_COSTING[matching],
-        shape_match: 'map_snap',
-        filters: {
-          attributes: traceAttributesFor(matching),
-          action: 'include',
-        },
-      }),
-      signal: bounded,
-    })
-    if (!response.ok) return null
-    return await response.json()
-  } catch {
-    return null
-  }
-}
-
 /** One request, at most ten locations. */
 async function requestRun(
  base: string,
@@ -446,7 +366,7 @@ async function requestRun(
  profile: 'driving' | 'walking' | 'cycling',
  avoid: readonly AvoidClass[],
  signal?: AbortSignal,
-  costingOptions: Readonly<CostingOptions> = {},
+  costingOptions: Readonly<Record<string, number>> = {},
 ): Promise<Omit<ValhallaRun, 'snapped'> | null> {
  const data = await postRoute(base, routeBody(waypoints, profile, avoid, costingOptions), signal)
  return data === null ? null : runFrom(data)
@@ -460,8 +380,6 @@ async function requestRun(
 * quickest road beside a day Valhalla had routed was offered as the faster way, and
 * taking it changed nothing. Valhalla answers `alternates` between exactly two locations,
 * which is all one leg is, and weighs every one of them the way it weighed the day.
- * `costingOptions` carries the rest of how that day was weighed, such as a hike's limit
- * and preferences (RTE-02), so a section of a tour is offered ways under its own rules.
 */
 export async function valhallaAlternates(
  from: Waypoint,
@@ -470,11 +388,10 @@ export async function valhallaAlternates(
  avoid: readonly AvoidClass[],
  count: number,
  signal?: AbortSignal,
-  costingOptions: Readonly<CostingOptions> = {},
 ): Promise<ValhallaLeg[] | null> {
  const base = valhallaBase()
  if (!base || notValhalla.has(base)) return null
-  const body = { ...routeBody([from, to], profile, avoid, costingOptions), ...(count > 0 ? { alternates: count } : {}) }
+  const body = { ...routeBody([from, to], profile, avoid), ...(count > 0 ? { alternates: count } : {}) }
  return askWithRetry(base, async () => {
    const data = await postRoute(base, body, signal)
    return data === null ? null : alternatesFrom(data)
@@ -4,6 +4,7 @@ import { useTranslation } from '../../i18n'
 import type { InAppNotification } from '../../store/inAppNotificationStore'
 import { useSettingsStore } from '../../store/settingsStore'
 import { compactTime, useNotificationItemActions } from './useNotificationItemActions'
+import { useIsDark } from '../../hooks/useIsDark'

 function relativeTime(dateStr: string, locale: string): string {
  return compactTime(dateStr, locale === 'ar' ? 'الآن' : 'just now')
@@ -17,8 +18,8 @@ interface NotificationItemProps {
 export default function InAppNotificationItem({ notification, onClose }: NotificationItemProps): React.ReactElement {
  const { t, locale } = useTranslation()
  const { settings } = useSettingsStore()
-  const darkMode = settings.dark_mode
-  const dark = darkMode === true || darkMode === 'dark' || (darkMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  // Off the .dark class: a special theme is dark whatever the stored mode says.
+  const dark = useIsDark()
  const { responding, handleRespond, handleNavigate, markRead, deleteNotification } =
    useNotificationItemActions(notification, onClose)

@@ -271,9 +271,7 @@ describe('PackingListPanel', () => {
    ];
    const { container } = render(<PackingListPanel tripId={1} items={items} />);
    expect(screen.getByRole('button', { name: 'A to Z' })).toHaveAttribute('aria-pressed', 'true');
-    // Only the category grip stays: the order of the categories is not the A to Z of their items.
-    const draggable = [...container.querySelectorAll('[draggable="true"]')];
-    expect(draggable.map((el) => el.getAttribute('aria-label'))).toEqual(['Drag to reorder the category']);
+    expect(container.querySelector('[draggable="true"]')).toBeNull();
  });

  it('FE-COMP-PACKING-023: inline edit item name via pencil icon calls PUT', async () => {
@@ -4,7 +4,7 @@ import { useToast } from '../shared/Toast'
 import { useTranslation } from '../../i18n'
 import {
  Trash2, Plus, ChevronDown, ChevronRight,
-  X, Pencil, Check, MoreHorizontal, CheckCheck, RotateCcw, UserPlus, GripVertical,
+  X, Pencil, Check, MoreHorizontal, CheckCheck, RotateCcw, UserPlus,
 } from 'lucide-react'
 import type { PackingItem, PackingBag } from '../../types'
 import { katColor } from './packingListPanel.helpers'
@@ -38,16 +38,6 @@ interface KategorieGruppeProps {
  // Off while the list is shown A-Z: a drop there would move an item in an order
  // the reader cannot see.
  reorderable?: boolean
-  // Moving the whole category among the others, wired by the list, which sees every
-  // card. `onDrop` gets the category that was dragged onto this one.
-  categoryDrag?: {
-    isDragging: boolean
-    isOver: boolean
-    onStart: () => void
-    onOver: () => void
-    onEnd: () => void
-    onDrop: (dragged: string) => void
-  }
  // Three-tier sharing (#858) — threaded down to each item's share control.
  currentUserId?: number
  onSetSharing?: (id: number, visibility: 'common' | 'personal' | 'shared', recipientIds: number[]) => void
@@ -56,7 +46,7 @@ interface KategorieGruppeProps {
  onLeave?: (id: number, userId: number) => void
 }

-export function KategorieGruppe({ kategorie, items, tripId, allCategories, onRename, onDeleteAll, onDeleteItem, onAddItem, assignees, tripMembers, onSetAssignees, bagTrackingEnabled, bags, onCreateBag, canEdit = true, allItems, onReorder, reorderable = true, categoryDrag, currentUserId, onSetSharing, onClone, onJoin, onLeave }: KategorieGruppeProps) {
+export function KategorieGruppe({ kategorie, items, tripId, allCategories, onRename, onDeleteAll, onDeleteItem, onAddItem, assignees, tripMembers, onSetAssignees, bagTrackingEnabled, bags, onCreateBag, canEdit = true, allItems, onReorder, reorderable = true, currentUserId, onSetSharing, onClone, onJoin, onLeave }: KategorieGruppeProps) {
  const [offen, setOffen] = useState(true)
  const [dragId, setDragId] = useState<number | null>(null)
  const [overId, setOverId] = useState<number | null>(null)
@@ -130,9 +120,8 @@ export function KategorieGruppe({ kategorie, items, tripId, allCategories, onRen
  return (
    // Shaped after the phone's category card: a tinted head band carrying the
    // name as written, the count, and the fold arrow on the far right.
-    <CategoryDropFrame drag={categoryDrag}>
+    <div style={{ marginBottom: 6, background: 'var(--bg-card)', borderRadius: 16, border: '1px solid var(--border-secondary)', overflow: 'visible' }}>
      <div style={{ display: 'flex', alignItems: 'center', gap: 8, paddingBlock: 11, paddingInlineEnd: 12, paddingInlineStart: 14, background: 'var(--bg-tertiary)', borderRadius: offen ? '15px 15px 0 0' : 15 }}>
-        <CategoryGrip drag={categoryDrag} kategorie={kategorie} label={t('packing.dragCategory')} />
        <span style={{ width: 10, height: 10, borderRadius: '50%', background: dot, flexShrink: 0 }} />

        {editingName && canEdit ? (
@@ -355,65 +344,6 @@ export function KategorieGruppe({ kategorie, items, tripId, allCategories, onRen
          ))}
        </div>
      )}
-    </CategoryDropFrame>
-  )
-}
-
-type CategoryDrag = NonNullable<KategorieGruppeProps['categoryDrag']>
-
-/** The data type a dragged category carries, its name as the value. */
-const CATEGORY_DRAG_TYPE = 'application/x-trek-packing-category'
-
-/**
- * The card, and while a category is dragged its drop target. Captured, because
- * the item rows stop their own drops from bubbling.
- */
-function CategoryDropFrame({ drag, children }: { drag?: CategoryDrag; children: React.ReactNode }) {
-  // Told apart by the drag's own data type, which is there from the first event on:
-  // a flag set in state on dragstart can still be unrendered when a quick drag
-  // arrives, and a dragged item must pass through to its rows untouched.
-  const isCategoryDrag = (e: React.DragEvent) => e.dataTransfer.types.includes(CATEGORY_DRAG_TYPE)
-  return (
-    <div
-      onDragOverCapture={drag ? (e => {
-        if (!isCategoryDrag(e)) return
-        e.preventDefault(); e.dataTransfer.dropEffect = 'move'; drag.onOver()
-      }) : undefined}
-      onDropCapture={drag ? (e => {
-        if (!isCategoryDrag(e)) return
-        e.preventDefault(); e.stopPropagation(); drag.onDrop(e.dataTransfer.getData(CATEGORY_DRAG_TYPE))
-      }) : undefined}
-      style={{
-        marginBottom: 6, background: 'var(--bg-card)', borderRadius: 16, border: '1px solid var(--border-secondary)', overflow: 'visible',
-        opacity: drag?.isDragging ? 0.4 : 1,
-        boxShadow: drag?.isOver ? '0 0 0 2px var(--accent)' : 'none',
-        transition: 'opacity 0.15s, box-shadow 0.15s',
-      }}
-    >
-      {children}
    </div>
  )
 }
-
-/** The handle a category is dragged by, in the head band before its colour dot. */
-function CategoryGrip({ drag, kategorie, label }: { drag?: CategoryDrag; kategorie: string; label: string }) {
-  if (!drag) return null
-  return (
-    <span
-      draggable
-      role="button"
-      aria-label={label}
-      title={label}
-      onDragStart={e => {
-        e.dataTransfer.effectAllowed = 'move'
-        e.dataTransfer.setData(CATEGORY_DRAG_TYPE, kategorie)
-        e.dataTransfer.setData('text/plain', kategorie)
-        drag.onStart()
-      }}
-      onDragEnd={drag.onEnd}
-      style={{ cursor: 'grab', display: 'flex', alignItems: 'center', color: 'var(--text-faint)', flexShrink: 0, marginInlineStart: -6 }}
-    >
-      <GripVertical size={14} />
-    </span>
-  )
-}
@@ -1,4 +1,3 @@
-import { useState } from 'react'
 import type { PackingState } from './usePackingListPanel'
 import { KategorieGruppe } from './PackingListPanelCategoryGroup'
 import EmptyState from '../shared/EmptyState'
@@ -8,13 +7,8 @@ export function PackingList(S: PackingState) {
    items, gruppiert, t, tripId, allCategories, handleRenameCategory, handleDeleteCategory, handleDeleteItem,
    handleAddItemToCategory, categoryAssignees, tripMembers, handleSetAssignees,
    bagTrackingEnabled, bags, handleCreateBagByName, canEdit, reorderPackingItems,
-    currentUserId, handleSetSharing, handleCloneItem, handleJoinItem, handleLeaveItem, sort, moveCategory,
+    currentUserId, handleSetSharing, handleCloneItem, handleJoinItem, handleLeaveItem, sort,
  } = S
-  // Which category is being dragged and which card it is over. Held here, above
-  // the cards, because the drag starts in one card and ends in another.
-  const [draggedCategory, setDraggedCategory] = useState<string | null>(null)
-  const [overCategory, setOverCategory] = useState<string | null>(null)
-  const endCategoryDrag = () => { setDraggedCategory(null); setOverCategory(null) }
  return (
    <div style={{ flex: 1, overflowY: 'auto', padding: '10px 0 16px' }}>
      {items.length === 0 ? (
@@ -46,14 +40,6 @@ export function PackingList(S: PackingState) {
              allItems={items}
              onReorder={(orderedIds) => reorderPackingItems(tripId, orderedIds)}
              reorderable={sort === 'manual'}
-              categoryDrag={canEdit ? {
-                isDragging: draggedCategory === kat,
-                isOver: overCategory === kat && draggedCategory !== null && draggedCategory !== kat,
-                onStart: () => { setDraggedCategory(kat); setOverCategory(null) },
-                onOver: () => setOverCategory(kat),
-                onEnd: endCategoryDrag,
-                onDrop: (dragged) => { moveCategory(dragged, kat); endCategoryDrag() },
-              } : undefined}
              currentUserId={currentUserId}
              onSetSharing={handleSetSharing}
              onClone={handleCloneItem}
--- a/Show More
+++ b/Show More