From 86b42785c1a5080bd3fe4d9697f6400d46f86cbd Mon Sep 17 00:00:00 2001
From: Antonia van Eek <a.vaneek@conterra.de>
Date: Thu, 20 Feb 2025 15:32:16 +0100
Subject: [PATCH] Remove BkgTopPlusOpen test layer source

---
 .changeset/ten-news-kick.md                   |  12 ++
 pnpm-lock.yaml                                |  24 ---
 src/index.html                                |   5 -
 .../basemap-switcher/BasemapSwitcher.test.tsx |  82 ++------
 .../BasemapSwitcher.test.tsx.snap             | 164 +++++++++++++++-
 src/packages/map/MapRegistryImpl.test.ts      |   3 +-
 src/packages/map/api/index.ts                 |   1 -
 src/packages/map/layers/BkgTopPlusOpen.ts     |  76 --------
 .../map/model/LayerCollectionImpl.test.ts     |  41 ++--
 .../overview-map/OverviewMap.test.tsx         |  37 ----
 src/packages/toc/ui/LayerList/LayerItem.tsx   |   1 -
 .../basemap-switcher-app/AppUI.tsx            | 176 ------------------
 .../MapConfigProviderImpl.ts                  |  30 ---
 .../basemap-switcher-app/app.ts               |  14 --
 .../basemap-switcher-app/build.config.mjs     |  12 --
 .../basemap-switcher-app/i18n/en.yaml         |   2 -
 .../basemap-switcher-app/package.json         |  14 --
 .../basemap-switcher-app/services.ts          |   3 -
 src/samples/test-basemap-switcher/index.html  |  25 ---
 vite.config.ts                                |   1 -
 20 files changed, 198 insertions(+), 525 deletions(-)
 create mode 100644 .changeset/ten-news-kick.md
 delete mode 100644 src/packages/map/layers/BkgTopPlusOpen.ts
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/AppUI.tsx
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/MapConfigProviderImpl.ts
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/app.ts
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/build.config.mjs
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/i18n/en.yaml
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/package.json
 delete mode 100644 src/samples/test-basemap-switcher/basemap-switcher-app/services.ts
 delete mode 100644 src/samples/test-basemap-switcher/index.html

diff --git a/.changeset/ten-news-kick.md b/.changeset/ten-news-kick.md
new file mode 100644
index 000000000..acbcdf03c
--- /dev/null
+++ b/.changeset/ten-news-kick.md
@@ -0,0 +1,12 @@
+---
+"@open-pioneer/basemap-switcher": patch
+"@open-pioneer/map-test-utils": patch
+"@open-pioneer/overview-map": patch
+"@open-pioneer/map": patch
+---
+
+Removed BKGTopPlusOpen layer source. The BKGTopPlusOpen was an internal layer source only needed for tests. Please use own test sources instead.
+
+```
+
+```
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a5eac118..eff2b83f5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1630,30 +1630,6 @@ importers:
         specifier: 'catalog:'
         version: 18.3.1(react@18.3.1)
 
-  src/samples/test-basemap-switcher/basemap-switcher-app:
-    dependencies:
-      '@open-pioneer/basemap-switcher':
-        specifier: workspace:^
-        version: link:../../../packages/basemap-switcher
-      '@open-pioneer/chakra-integration':
-        specifier: 'catalog:'
-        version: 2.4.0(@emotion/is-prop-valid@1.3.0)(@types/react@18.3.11)
-      '@open-pioneer/map':
-        specifier: workspace:^
-        version: link:../../../packages/map
-      '@open-pioneer/react-utils':
-        specifier: 'catalog:'
-        version: 2.4.0(@emotion/is-prop-valid@1.3.0)(@types/react@18.3.11)
-      '@open-pioneer/runtime':
-        specifier: 'catalog:'
-        version: 2.4.0(@emotion/is-prop-valid@1.3.0)(@types/react@18.3.11)(typescript@5.6.3)
-      '@open-pioneer/theme':
-        specifier: workspace:^
-        version: link:../../../packages/theme
-      react:
-        specifier: 'catalog:'
-        version: 18.3.1
-
   src/samples/test-highlight-and-zoom/highlight-and-zoom-app:
     dependencies:
       '@open-pioneer/chakra-integration':
diff --git a/src/index.html b/src/index.html
index 61c162f78..9327d0a2f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -60,11 +60,6 @@ <h2>Samples</h2>
         <h2>Test applications</h2>
         <p>These apps are primarily used for testing.</p>
         <ul>
-            <li>
-                <a href="./samples/test-basemap-switcher/">Basemap switcher</a>
-                <br />
-                Test app for the basemap switcher.
-            </li>
             <li>
                 <a href="./samples/test-result-list/">Result List</a>
                 <br />
diff --git a/src/packages/basemap-switcher/BasemapSwitcher.test.tsx b/src/packages/basemap-switcher/BasemapSwitcher.test.tsx
index e37c02ca6..9d60a361e 100644
--- a/src/packages/basemap-switcher/BasemapSwitcher.test.tsx
+++ b/src/packages/basemap-switcher/BasemapSwitcher.test.tsx
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
 // SPDX-License-Identifier: Apache-2.0
 import { nextTick } from "@conterra/reactivity-core";
-import { BkgTopPlusOpen, SimpleLayer } from "@open-pioneer/map";
+import { SimpleLayer } from "@open-pioneer/map";
 import { createServiceOptions, setupMap } from "@open-pioneer/map-test-utils";
 import { PackageContextProvider } from "@open-pioneer/test-utils/react";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
@@ -237,28 +237,9 @@ it("should update when a different basemap is activated from somewhere else", as
 });
 
 describe("should successfully select the correct basemap from basemap switcher", () => {
-    it("basemap with id `osm` is visible", async () => {
+    it("basemap with id `osm` (first in layers array) is visible", async () => {
         const { mapId, registry } = await setupMap({
-            layers: [
-                {
-                    id: "osm",
-                    title: "OSM",
-                    isBaseLayer: true,
-                    visible: true,
-                    olLayer: new TileLayer({
-                        source: new OSM()
-                    })
-                },
-                {
-                    id: "topplus-open",
-                    title: "TopPlus Open",
-                    isBaseLayer: true,
-                    visible: false,
-                    olLayer: new TileLayer({
-                        source: new BkgTopPlusOpen()
-                    })
-                }
-            ]
+            layers: defaultBasemapConfig
         });
 
         const map = await registry.expectMapModel(mapId);
@@ -278,7 +259,7 @@ describe("should successfully select the correct basemap from basemap switcher",
         expect(activeBaseLayer?.id).toBe("osm");
     });
 
-    it("basemap with id `toner` is visible", async () => {
+    it("basemap with id `topplus-open` (second in layers array) is visible", async () => {
         const { mapId, registry } = await setupMap({
             layers: [
                 {
@@ -295,9 +276,7 @@ describe("should successfully select the correct basemap from basemap switcher",
                     title: "TopPlus Open",
                     isBaseLayer: true,
                     visible: true,
-                    olLayer: new TileLayer({
-                        source: new BkgTopPlusOpen()
-                    })
+                    olLayer: new TileLayer({})
                 }
             ]
         });
@@ -320,9 +299,12 @@ describe("should successfully select the correct basemap from basemap switcher",
     });
 });
 
-it("should deactivate unavailable layers for selection", async () => {
+it("should disable selection of unavailable layers and show a warning", async () => {
     const osmSource = new OSM();
-    const topPlusSource = new BkgTopPlusOpen();
+
+    act(() => {
+        osmSource.setState("error");
+    });
 
     const { mapId, registry } = await setupMap({
         layers: [
@@ -336,17 +318,14 @@ it("should deactivate unavailable layers for selection", async () => {
                 })
             },
             {
-                id: "topplus-open",
-                title: "TopPlus Open",
+                id: "empty-tile",
+                title: "Empty tile",
                 isBaseLayer: true,
                 visible: true,
-                olLayer: new TileLayer({
-                    source: topPlusSource
-                })
+                olLayer: new TileLayer()
             }
         ]
     });
-    const map = await registry.expectMapModel(mapId);
 
     const injectedServices = createServiceOptions({ registry });
     render(
@@ -358,46 +337,13 @@ it("should deactivate unavailable layers for selection", async () => {
     // basemap switcher is mounted
     const { switcherSelect } = await waitForBasemapSwitcher();
 
-    let activeBaseLayer = map.layers.getActiveBaseLayer();
-    expect(activeBaseLayer?.id).toBe("osm");
-
     showDropdown(switcherSelect);
     expect(switcherSelect).toMatchSnapshot();
-
-    act(() => {
-        osmSource.setState("error");
-    });
-
-    // switch active layer
-    activeBaseLayer = map.layers.getActiveBaseLayer();
-    expect(activeBaseLayer?.id).toBe("osm");
-
-    // option disabled, warning icon shown and selected option changed?
-    expect(switcherSelect).toMatchSnapshot();
 });
 
 it("should update the ui when a layer title changes", async () => {
     const { mapId, registry } = await setupMap({
-        layers: [
-            {
-                id: "osm",
-                title: "OSM",
-                isBaseLayer: true,
-                visible: true,
-                olLayer: new TileLayer({
-                    source: new OSM()
-                })
-            },
-            {
-                id: "topplus-open",
-                title: "TopPlus Open",
-                isBaseLayer: true,
-                visible: true,
-                olLayer: new TileLayer({
-                    source: new BkgTopPlusOpen()
-                })
-            }
-        ]
+        layers: defaultBasemapConfig
     });
     const map = await registry.expectMapModel(mapId);
 
diff --git a/src/packages/basemap-switcher/__snapshots__/BasemapSwitcher.test.tsx.snap b/src/packages/basemap-switcher/__snapshots__/BasemapSwitcher.test.tsx.snap
index 2fc682d5b..7256c2af1 100644
--- a/src/packages/basemap-switcher/__snapshots__/BasemapSwitcher.test.tsx.snap
+++ b/src/packages/basemap-switcher/__snapshots__/BasemapSwitcher.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`should deactivate unavailable layers for selection 1`] = `
       data-theme="light"
     >
       <div
-        class="basemap-switcher-value react-select__single-value css-1xa1gs2"
+        class="basemap-switcher-value react-select__single-value react-select__single-value--is-disabled css-1xa1gs2"
         data-theme="light"
       >
         <div
@@ -33,6 +33,43 @@ exports[`should deactivate unavailable layers for selection 1`] = `
           data-theme="light"
         >
           OSM
+          <div
+            class="css-1v4xcoh"
+            data-theme="light"
+          >
+            <span>
+              <svg
+                aria-label="layerNotAvailable"
+                color="red"
+                fill="none"
+                height="1em"
+                stroke="currentColor"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                style="color: red;"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
+                />
+                <line
+                  x1="12"
+                  x2="12"
+                  y1="9"
+                  y2="13"
+                />
+                <line
+                  x1="12"
+                  x2="12.01"
+                  y1="17"
+                  y2="17"
+                />
+              </svg>
+            </span>
+          </div>
         </div>
       </div>
       <input
@@ -95,8 +132,9 @@ exports[`should deactivate unavailable layers for selection 1`] = `
         role="listbox"
       >
         <div
+          aria-disabled="true"
           aria-selected="true"
-          class="basemap-switcher-option react-select__option react-select__option--is-focused react-select__option--is-selected css-2rk73n"
+          class="basemap-switcher-option react-select__option react-select__option--is-disabled react-select__option--is-focused react-select__option--is-selected css-2rk73n"
           data-focus="true"
           data-theme="light"
           id="react-select-11-option-0"
@@ -108,6 +146,43 @@ exports[`should deactivate unavailable layers for selection 1`] = `
             data-theme="light"
           >
             OSM
+            <div
+              class="css-1v4xcoh"
+              data-theme="light"
+            >
+              <span>
+                <svg
+                  aria-label="layerNotAvailable"
+                  color="red"
+                  fill="none"
+                  height="1em"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  style="color: red;"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
+                  />
+                  <line
+                    x1="12"
+                    x2="12"
+                    y1="9"
+                    y2="13"
+                  />
+                  <line
+                    x1="12"
+                    x2="12.01"
+                    y1="17"
+                    y2="17"
+                  />
+                </svg>
+              </span>
+            </div>
           </div>
         </div>
         <div
@@ -122,7 +197,7 @@ exports[`should deactivate unavailable layers for selection 1`] = `
             class="css-u4p24i"
             data-theme="light"
           >
-            TopPlus Open
+            Empty tile
           </div>
         </div>
       </div>
@@ -131,7 +206,7 @@ exports[`should deactivate unavailable layers for selection 1`] = `
 </div>
 `;
 
-exports[`should deactivate unavailable layers for selection 2`] = `
+exports[`should disable selection of unavailable layers and show a warning 1`] = `
 <div
   class="basemap-switcher-select react-select--has-value css-79elbk"
   data-theme="light"
@@ -156,7 +231,7 @@ exports[`should deactivate unavailable layers for selection 2`] = `
       data-theme="light"
     >
       <div
-        class="basemap-switcher-value react-select__single-value css-1xa1gs2"
+        class="basemap-switcher-value react-select__single-value react-select__single-value--is-disabled css-1xa1gs2"
         data-theme="light"
       >
         <div
@@ -164,6 +239,43 @@ exports[`should deactivate unavailable layers for selection 2`] = `
           data-theme="light"
         >
           OSM
+          <div
+            class="css-1v4xcoh"
+            data-theme="light"
+          >
+            <span>
+              <svg
+                aria-label="layerNotAvailable"
+                color="red"
+                fill="none"
+                height="1em"
+                stroke="currentColor"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                stroke-width="2"
+                style="color: red;"
+                viewBox="0 0 24 24"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
+                />
+                <line
+                  x1="12"
+                  x2="12"
+                  y1="9"
+                  y2="13"
+                />
+                <line
+                  x1="12"
+                  x2="12.01"
+                  y1="17"
+                  y2="17"
+                />
+              </svg>
+            </span>
+          </div>
         </div>
       </div>
       <input
@@ -226,8 +338,9 @@ exports[`should deactivate unavailable layers for selection 2`] = `
         role="listbox"
       >
         <div
+          aria-disabled="true"
           aria-selected="true"
-          class="basemap-switcher-option react-select__option react-select__option--is-focused react-select__option--is-selected css-2rk73n"
+          class="basemap-switcher-option react-select__option react-select__option--is-disabled react-select__option--is-focused react-select__option--is-selected css-2rk73n"
           data-focus="true"
           data-theme="light"
           id="react-select-11-option-0"
@@ -239,6 +352,43 @@ exports[`should deactivate unavailable layers for selection 2`] = `
             data-theme="light"
           >
             OSM
+            <div
+              class="css-1v4xcoh"
+              data-theme="light"
+            >
+              <span>
+                <svg
+                  aria-label="layerNotAvailable"
+                  color="red"
+                  fill="none"
+                  height="1em"
+                  stroke="currentColor"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  style="color: red;"
+                  viewBox="0 0 24 24"
+                  width="1em"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
+                  />
+                  <line
+                    x1="12"
+                    x2="12"
+                    y1="9"
+                    y2="13"
+                  />
+                  <line
+                    x1="12"
+                    x2="12.01"
+                    y1="17"
+                    y2="17"
+                  />
+                </svg>
+              </span>
+            </div>
           </div>
         </div>
         <div
@@ -253,7 +403,7 @@ exports[`should deactivate unavailable layers for selection 2`] = `
             class="css-u4p24i"
             data-theme="light"
           >
-            TopPlus Open
+            Empty tile
           </div>
         </div>
       </div>
diff --git a/src/packages/map/MapRegistryImpl.test.ts b/src/packages/map/MapRegistryImpl.test.ts
index 2547a8980..2dcf5d8c1 100644
--- a/src/packages/map/MapRegistryImpl.test.ts
+++ b/src/packages/map/MapRegistryImpl.test.ts
@@ -9,7 +9,6 @@ import { setupMap } from "@open-pioneer/map-test-utils";
 import OlMap from "ol/Map";
 import TileLayer from "ol/layer/Tile";
 import OSM from "ol/source/OSM";
-import { BkgTopPlusOpen } from "./layers/BkgTopPlusOpen";
 import { defaults as defaultInteraction } from "ol/interaction";
 import dragRotate from "ol/interaction/DragRotate";
 
@@ -250,7 +249,7 @@ it("should construct a map with the configured layers", async () => {
                 id: "id2",
                 title: "bar",
                 visible: false,
-                olLayer: new TileLayer({ source: new BkgTopPlusOpen() })
+                olLayer: new TileLayer({})
             }
         ]
     });
diff --git a/src/packages/map/api/index.ts b/src/packages/map/api/index.ts
index cce00e1d7..5af8feab9 100644
--- a/src/packages/map/api/index.ts
+++ b/src/packages/map/api/index.ts
@@ -8,7 +8,6 @@ export * from "./layers";
 export * from "./shared";
 
 export { getProjection, registerProjections, type ProjectionDefinition } from "../projections";
-export { BkgTopPlusOpen, type BkgTopPlusOpenProps } from "../layers/BkgTopPlusOpen";
 
 // UI Components and React helpers
 export { useView, useProjection, useResolution, useCenter, useScale } from "../ui/hooks";
diff --git a/src/packages/map/layers/BkgTopPlusOpen.ts b/src/packages/map/layers/BkgTopPlusOpen.ts
deleted file mode 100644
index 26e05b508..000000000
--- a/src/packages/map/layers/BkgTopPlusOpen.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-import WMTS from "ol/source/WMTS";
-import WMTSTileGrid from "ol/tilegrid/WMTS";
-
-/** @internal */
-export interface BkgTopPlusOpenProps {
-    /**
-     * The name of the requesting layer.
-     * @default "web"
-     */
-    layer?: "web" | "web_grau" | "web_light";
-}
-
-/**
- * Layer source for BKG TopPlus Open.
- *
- * Used for @open-pioneer unit tests: not part of the public interface.
- *
- * @see https://gdz.bkg.bund.de/index.php/default/wmts-topplusopen-wmts-topplus-open.html
- *
- * @internal
- */
-export class BkgTopPlusOpen extends WMTS {
-    constructor(options?: BkgTopPlusOpenProps) {
-        const topLeftCorner = [-3803165.98427299, 8805908.08284866];
-
-        /**
-         * Resolutions taken from AdV WMTS-Profil
-         * @see https://www.adv-online.de/AdV-Produkte/Standards-und-Produktblaetter/AdV-Profile/
-         */
-        const resolutions = [
-            4891.96981025128, // AdV-Level 0  (1:17471320.7508974)
-            2445.98490512564, // AdV-Level 1  (1:8735660.37544872)
-            1222.99245256282, // AdV-Level 2  (1:4367830.18772436)
-            611.49622628141, // AdV-Level 3   (1:2183915.09386218)
-            305.748113140705, // AdV-Level 4  (1:1091957.54693109)
-            152.874056570353, // AdV-Level 5  (1:545978.773465545)
-            76.4370282851763, // AdV-Level 6  (1:272989,386732772)
-            38.2185141425881, // AdV-Level 7  (1:136494,693366386)
-            19.1092570712941, // AdV-Level 8  (1:68247,3466831931)
-            9.55462853564703, // AdV-Level 9  (1:34123,6733415966)
-            4.77731426782352, // AdV-Level 10 (1:17061,8366707983)
-            2.38865713391176, // AdV-Level 11 (1:8530,91833539914)
-            1.19432856695588, // AdV-Level 12 (1:4265,45916769957)
-            0.59716428347794 // AdV-Level 13 (1:2132,72958384978)
-        ];
-
-        /**
-         * The length of matrixIds needs to match the length of the resolutions array
-         * @see https://openlayers.org/en/latest/apidoc/module-ol_tilegrid_WMTS-WMTSTileGrid.html
-         */
-        const matrixIds = new Array(resolutions.length);
-        for (let i = 0; i < resolutions.length; i++) {
-            matrixIds[i] = i;
-        }
-
-        const layer = options?.layer ?? "web";
-
-        super({
-            url: `https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/${layer}/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png`,
-            layer: layer,
-            matrixSet: "EU_EPSG_25832_TOPPLUS",
-            format: "image/png",
-            projection: "EPSG:25832",
-            requestEncoding: "REST",
-            tileGrid: new WMTSTileGrid({
-                origin: topLeftCorner,
-                resolutions: resolutions,
-                matrixIds: matrixIds
-            }),
-            style: "default",
-            attributions: `Kartendarstellung und Präsentationsgraphiken: © Bundesamt für Kartographie und Geodäsie ${new Date().getFullYear()}, <a href="https://sg.geodatenzentrum.de/web_public/gdz/datenquellen/Datenquellen_TopPlusOpen.html" target="_blank">Datenquellen</a>`
-        });
-    }
-}
diff --git a/src/packages/map/model/LayerCollectionImpl.test.ts b/src/packages/map/model/LayerCollectionImpl.test.ts
index a0cc356ab..a003961b4 100644
--- a/src/packages/map/model/LayerCollectionImpl.test.ts
+++ b/src/packages/map/model/LayerCollectionImpl.test.ts
@@ -12,7 +12,6 @@ import TileLayer from "ol/layer/Tile";
 import OSM from "ol/source/OSM";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { Layer, MapConfig, SimpleLayer, WMSLayer } from "../api";
-import { BkgTopPlusOpen } from "../layers/BkgTopPlusOpen";
 import { MapModelImpl } from "./MapModelImpl";
 import { createMapModel } from "./createMapModel";
 import { SimpleLayerImpl } from "./layers/SimpleLayerImpl";
@@ -49,11 +48,9 @@ it("makes the map layers accessible", async () => {
                 })
             }),
             new SimpleLayer({
-                title: "TopPlus Open",
+                title: "Empty tile",
                 visible: false,
-                olLayer: new TileLayer({
-                    source: new BkgTopPlusOpen()
-                })
+                olLayer: new TileLayer()
             })
         ]
     });
@@ -68,7 +65,7 @@ it("makes the map layers accessible", async () => {
         },
         {
           "description": "",
-          "title": "TopPlus Open",
+          "title": "Empty tile",
           "visible": false,
         },
       ]
@@ -105,10 +102,8 @@ it("supports ordered retrieval of layers", async () => {
                 })
             }),
             new SimpleLayer({
-                title: "TopPlus Open",
-                olLayer: new TileLayer({
-                    source: new BkgTopPlusOpen()
-                })
+                title: "Empty tile",
+                olLayer: new TileLayer()
             }),
             new SimpleLayer({
                 title: "Base",
@@ -124,7 +119,7 @@ it("supports ordered retrieval of layers", async () => {
       [
         "Base",
         "OSM",
-        "TopPlus Open",
+        "Empty tile",
       ]
     `);
 
@@ -133,7 +128,7 @@ it("supports ordered retrieval of layers", async () => {
     expect(operationalLayerTitles).toMatchInlineSnapshot(`
       [
         "OSM",
-        "TopPlus Open",
+        "Empty tile",
       ]
     `);
 });
@@ -149,11 +144,9 @@ it("generates automatic unique ids for layers", async () => {
                 })
             }),
             new SimpleLayer({
-                title: "TopPlus Open",
+                title: "Empty tile",
                 visible: false,
-                olLayer: new TileLayer({
-                    source: new BkgTopPlusOpen()
-                })
+                olLayer: new TileLayer()
             })
         ]
     });
@@ -220,10 +213,8 @@ it("supports lookup by layer id", async () => {
             }),
             new SimpleLayer({
                 id: "l-2",
-                title: "TopPlus Open",
-                olLayer: new TileLayer({
-                    source: new BkgTopPlusOpen()
-                })
+                title: "Empty tile",
+                olLayer: new TileLayer()
             })
         ]
     });
@@ -278,10 +269,8 @@ it("results in an error, if using the same layer id twice", async () => {
                 }),
                 new SimpleLayer({
                     id: "l-1",
-                    title: "TopPlus Open",
-                    olLayer: new TileLayer({
-                        source: new BkgTopPlusOpen()
-                    })
+                    title: "Empty tile",
+                    olLayer: new TileLayer()
                 })
             ]
         });
@@ -294,9 +283,7 @@ it("supports reverse lookup from OpenLayers layer", async () => {
     const rawL1 = new TileLayer({
         source: new OSM()
     });
-    const rawL2 = new TileLayer({
-        source: new BkgTopPlusOpen()
-    });
+    const rawL2 = new TileLayer();
 
     model = await create("foo", {
         layers: [
diff --git a/src/packages/overview-map/OverviewMap.test.tsx b/src/packages/overview-map/OverviewMap.test.tsx
index 4aaf3ef85..5c2a8ca7f 100644
--- a/src/packages/overview-map/OverviewMap.test.tsx
+++ b/src/packages/overview-map/OverviewMap.test.tsx
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
 // SPDX-License-Identifier: Apache-2.0
 
-import { BkgTopPlusOpen } from "@open-pioneer/map";
 import { createServiceOptions, setupMap } from "@open-pioneer/map-test-utils";
 import { PackageContextProvider } from "@open-pioneer/test-utils/react";
 import { render, screen, waitFor } from "@testing-library/react";
@@ -9,7 +8,6 @@ import OlMap from "ol/Map";
 import { OverviewMap as OlOverviewMap } from "ol/control";
 import TileLayer from "ol/layer/Tile";
 import OSM from "ol/source/OSM";
-import WMTS from "ol/source/WMTS";
 import { expect, it } from "vitest";
 import { OverviewMap } from "./OverviewMap";
 
@@ -97,33 +95,6 @@ it("should successfully add OverviewMap control to the map controls", async () =
     expect(overViewMapControl).toBeDefined();
 });
 
-it("should support basemap type of OGC WMTS layer as a layer shown in the overview map", async () => {
-    const { mapId, map, injectedServices } = await setup();
-    const layer = getTileLayerOfWMTS();
-
-    render(
-        <PackageContextProvider services={injectedServices}>
-            <OverviewMap
-                mapId={mapId}
-                olLayer={layer}
-                className="test"
-                data-testid="overview-map"
-            ></OverviewMap>
-        </PackageContextProvider>
-    );
-
-    await waitForOverviewMap();
-    const overViewMapControl = getControl(map.olMap);
-    const wmtsLayer: TileLayer<WMTS> = overViewMapControl
-        ?.getOverviewMap()
-        ?.getLayers()
-        .getArray()[0] as TileLayer<WMTS>;
-    const source = wmtsLayer?.getSource();
-
-    expect(wmtsLayer).toBeInstanceOf(TileLayer);
-    expect(source).toBeInstanceOf(WMTS);
-});
-
 async function setup() {
     const { mapId, registry } = await setupMap();
     const injectedServices = createServiceOptions({ registry });
@@ -158,14 +129,6 @@ function getTileLayer() {
     return layer;
 }
 
-function getTileLayerOfWMTS() {
-    const layer = new TileLayer({
-        source: new BkgTopPlusOpen()
-    });
-    mockRender(layer);
-    return layer;
-}
-
 function mockRender(layer: TileLayer<any>) {
     // Overwrite render so it doesn't actually do anything during tests.
     // Would otherwise error because <canvas /> is not fully implemented in happy dom.
diff --git a/src/packages/toc/ui/LayerList/LayerItem.tsx b/src/packages/toc/ui/LayerList/LayerItem.tsx
index 23178cacd..187ee208a 100644
--- a/src/packages/toc/ui/LayerList/LayerItem.tsx
+++ b/src/packages/toc/ui/LayerList/LayerItem.tsx
@@ -170,7 +170,6 @@ function useTocItem(layer: AnyLayer) {
                 expanded.value = expand;
             }
         };
-        // TODO: isCollapsed -> recreate model is ok?
     }, [layer, options.initiallyCollapsed]);
 
     // Register the item on the shared toc model
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/AppUI.tsx b/src/samples/test-basemap-switcher/basemap-switcher-app/AppUI.tsx
deleted file mode 100644
index f668de5ef..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/AppUI.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-import { BasemapSwitcher } from "@open-pioneer/basemap-switcher";
-import {
-    Box,
-    Button,
-    Flex,
-    FormControl,
-    FormLabel,
-    ListItem,
-    Stack,
-    Text,
-    UnorderedList,
-    VStack
-} from "@open-pioneer/chakra-integration";
-import { TitledSection, SectionHeading } from "@open-pioneer/react-utils";
-import {
-    BkgTopPlusOpen,
-    MapAnchor,
-    MapContainer,
-    SimpleLayer,
-    useMapModel
-} from "@open-pioneer/map";
-import TileLayer from "ol/layer/Tile";
-import { useIntl } from "open-pioneer:react-hooks";
-import { useRef } from "react";
-import { MAP_ID } from "./MapConfigProviderImpl";
-
-export function AppUI() {
-    const intl = useIntl();
-
-    return (
-        <Flex height="100%" direction="column" overflow="hidden">
-            <TitledSection
-                title={
-                    <Box textAlign="center" py={1}>
-                        <SectionHeading size={"md"}>
-                            OpenLayers Base Packages - Basemap Switcher
-                        </SectionHeading>
-                    </Box>
-                }
-            >
-                <Flex flex="1" direction="column" position="relative">
-                    <MapContainer mapId={MAP_ID}>
-                        <MapAnchor position="top-left" horizontalGap={10} verticalGap={10}>
-                            <Box
-                                backgroundColor="whiteAlpha.900"
-                                borderWidth="1px"
-                                borderRadius="lg"
-                                padding={2}
-                                boxShadow="lg"
-                            >
-                                <FormControl>
-                                    <FormLabel ps={1}>
-                                        <Text as="b">
-                                            {intl.formatMessage({ id: "basemapLabel" })}
-                                        </Text>
-                                    </FormLabel>
-                                    <BasemapSwitcher
-                                        allowSelectingEmptyBasemap
-                                        mapId={MAP_ID}
-                                    ></BasemapSwitcher>
-                                </FormControl>
-                                <Stack pt={5}>
-                                    <Text align="center">Test Controls:</Text>
-                                    <AddNewBaseLayerButton mapId={MAP_ID} />
-                                    <ToggleBaseLayerButton mapId={MAP_ID} />
-                                    <ClearBaseLayerButton mapId={MAP_ID} />
-                                </Stack>
-                            </Box>
-                        </MapAnchor>
-                        <MapAnchor position="top-right" horizontalGap={10} verticalGap={10}>
-                            <VStack
-                                backgroundColor="whiteAlpha.900"
-                                borderWidth="1px"
-                                borderRadius="lg"
-                                padding={2}
-                                boxShadow="lg"
-                                maxWidth="400px"
-                            >
-                                <Text as="b">Description</Text>
-                                <Text>
-                                    This application can be used to test the basemap switcher. The
-                                    basemap switcher synchronizes with the state of the shared map
-                                    model. If the map model is changed (for example, by changing the
-                                    current basemap), the basemap switcher must update itself
-                                    accordingly.
-                                </Text>
-                                <UnorderedList>
-                                    <ListItem>
-                                        Adding a new basemap updates the dropdown menu (new option)
-                                    </ListItem>
-                                    <ListItem>
-                                        Changing the current basemap to another basemap updates the
-                                        selected option
-                                    </ListItem>
-                                    <ListItem>
-                                        Setting the current basemap to {"'undefined'"} also updates
-                                        the selection
-                                    </ListItem>
-                                </UnorderedList>
-                            </VStack>
-                        </MapAnchor>
-                    </MapContainer>
-                </Flex>
-            </TitledSection>
-        </Flex>
-    );
-}
-
-function AddNewBaseLayerButton(props: { mapId: string }) {
-    const { mapId } = props;
-    const { map } = useMapModel(mapId);
-    const counter = useRef(1);
-    const onClick = () => {
-        if (!map) {
-            return;
-        }
-
-        const number = counter.current++;
-        const layer = new SimpleLayer({
-            title: `New Layer ${number}`,
-            isBaseLayer: true,
-            olLayer: new TileLayer({
-                source: new BkgTopPlusOpen({ layer: "web_grau" })
-            })
-        });
-        map.layers.addLayer(layer);
-        console.log("generated base layer with id", layer.id);
-    };
-
-    return <Button onClick={onClick}>Add base layer</Button>;
-}
-
-function ToggleBaseLayerButton(props: { mapId: string }) {
-    const { mapId } = props;
-    const { map } = useMapModel(mapId);
-    const onClick = () => {
-        if (!map) {
-            return;
-        }
-
-        const baseLayers = map.layers.getAllLayers();
-        if (baseLayers.length === 0) {
-            console.error("There is no base layer");
-            return;
-        }
-
-        const randomIndex = Math.floor(Math.random() * baseLayers.length);
-        const layer = baseLayers[randomIndex];
-        if (!layer) {
-            console.error("Failed to find a layer");
-            return;
-        }
-
-        console.log("activating base layer", layer.id);
-        map.layers.activateBaseLayer(layer.id);
-    };
-
-    return <Button onClick={onClick}>Activate random base layer</Button>;
-}
-
-function ClearBaseLayerButton(props: { mapId: string }) {
-    const { mapId } = props;
-    const { map } = useMapModel(mapId);
-    const onClick = () => {
-        if (!map) {
-            return;
-        }
-
-        console.log("setting active base layer to undefined");
-        map.layers.activateBaseLayer(undefined);
-    };
-
-    return <Button onClick={onClick}>Clear base layer</Button>;
-}
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/MapConfigProviderImpl.ts b/src/samples/test-basemap-switcher/basemap-switcher-app/MapConfigProviderImpl.ts
deleted file mode 100644
index d348c549f..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/MapConfigProviderImpl.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-import { MapConfig, MapConfigProvider, SimpleLayer } from "@open-pioneer/map";
-import TileLayer from "ol/layer/Tile";
-import OSM from "ol/source/OSM";
-
-export const MAP_ID = "main";
-
-export class MapConfigProviderImpl implements MapConfigProvider {
-    mapId = MAP_ID;
-
-    async getMapConfig(): Promise<MapConfig> {
-        return {
-            initialView: {
-                kind: "position",
-                center: { x: 404747, y: 5757920 },
-                zoom: 14
-            },
-            layers: [
-                new SimpleLayer({
-                    title: "OSM",
-                    isBaseLayer: true,
-                    olLayer: new TileLayer({
-                        source: new OSM()
-                    })
-                })
-            ]
-        };
-    }
-}
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/app.ts b/src/samples/test-basemap-switcher/basemap-switcher-app/app.ts
deleted file mode 100644
index 6050ea706..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/app.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-import { createCustomElement } from "@open-pioneer/runtime";
-import { theme } from "@open-pioneer/theme";
-import * as appMetadata from "open-pioneer:app";
-import { AppUI } from "./AppUI";
-
-const element = createCustomElement({
-    component: AppUI,
-    theme,
-    appMetadata
-});
-
-customElements.define("basemap-switcher-app", element);
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/build.config.mjs b/src/samples/test-basemap-switcher/basemap-switcher-app/build.config.mjs
deleted file mode 100644
index 28f8b7ec2..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/build.config.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-import { defineBuildConfig } from "@open-pioneer/build-support";
-
-export default defineBuildConfig({
-    i18n: ["en"],
-    services: {
-        MapConfigProviderImpl: {
-            provides: ["map.MapConfigProvider"]
-        }
-    }
-});
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/i18n/en.yaml b/src/samples/test-basemap-switcher/basemap-switcher-app/i18n/en.yaml
deleted file mode 100644
index dfc4c2903..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/i18n/en.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-messages:
-  basemapLabel: "Select basemap:"
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/package.json b/src/samples/test-basemap-switcher/basemap-switcher-app/package.json
deleted file mode 100644
index 85ea4ff5e..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "basemap-switcher-app",
-    "private": true,
-    "dependencies": {
-        "@open-pioneer/basemap-switcher": "workspace:^",
-        "@open-pioneer/chakra-integration": "catalog:",
-        "@open-pioneer/map": "workspace:^",
-        "@open-pioneer/react-utils": "catalog:",
-        "@open-pioneer/runtime": "catalog:",
-        "@open-pioneer/theme": "workspace:^",
-        "react": "catalog:"
-    },
-    "version": "0.0.11"
-}
diff --git a/src/samples/test-basemap-switcher/basemap-switcher-app/services.ts b/src/samples/test-basemap-switcher/basemap-switcher-app/services.ts
deleted file mode 100644
index 60f6dc663..000000000
--- a/src/samples/test-basemap-switcher/basemap-switcher-app/services.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Open Pioneer project (https://github.com/open-pioneer)
-// SPDX-License-Identifier: Apache-2.0
-export { MapConfigProviderImpl } from "./MapConfigProviderImpl";
diff --git a/src/samples/test-basemap-switcher/index.html b/src/samples/test-basemap-switcher/index.html
deleted file mode 100644
index 1c709151c..000000000
--- a/src/samples/test-basemap-switcher/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html>
-<html lang="en" style="height: 100%">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Basemap Switcher Test App</title>
-        <link rel="icon" type="image/x-icon" href="./../../favicon.ico" />
-        <style>
-            html,
-            body {
-                margin: 0px;
-            }
-
-            .full-height {
-                height: 100%;
-                max-height: 100%;
-            }
-        </style>
-    </head>
-
-    <body class="full-height">
-        <basemap-switcher-app class="full-height"></basemap-switcher-app>
-        <script type="module" src="./basemap-switcher-app/app.ts"></script>
-    </body>
-</html>
diff --git a/vite.config.ts b/vite.config.ts
index 0e361dd93..63b00e26a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,7 +19,6 @@ const sampleSites = [
     "samples/ogc-api-sample",
     "samples/showcase",
 
-    "samples/test-basemap-switcher",
     "samples/test-toc",
     "samples/test-highlight-and-zoom",
     "samples/test-menu-fix",