diff --git a/packages/api/src/features.ts b/packages/api/src/features.ts
index 085623c000..2ff64c51cc 100644
--- a/packages/api/src/features.ts
+++ b/packages/api/src/features.ts
@@ -6,7 +6,7 @@ import type Feature from 'ol/Feature'
 import type { LineString, MultiLineString, MultiPolygon, Point, Polygon } from 'ol/geom'
 
 import { allCoordinateSystems, extentUtils, LV95 } from '@swissgeo/coordinates'
-import { ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP, LayerType } from '@swissgeo/layers'
+import { ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP } from '@swissgeo/layers'
 import { geoJsonUtils, layerUtils } from '@swissgeo/layers/utils'
 import log from '@swissgeo/log'
 import { getApi3BaseUrl } from '@swissgeo/staging-config'
@@ -236,7 +236,7 @@ async function identifyOnExternalLayer(config: IdentifyConfig): Promise<LayerFea
         // If we use different projection, we also need to project out initial coordinate
         requestedCoordinate = proj4(projection.epsg, requestProjection.epsg, coordinate)
     }
-    if (layer.type === LayerType.WMS) {
+    if (layer.type === 'WMS') {
         return await identifyOnExternalWmsLayer({
             ...config,
             coordinate: requestedCoordinate,
@@ -483,7 +483,7 @@ async function identifyOnExternalWmsLayer(config: IdentifyConfig): Promise<Layer
                     outputProjection ?? projection,
                     projection
                 ),
-                popupDataCanBeTrusted: !layer.isExternal && layer.type !== LayerType.KML,
+                popupDataCanBeTrusted: !layer.isExternal && layer.type !== 'KML',
             }
             return layerFeature
         })
@@ -657,7 +657,7 @@ function parseGeomAdminFeature(
         coordinates: center,
         extent: featureExtent,
         geometry: featureGeoJSONGeometry,
-        popupDataCanBeTrusted: !layer.isExternal && layer.type !== LayerType.KML,
+        popupDataCanBeTrusted: !layer.isExternal && layer.type !== 'KML',
     }
     return layerFeature
 }
diff --git a/packages/api/src/search.ts b/packages/api/src/search.ts
index 73c8c80a1f..973b377e7e 100644
--- a/packages/api/src/search.ts
+++ b/packages/api/src/search.ts
@@ -4,7 +4,6 @@ import type { AxiosResponse, CancelToken, CancelTokenSource } from 'axios'
 import type Feature from 'ol/Feature'
 
 import { CustomCoordinateSystem, LV95, WGS84 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { geoJsonUtils } from '@swissgeo/layers/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { getApi3BaseUrl } from '@swissgeo/staging-config'
@@ -327,7 +326,7 @@ function searchLayerFeaturesKMLGPX(
     iconSets: DrawingIconSet[]
 ): SearchResult[] {
     return layersToSearch.reduce((returnLayers: SearchResult[], currentLayer: Layer) => {
-        if (currentLayer.type === LayerType.KML) {
+        if (currentLayer.type === 'KML') {
             const kmlLayer = currentLayer as KMLLayer
             return returnLayers.concat(
                 searchFeatures(
@@ -338,7 +337,7 @@ function searchLayerFeaturesKMLGPX(
                 )
             )
         }
-        if (currentLayer.type === LayerType.GPX) {
+        if (currentLayer.type === 'GPX') {
             const gpxLayer = currentLayer as GPXLayer
             const gpxData = gpxLayer.gpxData
             if (!gpxData) {
diff --git a/packages/api/src/utils/__tests__/legacyLayerParamUtils.spec.ts b/packages/api/src/utils/__tests__/legacyLayerParamUtils.spec.ts
index 8f88b10ab8..755664c40f 100644
--- a/packages/api/src/utils/__tests__/legacyLayerParamUtils.spec.ts
+++ b/packages/api/src/utils/__tests__/legacyLayerParamUtils.spec.ts
@@ -1,6 +1,5 @@
 import type { ExternalWMSLayer, GeoAdminLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { layerUtils, timeConfigUtils } from '@swissgeo/layers/utils'
 import { describe, expect, it } from 'vitest'
 
@@ -162,7 +161,7 @@ describe('Test parsing of legacy URL param into new params', () => {
                 expect(result).to.be.an('Array').length(1)
                 const [kmlLayer] = result
                 expect(kmlLayer.id).to.eq(`KML|${kmlFileUrl}`)
-                expect(kmlLayer.type).to.eq(LayerType.KML)
+                expect(kmlLayer.type).to.eq('KML')
                 expect(kmlLayer.baseUrl).to.eq(kmlFileUrl)
             })
             it('Handles opacity/visibility correctly with external layers', () => {
@@ -194,7 +193,7 @@ describe('Test parsing of legacy URL param into new params', () => {
                 )
                 expect(result).to.be.an('Array').length(1)
                 const [externalWmsLayer] = result
-                expect(externalWmsLayer.type).to.eq(LayerType.WMS)
+                expect(externalWmsLayer.type).to.eq('WMS')
                 expect(externalWmsLayer.opacity).to.eq(0.45)
                 expect((externalWmsLayer as ExternalWMSLayer).wmsVersion).to.eq(wmsVersion)
                 expect(externalWmsLayer.id).to.eq(wmsLayerId)
@@ -216,7 +215,7 @@ describe('Test parsing of legacy URL param into new params', () => {
                 )
                 expect(result).to.be.an('Array').length(1)
                 const [externalWmtsLayer] = result
-                expect(externalWmtsLayer.type).to.eq(LayerType.WMTS)
+                expect(externalWmtsLayer.type).to.eq('WMTS')
                 expect(externalWmtsLayer.opacity).to.eq(0.77)
                 expect(externalWmtsLayer.isVisible).to.be.false
                 expect(externalWmtsLayer.id).to.eq(wmtsLayerId)
diff --git a/packages/api/src/utils/kmlUtils.ts b/packages/api/src/utils/kmlUtils.ts
index 489b07359a..63811f8488 100644
--- a/packages/api/src/utils/kmlUtils.ts
+++ b/packages/api/src/utils/kmlUtils.ts
@@ -9,7 +9,6 @@ import type { Size } from 'ol/size'
 import type Style from 'ol/style/Style'
 
 import { registerProj4, WGS84 } from '@swissgeo/coordinates'
-import { KMLStyle } from '@swissgeo/layers'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import {
     DEFAULT_TITLE_OFFSET,
@@ -595,7 +594,8 @@ function getEditableFeatureFromKmlFeature(
         iconSize,
         textPlacement,
         showDescriptionOnMap,
-    } as EditableFeature
+        isEditable: true,
+    }
 }
 
 /**
@@ -776,7 +776,7 @@ function parseKml(
         featureProjection: projection.epsg,
     })
 
-    if (kmlLayer.style === KMLStyle.GEOADMIN) {
+    if (kmlLayer.style === 'GEOADMIN') {
         features.forEach((olFeature) => {
             const editableFeature = getEditableFeatureFromKmlFeature(
                 olFeature,
@@ -856,7 +856,11 @@ export interface KMZObject {
  * @returns Returns a KMZ unzip object
  */
 async function unzipKmz(kmzContent: ArrayBuffer, kmzFileName: string): Promise<KMZObject> {
-    const kmz: KMZObject = { name: kmzFileName, files: new Map<string, ArrayBuffer>(), kmz: kmzContent }
+    const kmz: KMZObject = {
+        name: kmzFileName,
+        files: new Map<string, ArrayBuffer>(),
+        kmz: kmzContent,
+    }
     const zip = new JSZip()
     try {
         await zip.loadAsync(kmzContent)
diff --git a/packages/api/src/utils/legacyLayerParamUtils.ts b/packages/api/src/utils/legacyLayerParamUtils.ts
index 9e4dae0011..ff4c9c889a 100644
--- a/packages/api/src/utils/legacyLayerParamUtils.ts
+++ b/packages/api/src/utils/legacyLayerParamUtils.ts
@@ -1,7 +1,6 @@
 import type { GeoAdminLayer, KMLLayer, Layer } from '@swissgeo/layers'
 import type { Staging } from '@swissgeo/staging-config'
 
-import { KMLStyle } from '@swissgeo/layers'
 import { layerUtils, timeConfigUtils } from '@swissgeo/layers/utils'
 import log from '@swissgeo/log'
 
@@ -114,7 +113,7 @@ function getLayersFromLegacyUrlParams(
             layer = layerUtils.makeKMLLayer({
                 kmlFileUrl: url,
                 isVisible: true,
-                style: KMLStyle.GEOADMIN,
+                style: 'GEOADMIN',
             })
         }
         if (layerId.startsWith('GPX||')) {
@@ -219,7 +218,10 @@ function getBackgroundLayerFromLegacyUrlParams(
  * @param adminId KML admin ID
  * @returns KML Layer
  */
-async function getKmlLayerFromLegacyAdminIdParam(adminId: string, staging: Staging = 'production'): Promise<KMLLayer> {
+async function getKmlLayerFromLegacyAdminIdParam(
+    adminId: string,
+    staging: Staging = 'production'
+): Promise<KMLLayer> {
     const kmlMetadata = await filesAPI.getKmlMetadataByAdminId(adminId, staging)
     return layerUtils.makeKMLLayer({
         kmlFileUrl: kmlMetadata.links.kml,
diff --git a/packages/config/staging/src/constants/print.config.ts b/packages/config/staging/src/constants/print.config.ts
index 36018b28a1..b0d162408c 100644
--- a/packages/config/staging/src/constants/print.config.ts
+++ b/packages/config/staging/src/constants/print.config.ts
@@ -6,15 +6,7 @@ export const PRINT_DPI_COMPENSATION: number = 144
 //So when there is a non 0 scale, we set its minimum to 0.0001
 export const MIN_PRINT_SCALE_SIZE: number = 0.0001
 
-export enum PrintLayout {
-    A0 = 'A0',
-    A1 = 'A1',
-    A2 = 'A2',
-    A3 = 'A3',
-    A4 = 'A4',
-    A5 = 'A5',
-    A6 = 'A6',
-}
+export type PrintLayout = 'A0' | 'A1' | 'A2' | 'A3' | 'A4' | 'A5' | 'A6'
 
 /** Dimensions in mm of the viewport for each print format */
 export const PRINT_DIMENSIONS: Record<PrintLayout, [number, number]> = {
diff --git a/packages/layers/src/api/__test__/internal.spec.ts b/packages/layers/src/api/__test__/internal.spec.ts
index a847d7eb15..36da2d2876 100644
--- a/packages/layers/src/api/__test__/internal.spec.ts
+++ b/packages/layers/src/api/__test__/internal.spec.ts
@@ -9,7 +9,7 @@ import type {
 } from '@/types'
 
 import { generateLayerObject } from '@/api'
-import { LayerType, YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA } from '@/types'
+import { YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA } from '@/types'
 
 import rawLayerConfig from './rawLayerConfig.json'
 
@@ -251,7 +251,7 @@ describe('Test layer config parsing', () => {
             const layer = parseLayer(layerId)
 
             expect(layer).to.not.be.undefined
-            expect(layer.type).to.eq(LayerType.GEOJSON)
+            expect(layer.type).to.eq('GEOJSON')
             const geoJsonLayer = layer as GeoAdminGeoJSONLayer
 
             expect(geoJsonLayer.geoJsonUrl).to.eq(
diff --git a/packages/layers/src/api/internal.ts b/packages/layers/src/api/internal.ts
index c7f3eb29db..56569d1270 100644
--- a/packages/layers/src/api/internal.ts
+++ b/packages/layers/src/api/internal.ts
@@ -14,7 +14,6 @@ import type {
 } from '@/index'
 
 import { DEFAULT_GEOADMIN_MAX_WMTS_RESOLUTION } from '@/config'
-import { LayerType } from '@/index'
 import { layerUtils, timeConfigUtils } from '@/utils'
 
 export interface LayerConfigResponse {
@@ -150,7 +149,7 @@ export function generateLayerObject(
             break
         case 'wmts': {
             return layerUtils.makeGeoAdminWMTSLayer({
-                type: LayerType.WMTS,
+                type: 'WMTS',
                 name,
                 id,
                 baseUrl: _urlWithTrailingSlash(getWmtsBaseUrl(staging)),
@@ -173,7 +172,7 @@ export function generateLayerObject(
         }
         case 'wms': {
             return layerUtils.makeGeoAdminWMSLayer({
-                type: LayerType.WMS,
+                type: 'WMS',
                 name,
                 id: id,
                 idIn3d: layerConfig.config3d,
@@ -197,7 +196,7 @@ export function generateLayerObject(
         }
         case 'geojson': {
             return layerUtils.makeGeoAdminGeoJSONLayer({
-                type: LayerType.GEOJSON,
+                type: 'GEOJSON',
                 name,
                 id,
                 opacity,
@@ -250,10 +249,7 @@ export function generateLayerObject(
                     lang,
                     staging
                 )
-                if (
-                    subLayer &&
-                    (subLayer.type === LayerType.WMS || subLayer.type === LayerType.WMTS)
-                ) {
+                if (subLayer && (subLayer.type === 'WMS' || subLayer.type === 'WMTS')) {
                     subLayers.push(
                         layerUtils.makeAggregateSubLayer({
                             subLayerId,
diff --git a/packages/layers/src/parsers/WMTSCapabilitiesParser.ts b/packages/layers/src/parsers/WMTSCapabilitiesParser.ts
index a7ea1e6391..2fcc82ed98 100644
--- a/packages/layers/src/parsers/WMTSCapabilitiesParser.ts
+++ b/packages/layers/src/parsers/WMTSCapabilitiesParser.ts
@@ -23,10 +23,10 @@ import type {
     WMTSLegendURL,
     WMTSOnlineResource,
     WMTSTileMatrixSetLink,
+    WMTSEncodingType,
 } from '@/types'
 import type { TileMatrix } from '@/types/layers'
 
-import { LayerType, WMTSEncodingType } from '@/types'
 import layerUtils from '@/utils/layerUtils'
 import timeConfigUtils from '@/utils/timeConfigUtils'
 import { CapabilitiesError } from '@/validation'
@@ -331,7 +331,7 @@ function getLayerAttributes(
         getCapUrl = capabilities.originUrl.toString()
     }
 
-    let getTileEncoding: WMTSEncodingType = WMTSEncodingType.REST
+    let getTileEncoding: WMTSEncodingType = 'REST'
     if (
         capabilities.OperationsMetadata &&
         'GetTile' in capabilities.OperationsMetadata &&
@@ -471,7 +471,7 @@ function getExternalLayer(
     }
 
     return layerUtils.makeExternalWMTSLayer({
-        type: LayerType.WMTS,
+        type: 'WMTS',
         ...attributes,
         opacity,
         isVisible,
diff --git a/packages/layers/src/types/layers.ts b/packages/layers/src/types/layers.ts
index 1744067491..33df86deac 100644
--- a/packages/layers/src/types/layers.ts
+++ b/packages/layers/src/types/layers.ts
@@ -11,17 +11,18 @@ export type * from '@/types/geoJsonStyle'
 export const DEFAULT_OPACITY = 1.0
 export const WMS_SUPPORTED_VERSIONS = ['1.3.0']
 
-export enum LayerType {
-    WMTS = 'WMTS',
-    WMS = 'WMS',
-    GEOJSON = 'GEOJSON',
-    AGGREGATE = 'AGGREGATE',
-    KML = 'KML',
-    GPX = 'GPX',
-    VECTOR = 'VECTOR',
-    GROUP = 'GROUP',
-    COG = 'COG',
-}
+export const LayerTypes = [
+    'WMTS',
+    'WMS',
+    'GEOJSON',
+    'AGGREGATE',
+    'KML',
+    'GPX',
+    'VECTOR',
+    'GROUP',
+    'COG',
+] as const
+export type LayerType = (typeof LayerTypes)[number]
 
 export interface LayerAttribution {
     name: string
@@ -97,6 +98,8 @@ export interface Layer {
     readonly isExternal: boolean
     /** Set to true if some parts of the layer (e.g. metadata) are still loading */
     isLoading: boolean
+    /** Promise that resolves when the layer is fully loaded */
+    loadedPromise?: Promise<void>
     /** Time series config */
     timeConfig: LayerTimeConfig
     /**
@@ -154,7 +157,7 @@ export interface GeoAdminLayer extends Layer {
 
 /** Represent a WMS Layer from geo.admin.ch */
 export interface GeoAdminWMSLayer extends GeoAdminLayer {
-    readonly type: LayerType.WMS
+    readonly type: 'WMS'
     /**
      * How much of a gutter (extra pixels around the image) we want. This is specific for tiled WMS,
      * if unset this layer will be a considered a single tile WMS.
@@ -173,7 +176,7 @@ export interface GeoAdminWMSLayer extends GeoAdminLayer {
 
 /** Represent a WMTS layer from geo.admin.ch */
 export interface GeoAdminWMTSLayer extends GeoAdminLayer {
-    readonly type: LayerType.WMTS
+    readonly type: 'WMTS'
     /** Define the maximum resolution the layer can reach */
     readonly maxResolution: number
     /** In which image format the backend must be requested. */
@@ -181,7 +184,7 @@ export interface GeoAdminWMTSLayer extends GeoAdminLayer {
 }
 
 export interface GeoAdmin3DLayer extends GeoAdminLayer {
-    readonly type: LayerType.VECTOR
+    readonly type: 'VECTOR'
     /* If the JSON file stored in the /3d-tiles/ sub-folder on the S3 bucket */
     readonly use3dTileSubFolder: boolean
     /**
@@ -193,7 +196,7 @@ export interface GeoAdmin3DLayer extends GeoAdminLayer {
 }
 
 export interface GeoAdminGeoJSONLayer extends GeoAdminLayer {
-    readonly type: LayerType.GEOJSON
+    readonly type: 'GEOJSON'
     /**
      * Delay after which the data of this layer should be re-requested (if null is given, no further
      * data reload will be triggered). A good example would be layer
@@ -209,7 +212,7 @@ export interface GeoAdminGeoJSONLayer extends GeoAdminLayer {
 }
 
 export interface GeoAdminVectorLayer extends GeoAdminLayer {
-    readonly type: LayerType.VECTOR
+    readonly type: 'VECTOR'
 }
 
 // #endregion
@@ -221,7 +224,7 @@ export interface FileLayer extends Layer {
 }
 
 export interface CloudOptimizedGeoTIFFLayer extends FileLayer {
-    readonly type: LayerType.COG
+    readonly type: 'COG'
     readonly fileSource?: string
     /** Data/content of the COG file, as a string. */
     data?: string | Blob
@@ -274,13 +277,10 @@ export interface KMLMetadata {
     readonly links: KMLMetadataLinks
 }
 
-export enum KMLStyle {
-    DEFAULT = 'DEFAULT',
-    GEOADMIN = 'GEOADMIN',
-}
+export type KMLStyle = 'DEFAULT' | 'GEOADMIN'
 
 export interface KMLLayer extends FileLayer {
-    readonly type: LayerType.KML
+    readonly type: 'KML'
     /** The URL to access the KML data. */
     kmlFileUrl: string
     /**
@@ -320,8 +320,8 @@ export interface KMLLayer extends FileLayer {
      */
     linkFiles?: Record<string, ArrayBuffer>
     /**
-     * KMZ content as ArrayBuffer. This is used to load the KMZ in the 3D viewer (Cesium), so that it
-     * is able to link all the files inside the KMZ archive.
+     * KMZ content as ArrayBuffer. This is used to load the KMZ in the 3D viewer (Cesium), so that
+     * it is able to link all the files inside the KMZ archive.
      */
     kmzContent?: ArrayBuffer
     /**
@@ -355,7 +355,7 @@ export interface GPXMetadata {
 }
 
 export interface GPXLayer extends FileLayer {
-    readonly type: LayerType.GPX
+    readonly type: 'GPX'
     /** URL to the GPX file (can also be a local file URI) */
     readonly gpxFileUrl?: string
     /** Data/content of the GPX file, as a string. */
@@ -407,10 +407,7 @@ export interface BoundingBox {
     readonly dimensions?: number
 }
 
-export enum WMTSEncodingType {
-    KVP = 'KVP',
-    REST = 'REST',
-}
+export type WMTSEncodingType = 'KVP' | 'REST'
 
 /** Configuration describing how to request this layer's server to get feature information. */
 export interface ExternalLayerGetFeatureInfoCapability {
@@ -435,7 +432,7 @@ export interface ExternalLayer extends Layer {
 }
 
 export interface ExternalWMTSLayer extends ExternalLayer {
-    readonly type: LayerType.WMTS
+    readonly type: 'WMTS'
     /** WMTS Get Capabilities options */
     readonly options?: Partial<Options>
     /** WMTS Get Tile encoding (KVP or REST). */
@@ -452,7 +449,7 @@ export interface ExternalWMTSLayer extends ExternalLayer {
 }
 
 export interface ExternalWMSLayer extends ExternalLayer {
-    readonly type: LayerType.WMS
+    readonly type: 'WMS'
     /**
      * Description of the layers being part of this WMS layer (they will all be displayed at the
      * same time, in contrast to an aggregate layer)
@@ -482,12 +479,12 @@ export interface AggregateSubLayer {
 }
 
 export interface GeoAdminAggregateLayer extends GeoAdminLayer {
-    readonly type: LayerType.AGGREGATE
+    readonly type: 'AGGREGATE'
     readonly subLayers: AggregateSubLayer[]
 }
 
 export interface GeoAdminGroupOfLayers extends GeoAdminLayer {
-    readonly type: LayerType.GROUP
+    readonly type: 'GROUP'
     /** Description of the layers being part of this group */
     readonly layers: GeoAdminLayer[]
 }
diff --git a/packages/layers/src/utils/__test__/timeConfigUtils.spec.ts b/packages/layers/src/utils/__test__/timeConfigUtils.spec.ts
index bbc7841099..a2cad7bfbe 100644
--- a/packages/layers/src/utils/__test__/timeConfigUtils.spec.ts
+++ b/packages/layers/src/utils/__test__/timeConfigUtils.spec.ts
@@ -3,7 +3,6 @@ import { describe, it } from 'vitest'
 
 import type { Layer } from '@/types/layers'
 
-import { LayerType } from '@/types/layers'
 import timeConfigUtils from '@/utils/timeConfigUtils'
 
 describe('Test utility functions', () => {
@@ -14,7 +13,7 @@ describe('Test utility functions', () => {
             id: 'ch.bgdi.simple',
             opacity: 0,
             isVisible: true,
-            type: LayerType.WMTS,
+            type: 'WMTS',
             attributions: [],
             hasTooltip: false,
             hasDescription: false,
diff --git a/packages/layers/src/utils/layerUtils.ts b/packages/layers/src/utils/layerUtils.ts
index 1593557904..e3a3c76776 100644
--- a/packages/layers/src/utils/layerUtils.ts
+++ b/packages/layers/src/utils/layerUtils.ts
@@ -20,12 +20,13 @@ import type {
     GeoAdminWMTSLayer,
     GPXLayer,
     KMLLayer,
+    KMLStyle,
     Layer,
     LayerAttribution,
 } from '@/types/layers'
 
 import { DEFAULT_GEOADMIN_MAX_WMTS_RESOLUTION } from '@/config'
-import { DEFAULT_OPACITY, KMLStyle, LayerType, WMTSEncodingType } from '@/types/layers'
+import { DEFAULT_OPACITY } from '@/types/layers'
 import timeConfigUtils from '@/utils/timeConfigUtils'
 import { InvalidLayerDataError } from '@/validation'
 
@@ -33,10 +34,6 @@ export const EMPTY_KML_DATA = '<kml></kml>'
 
 const ENC_PIPE = '%7C'
 
-function transformToLayerTypeEnum(value: string): LayerType | undefined {
-    return Object.values(LayerType).includes(value as LayerType) ? (value as LayerType) : undefined
-}
-
 /**
  * Determine if a file URL is a local file or a remote URL.
  *
@@ -84,7 +81,7 @@ function makeGeoAdminWMSLayer(values: Partial<GeoAdminWMSLayer>): GeoAdminWMSLay
     const defaults: DefaultLayerConfig<GeoAdminWMSLayer> = {
         uuid: uuidv4(),
         isExternal: false,
-        type: LayerType.WMS,
+        type: 'WMS',
         opacity: DEFAULT_OPACITY,
         isVisible: true,
         isLoading: false,
@@ -123,7 +120,7 @@ function makeGeoAdminWMSLayer(values: Partial<GeoAdminWMSLayer>): GeoAdminWMSLay
 function makeGeoAdminWMTSLayer(values: Partial<GeoAdminWMTSLayer>): GeoAdminWMTSLayer {
     const defaults: DefaultLayerConfig<GeoAdminWMTSLayer> = {
         uuid: uuidv4(),
-        type: LayerType.WMTS,
+        type: 'WMTS',
         idIn3d: undefined,
         technicalName: undefined,
         opacity: 1.0,
@@ -169,13 +166,13 @@ function makeExternalWMTSLayer(values: Partial<ExternalWMTSLayer>): ExternalWMTS
     const defaults: DefaultLayerConfig<ExternalWMTSLayer> = {
         uuid: uuidv4(),
         isExternal: true,
-        type: LayerType.WMTS,
+        type: 'WMTS',
         opacity: DEFAULT_OPACITY,
         isVisible: true,
         abstract: '',
         legends: [],
         availableProjections: [],
-        getTileEncoding: WMTSEncodingType.REST,
+        getTileEncoding: 'REST',
         urlTemplate: '',
         style: '',
         tileMatrixSets: [],
@@ -238,7 +235,7 @@ function makeExternalWMSLayer(values: Partial<ExternalWMSLayer>): ExternalWMSLay
         dimensions: [],
         currentYear: undefined,
         customAttributes: undefined,
-        type: LayerType.WMS,
+        type: 'WMS',
         isExternal: true,
         hasError: false,
         hasWarning: false,
@@ -299,7 +296,7 @@ function makeKMLLayer(values: Partial<KMLLayer>): KMLLayer {
     if (values.style !== undefined) {
         style = values.style
     } else {
-        style = isExternal ? KMLStyle.DEFAULT : KMLStyle.GEOADMIN
+        style = isExternal ? 'DEFAULT' : 'GEOADMIN'
     }
 
     let fileId = values.fileId
@@ -345,7 +342,7 @@ function makeKMLLayer(values: Partial<KMLLayer>): KMLLayer {
         isLocalFile: isLocal,
         attributions,
         style,
-        type: LayerType.KML,
+        type: 'KML',
         hasTooltip: false,
         hasError: false,
         hasWarning: false,
@@ -400,7 +397,7 @@ function makeGPXLayer(values: Partial<GPXLayer>): GPXLayer {
         extent: undefined,
         name: name,
         id: `GPX|${encodeExternalLayerParam(values.gpxFileUrl)}`,
-        type: LayerType.GPX,
+        type: 'GPX',
         opacity: 0,
         isVisible: false,
         attributions,
@@ -436,7 +433,7 @@ function makeGeoAdminVectorLayer(values: Partial<GeoAdminVectorLayer>): GeoAdmin
 
     const defaults: DefaultLayerConfig<GeoAdminVectorLayer> = {
         uuid: uuidv4(),
-        type: LayerType.VECTOR,
+        type: 'VECTOR',
         technicalName: '',
         attributions,
         opacity: 0,
@@ -480,7 +477,7 @@ function makeGeoAdmin3DLayer(values: Partial<GeoAdmin3DLayer>): GeoAdmin3DLayer
         use3dTileSubFolder: false,
         urlTimestampToUse: undefined,
         name: values.name ?? values.id ?? '3D layer',
-        type: LayerType.VECTOR,
+        type: 'VECTOR',
         opacity: 1,
         isVisible: true,
         attributions,
@@ -528,7 +525,7 @@ function makeCloudOptimizedGeoTIFFLayer(
     const defaults: CloudOptimizedGeoTIFFLayer = {
         uuid: uuidv4(),
         baseUrl: fileSource,
-        type: LayerType.COG,
+        type: 'COG',
         isLocalFile: isLocal,
         fileSource: undefined,
         data: undefined,
@@ -565,7 +562,7 @@ function makeGeoAdminAggregateLayer(
 ): GeoAdminAggregateLayer {
     const defaults: DefaultLayerConfig<GeoAdminAggregateLayer> = {
         uuid: uuidv4(),
-        type: LayerType.AGGREGATE,
+        type: 'AGGREGATE',
         subLayers: [],
         opacity: 1,
         isVisible: true,
@@ -600,7 +597,7 @@ function makeGeoAdminAggregateLayer(
 function makeGeoAdminGeoJSONLayer(values: Partial<GeoAdminGeoJSONLayer>): GeoAdminGeoJSONLayer {
     const defaults: DefaultLayerConfig<GeoAdminGeoJSONLayer> = {
         uuid: uuidv4(),
-        type: LayerType.GEOJSON,
+        type: 'GEOJSON',
         updateDelay: 0,
         styleUrl: '',
         geoJsonUrl: '',
@@ -642,7 +639,7 @@ function makeGeoAdminGroupOfLayers(values: Partial<GeoAdminGroupOfLayers>): GeoA
     const defaults: DefaultLayerConfig<GeoAdminGroupOfLayers> = {
         uuid: uuidv4(),
         layers: [],
-        type: LayerType.GROUP,
+        type: 'GROUP',
         opacity: 1,
         isVisible: true,
         attributions: [],
@@ -735,7 +732,7 @@ function getWmtsXyzUrl(
     }
 ): string | undefined {
     const { addTimestamp = false, baseUrlOverride } = options ?? {}
-    if (wmtsLayerConfig?.type === LayerType.WMTS && projection) {
+    if (wmtsLayerConfig?.type === 'WMTS' && projection) {
         let timestamp = '{Time}'
         if (addTimestamp) {
             timestamp = timeConfigUtils.getTimestampFromConfig(wmtsLayerConfig) ?? '{Time}'
@@ -757,8 +754,7 @@ function getWmtsXyzUrl(
     return
 }
 
-export interface GeoadminLayerUtils {
-    transformToLayerTypeEnum: typeof transformToLayerTypeEnum
+export interface SwissGeoLayerUtils {
     makeGPXLayer: typeof makeGPXLayer
     makeKMLLayer: typeof makeKMLLayer
     makeGeoAdminWMSLayer: typeof makeGeoAdminWMSLayer
@@ -779,8 +775,7 @@ export interface GeoadminLayerUtils {
     getWmtsXyzUrl: typeof getWmtsXyzUrl
 }
 
-export const layerUtils: GeoadminLayerUtils = {
-    transformToLayerTypeEnum,
+export const layerUtils: SwissGeoLayerUtils = {
     makeGPXLayer,
     makeKMLLayer,
     makeGeoAdminWMSLayer,
diff --git a/packages/layers/src/utils/timeConfigUtils.ts b/packages/layers/src/utils/timeConfigUtils.ts
index 3c91bcba32..d151a36239 100644
--- a/packages/layers/src/utils/timeConfigUtils.ts
+++ b/packages/layers/src/utils/timeConfigUtils.ts
@@ -2,16 +2,12 @@ import log from '@swissgeo/log'
 import { isTimestampYYYYMMDD } from '@swissgeo/numbers'
 import { Interval } from 'luxon'
 
-import type {Layer, LayerTimeConfig, LayerTimeConfigEntry} from '@/types';
+import type { Layer, LayerTimeConfig, LayerTimeConfigEntry } from '@/types'
 
 import {
     ALL_YEARS_TIMESTAMP,
     CURRENT_YEAR_TIMESTAMP,
-    
-    
-    
-    LayerType,
-    YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA
+    YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA,
 } from '@/types'
 
 const hasTimestamp = (timeConfig: LayerTimeConfig, timestamp: string): boolean =>
@@ -23,7 +19,10 @@ const getTimeEntryForYear = (
 ): LayerTimeConfigEntry | undefined => {
     const yearAsInterval = Interval.fromISO(`${year}-01-01/P1Y`)
     return timeConfig.timeEntries.find((entry: LayerTimeConfigEntry) => {
-        if (entry.nonTimeBasedValue && [ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP].includes(entry.nonTimeBasedValue)) {
+        if (
+            entry.nonTimeBasedValue &&
+            [ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP].includes(entry.nonTimeBasedValue)
+        ) {
             return year === YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA
         }
         if (yearAsInterval.isValid && entry.interval) {
@@ -156,7 +155,10 @@ const hasMultipleTimestamps = (layer: Layer): boolean => {
 }
 
 export function getYearFromLayerTimeEntry(timeEntry: LayerTimeConfigEntry): number | undefined {
-    if (timeEntry.nonTimeBasedValue && [ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP].includes(timeEntry.nonTimeBasedValue)) {
+    if (
+        timeEntry.nonTimeBasedValue &&
+        [ALL_YEARS_TIMESTAMP, CURRENT_YEAR_TIMESTAMP].includes(timeEntry.nonTimeBasedValue)
+    ) {
         return YEAR_TO_DESCRIBE_ALL_OR_CURRENT_DATA
     }
     if (timeEntry.interval && timeEntry.interval.start?.year !== undefined) {
@@ -183,7 +185,7 @@ const getTimeEntryForInterval = (
 /** Returns timestamp for WMS or WMTS layer from config data */
 function getTimestampFromConfig(layer: Layer): string | undefined {
     let timestamp = layer.timeConfig?.currentTimeEntry?.timestamp
-    if (!timestamp && layer.type === LayerType.WMTS) {
+    if (!timestamp && layer.type === 'WMTS') {
         // for WMTS layer fallback to current
         timestamp = CURRENT_YEAR_TIMESTAMP
     }
diff --git a/packages/mapviewer/scripts/check-external-layers-providers.ts b/packages/mapviewer/scripts/check-external-layers-providers.ts
index 813b96ba10..251d633f8c 100644
--- a/packages/mapviewer/scripts/check-external-layers-providers.ts
+++ b/packages/mapviewer/scripts/check-external-layers-providers.ts
@@ -16,7 +16,6 @@ import type {
 } from 'axios'
 
 import { LV95 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { EXTERNAL_SERVER_TIMEOUT, setWmsGetMapParams } from '@swissgeo/layers/api'
 import { wmsCapabilitiesParser, wmtsCapabilitiesParser } from '@swissgeo/layers/parsers'
 import axios, { AxiosError } from 'axios'
@@ -221,7 +220,7 @@ async function handleWmts(provider: string, content: string, result: Result): Pr
     })
 
     const firstLayer = findFirstLeaf(layers)
-    if (!firstLayer || firstLayer.type !== LayerType.WMTS) {
+    if (!firstLayer || firstLayer.type !== 'WMTS') {
         return false
     }
     const firstWmtsLayer = firstLayer as ExternalWMTSLayer
@@ -326,7 +325,7 @@ function findFirstLeaf(layers: ExternalLayer[]): ExternalLayer | undefined {
     }
 
     for (const layer of layers) {
-        if (layer.type !== LayerType.WMS) {
+        if (layer.type !== 'WMS') {
             return layer
         }
 
diff --git a/packages/mapviewer/src/modules/drawing/DrawingModule.vue b/packages/mapviewer/src/modules/drawing/DrawingModule.vue
index d145a2bc49..cba056b3f5 100644
--- a/packages/mapviewer/src/modules/drawing/DrawingModule.vue
+++ b/packages/mapviewer/src/modules/drawing/DrawingModule.vue
@@ -1,32 +1,26 @@
 <script setup lang="ts">
 import type { EditableFeature } from '@swissgeo/api'
-import type { KMLLayer } from '@swissgeo/layers'
 import type { LineString } from 'geojson'
 import type Map from 'ol/Map'
 import type { ComponentPublicInstance } from 'vue'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { kmlUtils } from '@swissgeo/api/utils'
-import { LayerType } from '@swissgeo/layers'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { WarningMessage } from '@swissgeo/log/Message'
-import { computed, inject, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue'
+import { computed, inject, onBeforeUnmount, onMounted, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import type { DrawingInteractionExposed } from '@/modules/drawing/types/interaction'
 import type { ActionDispatcher } from '@/store/types'
 
-import { IS_TESTING_WITH_CYPRESS } from '@/config'
 import AddVertexButtonOverlay from '@/modules/drawing/components/AddVertexButtonOverlay.vue'
 import DrawingInteractions from '@/modules/drawing/components/DrawingInteractions.vue'
 import DrawingToolbox from '@/modules/drawing/components/DrawingToolbox.vue'
 import DrawingTooltip from '@/modules/drawing/components/DrawingTooltip.vue'
-import ShareWarningPopup from '@/modules/drawing/components/ShareWarningPopup.vue'
 import useDrawingStore from '@/store/modules/drawing'
-import { EditMode } from '@/store/modules/drawing/types'
 import addKmlFeaturesToDrawingLayer from '@/store/modules/drawing/utils/addKmlFeaturesToDrawingLayer'
 import useLayersStore from '@/store/modules/layers'
-import ModalWithBackdrop from '@/utils/components/ModalWithBackdrop.vue'
 
 const dispatcher: ActionDispatcher = { name: 'DrawingModule.vue' }
 
@@ -50,14 +44,9 @@ const layersStore = useLayersStore()
 
 const drawingInteractions =
     useTemplateRef<ComponentPublicInstance<DrawingInteractionExposed>>('drawingInteractions')
-const showNotSharedDrawingWarningModal = ref<boolean>(false)
-const drawingHasBeenInitialized = ref<boolean>(false)
 
 const { t } = useI18n()
 
-// Computed from stores
-const availableIconSets = computed(() => drawingStore.iconSets)
-
 const selectedLineFeature = computed<EditableFeature | undefined>(() => {
     if (
         drawingStore.feature.current &&
@@ -76,110 +65,96 @@ const lineStringGeometry = computed<LineString | undefined>(() => {
     return undefined
 })
 const hasLoaded = computed<boolean>(() => {
-    return drawingStore.layer.config?.isLoading === false && !!drawingStore.layer.config?.kmlData
+    return (
+        !layersStore.activeKmlLayer ||
+        (!layersStore.activeKmlLayer.isLoading && !!layersStore.activeKmlLayer.kmlData)
+    )
 })
 
 // Workaround for legacy drawings and icon set mapping
-watch(availableIconSets, () => {
-    const source = drawingStore.layer.ol?.getSource()
-    if (!source) {
-        return
-    }
-    log.debug({
-        title: 'DrawingModule',
-        titleColor: LogPreDefinedColor.Lime,
-        messages: ['New icon sets available, updating all drawing features', source.getFeatures()],
-    })
+watch(
+    () => drawingStore.iconSets,
+    () => {
+        const source = drawingStore.layer.ol?.getSource()
+        if (!source) {
+            return
+        }
+        log.debug({
+            title: 'DrawingModule',
+            titleColor: LogPreDefinedColor.Lime,
+            messages: [
+                'New icon sets available, updating all drawing features',
+                source.getFeatures(),
+            ],
+        })
 
-    drawingStore.feature.all.forEach((feature) => {
-        if (feature.icon) {
-            const iconArgs = kmlUtils.parseIconUrl(feature.icon.imageURL)
-            const icon = kmlUtils.getIcon(
-                iconArgs,
-                undefined /*iconStyle*/,
-                availableIconSets.value,
-                () => {
-                    // Fallback warning handler (Pinia app store could be used if available)
-                    log.warn(
-                        new WarningMessage('kml_icon_set_not_found', { iconSetName: iconArgs.set })
-                    )
+        drawingStore.feature.all.forEach((feature) => {
+            if (feature.icon) {
+                const iconArgs = kmlUtils.parseIconUrl(feature.icon.imageURL)
+                const icon = kmlUtils.getIcon(
+                    iconArgs,
+                    undefined /*iconStyle*/,
+                    drawingStore.iconSets,
+                    () => {
+                        // Fallback warning handler (Pinia app store could be used if available)
+                        log.warn(
+                            new WarningMessage('kml_icon_set_not_found', {
+                                iconSetName: iconArgs.set,
+                            })
+                        )
+                    }
+                )
+                if (icon) {
+                    feature.icon = icon
                 }
-            )
-            if (icon) {
-                feature.icon = icon
             }
-        }
-    })
+        })
+    }
+)
+watch(hasLoaded, (newState) => {
+    if (newState) {
+        addKmlFeaturesToDrawingLayer(layersStore.activeKmlLayer, {
+            retryOnError: true,
+        })
+    }
 })
 
 onMounted(() => {
-    const kmlLayerWithAdminId: KMLLayer | undefined = layersStore.activeLayers
-        .filter((layer) => layer.type === LayerType.KML)
-        .map((layer) => layer as KMLLayer)
-        .find((kmlLayer) => !!kmlLayer.adminId)
-
-    drawingStore
-        .initiateDrawing(
-            {
-                preExistingDrawing: kmlLayerWithAdminId,
-                // TODO PB-2027: pass the adminId present in the URL at app startup
-            },
-            dispatcher
-        )
-        .then(() => {
-            drawingHasBeenInitialized.value = true
-            if (drawingStore.layer.ol) {
-                olMap.addLayer(drawingStore.layer.ol)
-            } else {
-                log.error({
-                    title: 'DrawingModule',
-                    titleColor: LogPreDefinedColor.Lime,
-                    messages: ['Drawing layer not found/not created'],
-                })
-            }
-        })
-        .catch((error) => {
-            log.error({
-                title: 'DrawingModule',
-                titleColor: LogPreDefinedColor.Lime,
-                messages: ['Error while initializing drawing', error],
-            })
+    if (drawingStore.layer.ol) {
+        olMap.addLayer(drawingStore.layer.ol)
+    } else {
+        log.error({
+            title: 'DrawingModule',
+            titleColor: LogPreDefinedColor.Lime,
+            messages: ['Drawing layer not found/not created'],
         })
+    }
 
     // If a KML was previously created with the drawing module, add it back for further editing
-    if (drawingStore.layer.config) {
+    if (layersStore.activeKmlLayer) {
         if (hasLoaded.value) {
-            addKmlFeaturesToDrawingLayer(drawingStore.layer.config as KMLLayer, {
+            addKmlFeaturesToDrawingLayer(layersStore.activeKmlLayer, {
                 retryOnError: true,
             })
         }
     } else {
         drawingStore.setDrawingName(t('draw_layer_label'), dispatcher)
+        drawingStore.setDrawingHasLoaded(true, dispatcher)
     }
 
     // Listening for "Delete" keystroke and right-click to remove last point
     document.addEventListener('keyup', removeLastPointOnDeleteKeyUp, { passive: true })
     document.addEventListener('contextmenu', removeLastPointOnRightClick, { passive: true })
-    window.addEventListener('beforeunload', beforeUnloadHandler)
 })
 
 onBeforeUnmount(() => {
     document.removeEventListener('contextmenu', removeLastPointOnRightClick)
     document.removeEventListener('keyup', removeLastPointOnDeleteKeyUp)
-    window.removeEventListener('beforeunload', beforeUnloadHandler)
 })
 
-const beforeUnloadHandler = (event: BeforeUnloadEvent) => {
-    // Show alert when trying to close the tab, except during Cypress tests
-    if (!IS_TESTING_WITH_CYPRESS && drawingStore.showNotSharedDrawingWarning) {
-        showNotSharedDrawingWarningModal.value = true
-        event.preventDefault()
-    }
-}
-
 function removeLastPoint() {
     // Only delete the last point when we are drawing a feature (or editing it)
-    if (!!drawingStore.edit.featureType || drawingStore.edit.mode === EditMode.Extend) {
+    if (!!drawingStore.edit.featureType || drawingStore.edit.mode === 'EXTEND') {
         drawingInteractions.value?.removeLastPoint()
     }
 }
@@ -214,7 +189,7 @@ function closeDrawing() {
 </script>
 
 <template>
-    <div v-if="drawingHasBeenInitialized">
+    <div v-if="drawingStore.layer.hasLoaded">
         <DrawingToolbox
             @remove-last-point="removeLastPoint"
             @close-drawing="closeDrawing"
@@ -222,20 +197,9 @@ function closeDrawing() {
         <DrawingTooltip />
         <DrawingInteractions ref="drawingInteractions" />
         <AddVertexButtonOverlay
-            v-if="drawingStore.edit.mode === EditMode.Modify && lineStringGeometry"
+            v-if="drawingStore.edit.mode === 'MODIFY' && lineStringGeometry"
             :coordinates="lineStringGeometry.coordinates"
         />
-        <ModalWithBackdrop
-            v-if="showNotSharedDrawingWarningModal"
-            fluid
-            :title="t('warning')"
-            @close="showNotSharedDrawingWarningModal = false"
-        >
-            <ShareWarningPopup
-                :kml-layer="drawingStore.layer.config as KMLLayer"
-                @accept="showNotSharedDrawingWarningModal = false"
-            />
-        </ModalWithBackdrop>
     </div>
     <div v-else>
         <FontAwesomeIcon
diff --git a/packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue b/packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue
index 60bc3e6593..6992abbcd7 100644
--- a/packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue
+++ b/packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue
@@ -7,7 +7,6 @@ import { useI18n } from 'vue-i18n'
 import type { ActionDispatcher } from '@/store/types'
 
 import useDrawingStore from '@/store/modules/drawing'
-import { EditMode } from '@/store/modules/drawing/types'
 
 const { t } = useI18n()
 
@@ -32,7 +31,7 @@ onMounted(() => {
 })
 
 function addVertex() {
-    drawingStore.setEditingMode(EditMode.Extend, !!reverse, dispatcher)
+    drawingStore.setEditingMode('EXTEND', !!reverse, dispatcher)
 }
 </script>
 
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue b/packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue
index 48e5eecdd8..1af2f92588 100644
--- a/packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue
+++ b/packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue
@@ -3,7 +3,7 @@ import type Feature from 'ol/Feature'
 import type { Component, ComponentPublicInstance } from 'vue'
 
 import log, { LogPreDefinedColor } from '@swissgeo/log'
-import { computed, ref, useTemplateRef } from 'vue'
+import { watch, computed, ref, useTemplateRef } from 'vue'
 
 import type {
     DrawingInteractionExposed,
@@ -18,7 +18,6 @@ import DrawingTextInteraction from '@/modules/drawing/components/DrawingTextInte
 import ExtendLineInteraction from '@/modules/drawing/components/ExtendLineInteraction.vue'
 import ExtendMeasureInteraction from '@/modules/drawing/components/ExtendMeasureInteraction.vue'
 import useDrawingStore from '@/store/modules/drawing'
-import { EditMode } from '@/store/modules/drawing/types'
 
 const selectInteraction =
     useTemplateRef<ComponentPublicInstance<SelectInteractionExposed>>('selectInteraction')
@@ -44,7 +43,7 @@ const specializedInteractionComponent = computed<Component | undefined>(() => {
             selectedInteraction = DrawingMeasureInteraction
             break
     }
-    if (drawingStore.edit.mode === EditMode.Extend) {
+    if (drawingStore.edit.mode === 'EXTEND') {
         const isMeasure =
             selectedLineFeature.value?.get('editableFeature')?.featureType === 'MEASURE'
         const isLine =
@@ -63,13 +62,16 @@ const specializedInteractionComponent = computed<Component | undefined>(() => {
             selectedInteraction = undefined
         }
     }
-    // Make sure that the select interaction is disabled when we are in draw / extend mode
-    selectInteraction.value?.setActive(!selectedInteraction)
     return selectedInteraction
 })
 
+watch(specializedInteractionComponent, (newInteractionComponent) => {
+    // Make sure that the select interaction is disabled when we are in draw/extend mode
+    selectInteraction.value?.setActive(!newInteractionComponent)
+})
+
 const specializedProps = computed(() => {
-    if (drawingStore.edit.mode === EditMode.Extend) {
+    if (drawingStore.edit.mode === 'EXTEND') {
         return {
             startingFeature: selectedLineFeature.value,
         }
@@ -83,7 +85,7 @@ function onDrawEnd(feature: Feature | undefined) {
 
 function removeLastPoint() {
     currentInteraction.value?.removeLastPoint()
-    if (drawingStore.edit.mode !== EditMode.Off) {
+    if (drawingStore.edit.mode !== 'OFF') {
         selectInteraction.value?.removeLastPoint()
     }
 }
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue b/packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue
index 86d3c5ebb0..fe3a8e003e 100644
--- a/packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue
+++ b/packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue
@@ -8,8 +8,6 @@
 import type { EditableFeature } from '@swissgeo/api'
 import type Feature from 'ol/Feature'
 import type Map from 'ol/Map'
-import type { StyleFunction } from 'ol/style/Style'
-import type { ShallowRef } from 'vue'
 
 import { featuresAPI } from '@swissgeo/api'
 import { DRAWING_HIT_TOLERANCE } from '@swissgeo/staging-config/constants'
@@ -36,17 +34,17 @@ const drawingStore = useDrawingStore()
 const featuresStore = useFeaturesStore()
 
 const selectInteraction = new SelectInteraction({
-    style: editingFeatureStyleFunction as StyleFunction,
+    style: editingFeatureStyleFunction,
     toggleCondition: () => false,
-    layers: drawingStore.layer.ol ? [drawingStore.layer.ol] : undefined,
-    // As we've seen with the old viewer, some small features were hard
+    layers: [drawingStore.layer.ol],
+    // As we've seen with the mf-geoadmin3 viewer, some small features were hard
     // to select. We will try to add a bigger hit tolerance to mitigate that.
     hitTolerance: DRAWING_HIT_TOLERANCE,
 })
 const { removeLastPoint } = useModifyInteraction(selectInteraction.getFeatures())
 
 /** OpenLayers feature currently selected */
-const currentlySelectedOlFeature: ShallowRef<Feature | undefined> = shallowRef()
+const currentlySelectedOlFeature = shallowRef<Feature | undefined>()
 
 watch(
     () => drawingStore.feature.current,
@@ -86,9 +84,9 @@ watch(
 )
 
 onMounted(() => {
-    selectInteraction.setActive(true)
-    selectInteraction.on('select', onSelectChange)
     olMap?.addInteraction(selectInteraction)
+    selectInteraction.on('select', onSelectChange)
+    selectInteraction.setActive(true)
 })
 onBeforeUnmount(() => {
     olMap?.removeInteraction(selectInteraction)
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue b/packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue
index f29d300a0e..cb0559d9d7 100644
--- a/packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue
+++ b/packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { EditableFeature, EditableFeatureTypes } from '@swissgeo/api'
 import type { SingleCoordinate } from '@swissgeo/coordinates'
+import type { KMLLayer } from '@swissgeo/layers'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import GeoadminTooltip from '@swissgeo/tooltip'
@@ -14,10 +15,7 @@ import DrawingExporter from '@/modules/drawing/components/DrawingExporter.vue'
 import DrawingHeader from '@/modules/drawing/components/DrawingHeader.vue'
 import DrawingToolboxButton from '@/modules/drawing/components/DrawingToolboxButton.vue'
 import SharePopup from '@/modules/drawing/components/SharePopup.vue'
-import ShareWarningPopup from '@/modules/drawing/components/ShareWarningPopup.vue'
 import useDrawingStore from '@/store/modules/drawing'
-import { DrawingSaveState, EditMode } from '@/store/modules/drawing/types'
-import { isOnlineMode } from '@/store/modules/drawing/utils/isOnlineMode'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
 import useUIStore from '@/store/modules/ui'
@@ -46,9 +44,15 @@ const allEditableFeatureTypes = ref<EditableFeatureTypes[]>([
 const drawMenuOpen = ref<boolean>(true)
 const showClearConfirmationModal = ref<boolean>(false)
 const showShareModal = ref<boolean>(false)
-const showNotSharedDrawingWarningModal = ref<boolean>(false)
 const isClosingDrawing = ref<boolean>(false)
 const showNoActiveKmlWarning = computed<boolean>(() => layersStore.activeKmlLayer === undefined)
+const showNotSharedDrawingWarning = computed<boolean>(
+    () =>
+        !drawingStore.isDrawingEditShared &&
+        drawingStore.online &&
+        !drawingStore.hasLoadedDrawingWithOnlyAdminId
+)
+const showNotSharedDrawingWarningModal = ref<boolean>(false)
 
 const tooltipText = computed<string>(() =>
     t(showNoActiveKmlWarning.value ? 'drawing_empty_cannot_edit_name' : '')
@@ -86,7 +90,7 @@ const isAllowDeleteLastPoint = computed<boolean>(
         // Allow deleting the last point only if we are drawing line or measure
         // or when extending line
         isDrawingLineOrMeasure.value ||
-        (drawingStore.edit.mode === EditMode.Extend &&
+        (drawingStore.edit.mode === 'EXTEND' &&
             selectedLineString.value !== undefined &&
             selectedLineCoordinates.value !== undefined &&
             selectedLineCoordinates.value.length > 2)
@@ -96,26 +100,23 @@ const drawingName = computed<string | undefined>({
     set: (value) => debounceSaveDrawingName(value),
 })
 const isDrawingStateError = computed(
-    () =>
-        drawingStore.save.state === DrawingSaveState.LoadError ||
-        drawingStore.save.state === DrawingSaveState.SaveError
+    () => drawingStore.save.state === 'LOAD_ERROR' || drawingStore.save.state === 'SAVE_ERROR'
 )
 /** Return a different translation key depending on the saving status */
 const drawingStateMessage = computed(() => {
     switch (drawingStore.save.state) {
-        case DrawingSaveState.Saving:
+        case 'SAVING':
             return t('draw_file_saving')
-        case DrawingSaveState.Saved:
+        case 'SAVED':
             return t('draw_file_saved')
-        case DrawingSaveState.SaveError:
+        case 'SAVE_ERROR':
             return t('draw_file_load_error')
-        case DrawingSaveState.LoadError:
+        case 'LOAD_ERROR':
             return t('draw_file_save_error')
         default:
             return undefined
     }
 })
-const online = computed(() => isOnlineMode(drawingStore.onlineMode, true))
 
 function onCloseClearConfirmation(confirmed: boolean) {
     showClearConfirmationModal.value = false
@@ -126,21 +127,20 @@ function onCloseClearConfirmation(confirmed: boolean) {
 
 function closeDrawing() {
     isClosingDrawing.value = true
-    if (drawingStore.showNotSharedDrawingWarning) {
+    if (showNotSharedDrawingWarning.value) {
         showNotSharedDrawingWarningModal.value = true
     } else {
         emits('closeDrawing')
     }
 }
 
-function onAcceptWarningModal() {
-    showNotSharedDrawingWarningModal.value = false
-    emits('closeDrawing')
-}
-
-function onCloseWarningModal() {
-    isClosingDrawing.value = false
+function onCloseWarningModal(withConfirmation: boolean) {
     showNotSharedDrawingWarningModal.value = false
+    if (withConfirmation) {
+        emits('closeDrawing')
+    } else {
+        isClosingDrawing.value = false
+    }
 }
 
 function selectDrawingMode(drawingMode: EditableFeatureTypes) {
@@ -181,7 +181,7 @@ const debounceSaveDrawingName = debounce(saveDrawingName, 200)
                     :disabled="!showNoActiveKmlWarning"
                 >
                     <div
-                        v-if="online"
+                        v-if="drawingStore.online"
                         class="d-flex justify-content-center align-items-center mx-4 mt-3 gap-2"
                     >
                         <label
@@ -258,7 +258,7 @@ const debounceSaveDrawingName = debounce(saveDrawingName, 200)
                             <DrawingExporter :is-drawing-empty="drawingStore.isDrawingEmpty" />
                         </div>
                         <div
-                            v-if="online"
+                            v-if="drawingStore.online"
                             class="col d-grid"
                         >
                             <button
@@ -289,7 +289,7 @@ const debounceSaveDrawingName = debounce(saveDrawingName, 200)
                         </div>
                     </div>
                     <div
-                        v-if="uiStore.isDesktopMode && online"
+                        v-if="uiStore.isDesktopMode && drawingStore.online"
                         class="row mt-2"
                     >
                         <div
@@ -348,11 +348,16 @@ const debounceSaveDrawingName = debounce(saveDrawingName, 200)
             v-if="showNotSharedDrawingWarningModal"
             fluid
             :title="t('warning')"
-            @close="onCloseWarningModal()"
+            show-confirmation-buttons
+            confirm-key="close"
+            @close="onCloseWarningModal"
         >
-            <ShareWarningPopup
-                :kml-layer="layersStore.activeKmlLayer"
-                @accept="onAcceptWarningModal()"
+            <p data-cy="drawing-not-shared-admin-warning">
+                {{ t('drawing_not_shared_admin_warning') }}
+            </p>
+            <SharePopup
+                :kml-layer="layersStore.activeKmlLayer as KMLLayer"
+                hide-public-url
             />
         </ModalWithBackdrop>
     </teleport>
diff --git a/packages/mapviewer/src/modules/drawing/components/SharePopup.vue b/packages/mapviewer/src/modules/drawing/components/SharePopup.vue
index 5573b7c5a0..b573b9a3ab 100644
--- a/packages/mapviewer/src/modules/drawing/components/SharePopup.vue
+++ b/packages/mapviewer/src/modules/drawing/components/SharePopup.vue
@@ -19,14 +19,15 @@ const dispatcher: ActionDispatcher = { name: 'SharePopup.vue' }
 const drawingStore = useDrawingStore()
 const { t } = useI18n()
 
-const { kmlLayer } = defineProps({
-    kmlLayer: Object as () => KMLLayer | undefined,
-})
+const { kmlLayer, hidePublicUrl = false } = defineProps<{
+    hidePublicUrl?: boolean
+    kmlLayer?: KMLLayer
+}>()
 
-const adminUrlCopied = ref(false)
-const fileUrlCopied = ref(false)
-const shareUrl: Ref<string | undefined> = ref(' ')
-const adminShareUrl: Ref<string | undefined> = ref(' ')
+const adminUrlCopied = ref<boolean>(false)
+const fileUrlCopied = ref<boolean>(false)
+const shareUrl = ref<string | undefined>()
+const adminShareUrl = ref<string | undefined>()
 
 const baseUrl = computed(() => {
     return `${location.origin}/#`
@@ -100,7 +101,7 @@ async function updateShareUrl() {
         try {
             shareUrl.value = await shortLinkAPI.createShortLink({
                 url: fileUrl.value,
-                staging: ENVIRONMENT
+                staging: ENVIRONMENT,
             })
         } catch (_) {
             // Fallback to normal url
@@ -113,7 +114,7 @@ async function updateAdminShareUrl() {
         try {
             adminShareUrl.value = await shortLinkAPI.createShortLink({
                 url: adminUrl.value,
-                staging: ENVIRONMENT
+                staging: ENVIRONMENT,
             })
         } catch (_) {
             // Fallback to normal url
@@ -125,7 +126,10 @@ async function updateAdminShareUrl() {
 
 <template>
     <div class="ga-share">
-        <div class="form-group">
+        <div
+            v-if="!hidePublicUrl"
+            class="form-group"
+        >
             <label>{{ t('draw_share_user_link') }}:</label>
             <div class="input-group input-group share-link-input mb-3">
                 <input
@@ -147,7 +151,7 @@ async function updateAdminShareUrl() {
             </div>
         </div>
         <div
-            v-if="adminUrl"
+            v-if="kmlLayer.adminId"
             class="form-group"
         >
             <label>{{ t('draw_share_admin_link') }}:</label>
diff --git a/packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.ts b/packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.ts
index f24e8075d3..a5955caf3c 100644
--- a/packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.ts
+++ b/packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.ts
@@ -26,7 +26,6 @@ import type { ActionDispatcher } from '@/store/types'
 import { updateStoreFeatureCoordinatesGeometry } from '@/modules/drawing/lib/drawingUtils'
 import { editingFeatureStyleFunction } from '@/modules/drawing/lib/style'
 import useDrawingStore from '@/store/modules/drawing'
-import { EditMode } from '@/store/modules/drawing/types'
 import usePositionStore from '@/store/modules/position'
 import { GeodesicGeometries } from '@/utils/geodesicManager'
 
@@ -254,7 +253,7 @@ export default function useDrawingModeInteraction(config?: UseDrawingModeInterac
                 drawingStore.edit.reverseLineStringExtension
             )
             drawingStore.setEditingMode(
-                EditMode.Modify,
+                'MODIFY',
                 drawingStore.edit.reverseLineStringExtension,
                 dispatcher
             )
diff --git a/packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.ts b/packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.ts
index cc9fd1c2e2..fa535206b8 100644
--- a/packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.ts
+++ b/packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.ts
@@ -18,7 +18,6 @@ import type { ActionDispatcher } from '@/store/types'
 import { updateStoreFeatureCoordinatesGeometry } from '@/modules/drawing/lib/drawingUtils'
 import { editingVertexStyleFunction } from '@/modules/drawing/lib/style'
 import useDrawingStore from '@/store/modules/drawing'
-import { EditMode } from '@/store/modules/drawing/types'
 
 const dispatcher: ActionDispatcher = { name: 'useModifyInteraction.composable' }
 const cursorGrabbingClass = 'cursor-grabbing'
@@ -68,7 +67,7 @@ export default function useModifyInteraction(features: Collection<Feature<Geomet
     watch(
         () => drawingStore.edit.mode,
         (newValue) => {
-            if (newValue === EditMode.Extend && features.getLength() > 0) {
+            if (newValue === 'EXTEND' && features.getLength() > 0) {
                 const selectedFeature = features.item(0)
                 if (selectedFeature && drawingStore.edit.reverseLineStringExtension) {
                     const geom = selectedFeature.getGeometry()
@@ -79,7 +78,7 @@ export default function useModifyInteraction(features: Collection<Feature<Geomet
                     }
                 }
                 modifyInteraction.setActive(false)
-            } else if (newValue === EditMode.Modify) {
+            } else if (newValue === 'MODIFY') {
                 modifyInteraction.setActive(true)
             } else {
                 modifyInteraction.setActive(true)
@@ -96,11 +95,7 @@ export default function useModifyInteraction(features: Collection<Feature<Geomet
     })
 
     onBeforeUnmount(() => {
-        drawingStore.setEditingMode(
-            EditMode.Off,
-            drawingStore.edit.reverseLineStringExtension,
-            dispatcher
-        )
+        drawingStore.setEditingMode('OFF', drawingStore.edit.reverseLineStringExtension, dispatcher)
 
         olMap.removeInteraction(modifyInteraction)
 
@@ -109,7 +104,7 @@ export default function useModifyInteraction(features: Collection<Feature<Geomet
     })
 
     function removeLastPoint() {
-        if (drawingStore.edit.mode === EditMode.Off) {
+        if (drawingStore.edit.mode === 'OFF') {
             return
         }
 
diff --git a/packages/mapviewer/src/modules/drawing/lib/modifyInteraction.ts b/packages/mapviewer/src/modules/drawing/lib/modifyInteraction.ts
index e0ee40f364..4aab79338f 100644
--- a/packages/mapviewer/src/modules/drawing/lib/modifyInteraction.ts
+++ b/packages/mapviewer/src/modules/drawing/lib/modifyInteraction.ts
@@ -39,12 +39,12 @@ import { equals as arrayEquals } from 'ol/array'
 import Collection from 'ol/Collection'
 import CollectionEventType from 'ol/CollectionEventType'
 import {
-    wrapX as wrapXCoordinate,
     closestOnSegment,
     distance as coordinateDistance,
     equals as coordinatesEqual,
     squaredDistance as squaredCoordinateDistance,
     squaredDistanceToSegment,
+    wrapX as wrapXCoordinate,
 } from 'ol/coordinate'
 import { altKeyOnly, always, primaryAction, singleClick } from 'ol/events/condition'
 import BaseEvent from 'ol/events/Event'
@@ -79,10 +79,7 @@ const CIRCLE_CIRCUMFERENCE_INDEX = 1
 
 const tempExtent: Extent = [0, 0, 0, 0]
 
-export enum ModifyEventType {
-    MODIFYSTART = 'modifystart',
-    MODIFYEND = 'modifyend',
-}
+export type ModifyEventType = 'modifystart' | 'modifyend'
 
 /** A line segment between two coordinates (2 coordinates, 2D). */
 export type Segment = [Coordinate, Coordinate]
@@ -967,9 +964,7 @@ export default class Modify extends PointerInteraction {
             }
         }
         if (this.featuresBeingModified_) {
-            this.dispatchEvent(
-                new ModifyEvent(ModifyEventType.MODIFYEND, this.featuresBeingModified_, evt)
-            )
+            this.dispatchEvent(new ModifyEvent('modifyend', this.featuresBeingModified_, evt))
             this.featuresBeingModified_ = null
         }
         return false
@@ -1143,9 +1138,7 @@ export default class Modify extends PointerInteraction {
             if (this.featuresBeingModified_.getLength() === 0) {
                 this.featuresBeingModified_ = null
             } else {
-                this.dispatchEvent(
-                    new ModifyEvent(ModifyEventType.MODIFYSTART, this.featuresBeingModified_, evt)
-                )
+                this.dispatchEvent(new ModifyEvent('modifystart', this.featuresBeingModified_, evt))
             }
         }
     }
@@ -1178,9 +1171,7 @@ export default class Modify extends PointerInteraction {
             this.willModifyFeatures_(evt, this.dragSegments_)
             const removed = this.removeVertex_()
             if (this.featuresBeingModified_) {
-                this.dispatchEvent(
-                    new ModifyEvent(ModifyEventType.MODIFYEND, this.featuresBeingModified_, evt)
-                )
+                this.dispatchEvent(new ModifyEvent('modifyend', this.featuresBeingModified_, evt))
             }
             this.featuresBeingModified_ = null
             return removed
diff --git a/packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue b/packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
index 4d8f2943c7..9b2a988803 100644
--- a/packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
+++ b/packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
@@ -2,7 +2,6 @@
 import type { LayerFeature, SelectableFeature } from '@swissgeo/api'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { LayerType } from '@swissgeo/layers'
 import { useI18n } from 'vue-i18n'
 
 import type { ActionDispatcher } from '@/store/types'
@@ -23,7 +22,7 @@ function showProfile() {
     if (!feature.isEditable) {
         // PB-800 : to avoid a coastline paradox we simplify the geometry of GPXs
         // as they might be coming directly from a GPS device (meaning polluted with GPS uncertainty/error)
-        simplifyGeometry = (feature as LayerFeature).layer.type === LayerType.GPX
+        simplifyGeometry = (feature as LayerFeature).layer.type === 'GPX'
     }
     profileStore.setProfileFeature(
         feature,
diff --git a/packages/mapviewer/src/modules/map/components/CompareSlider.vue b/packages/mapviewer/src/modules/map/components/CompareSlider.vue
index d202082776..f2f10192ca 100644
--- a/packages/mapviewer/src/modules/map/components/CompareSlider.vue
+++ b/packages/mapviewer/src/modules/map/components/CompareSlider.vue
@@ -2,7 +2,6 @@
 import type RenderEvent from 'ol/render/Event'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { LayerType } from '@swissgeo/layers'
 import { round } from '@swissgeo/numbers'
 import Map from 'ol/Map'
 import { getRenderPixel } from 'ol/render'
@@ -31,7 +30,7 @@ const compareSliderPosition = computed(() => {
     }
 })
 const visibleLayerOnTop = computed(() => layersStore.visibleLayerOnTop)
-const shouldUseWebGlContext = computed(() => visibleLayerOnTop.value?.type === LayerType.COG)
+const shouldUseWebGlContext = computed(() => visibleLayerOnTop.value?.type === 'COG')
 
 watch(storeCompareRatio, (newValue) => {
     if (newValue) {
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
index 6cb95af972..c470a31c3f 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
@@ -5,7 +5,6 @@ import type { Viewer } from 'cesium'
 import type { ShallowRef } from 'vue'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { LayerType } from '@swissgeo/layers'
 import log from '@swissgeo/log'
 import { LineString, Point, Polygon } from 'ol/geom'
 import { computed, inject, onMounted, ref, watch } from 'vue'
@@ -91,11 +90,7 @@ function highlightSelectedFeatures(): void {
             const hasLayer = (obj: LayerFeature | EditableFeature): obj is LayerFeature =>
                 !!obj && typeof obj === 'object' && 'layer' in obj
 
-            if (
-                hasLayer(f) &&
-                f.layer.type === LayerType.VECTOR &&
-                'use3dTileSubFolder' in f.layer
-            ) {
+            if (hasLayer(f) && f.layer.type === 'VECTOR' && 'use3dTileSubFolder' in f.layer) {
                 return
             }
 
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue
index 7295890e29..01565f6e88 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue
@@ -6,7 +6,6 @@ import type { LayerTooltipConfig } from '@swissgeo/staging-config/constants'
 import type { ShallowRef } from 'vue'
 
 import { extentUtils, WEBMERCATOR, WGS84 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { get3dTilesBaseUrl } from '@swissgeo/staging-config'
 import { bbox, centroid } from '@turf/turf'
@@ -40,7 +39,6 @@ import useCesiumStore from '@/store/modules/cesium'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
 import useMapStore from '@/store/modules/map'
-import { ClickType } from '@/store/modules/map/types'
 import usePositionStore from '@/store/modules/position'
 import { identifyGeoJSONFeatureAt } from '@/utils/identifyOnVectorLayer'
 
@@ -60,9 +58,7 @@ const mapStore = useMapStore()
 
 const selectedFeatures = computed(() => featuresStore.selectedFeatures)
 const visiblePrimitiveLayers = computed(() =>
-    layersStore.visibleLayers.filter((l: Layer) =>
-        [LayerType.GEOJSON, LayerType.KML, LayerType.GPX].includes(l.type)
-    )
+    layersStore.visibleLayers.filter((l: Layer) => ['GEOJSON', 'KML', 'GPX'].includes(l.type))
 )
 
 const viewer = inject<ShallowRef<Viewer | undefined>>('viewer')
@@ -184,7 +180,7 @@ function getCoordinateAtScreenCoordinate(x: number, y: number): SingleCoordinate
                 titleColor: LogPreDefinedColor.Orange,
                 messages: ['Using camera fallback for coordinate (test mode)', [x, y]],
             })
-            
+
             // Use camera position as approximate coordinate for tests
             const camera = viewerInstance.camera
             const cartographic = camera.positionCartographic
@@ -199,7 +195,7 @@ function getCoordinateAtScreenCoordinate(x: number, y: number): SingleCoordinate
                 messages: ['no coordinate found at this screen coordinates', [x, y]],
             })
         }
-        
+
         return coordinates
     } catch (error) {
         log.error({
@@ -339,7 +335,7 @@ function onClick(event: ScreenSpaceEventHandler.PositionedEvent): void {
     // if there is a GeoJSON layer currently visible, we will find it and search for features under the mouse cursor
     if (Array.isArray(coordinates) && coordinates.length === 2) {
         visiblePrimitiveLayers.value
-            .filter((layer: Layer) => layer.type === LayerType.GEOJSON)
+            .filter((layer: Layer) => layer.type === 'GEOJSON')
             .forEach((geoJSonLayer: Layer) => {
                 const identified = identifyGeoJSONFeatureAt(
                     geoJSonLayer as GeoAdminGeoJSONLayer,
@@ -354,7 +350,7 @@ function onClick(event: ScreenSpaceEventHandler.PositionedEvent): void {
     }
 
     visiblePrimitiveLayers.value
-        .filter((layer: Layer) => layer.type === LayerType.KML)
+        .filter((layer: Layer) => layer.type === 'KML')
         .forEach((kmlLayer: Layer) => {
             objects
                 .filter((obj) => obj.id?.layerId === kmlLayer.id)
@@ -400,7 +396,7 @@ function onClick(event: ScreenSpaceEventHandler.PositionedEvent): void {
                 coordinate: coordinates,
                 pixelCoordinate: [event.position.x, event.position.y],
                 features: features as SelectableFeature<false>[],
-                clickType: ClickType.LeftSingleClick,
+                clickType: 'LEFT_SINGLE_CLICK',
             },
             dispatcher
         )
@@ -498,7 +494,7 @@ function onContextMenu(event: ScreenSpaceEventHandler.PositionedEvent): void {
             {
                 coordinate: coordinates,
                 pixelCoordinate: [event.position.x, event.position.y],
-                clickType: ClickType.ContextMenu,
+                clickType: 'CONTEXT_MENU',
             },
             dispatcher
         )
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
index 609c15a7ec..8a0e5b3eb3 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
@@ -16,7 +16,6 @@ import type {
     Layer,
 } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { computed } from 'vue'
 
 import CesiumGeoJSONLayer from '@/modules/map/components/cesium/CesiumGeoJSONLayer.vue'
@@ -38,13 +37,13 @@ const { layerConfig, zIndex, projection, isTimeSliderActive, parentLayerOpacity
 const positionStore = usePositionStore()
 const resolution = computed(() => positionStore.resolution)
 
-const isWMTS = computed(() => layerConfig.type === LayerType.WMTS)
+const isWMTS = computed(() => layerConfig.type === 'WMTS')
 const wmtsLayerConfig = computed(() => layerConfig as GeoAdminWMTSLayer | ExternalWMTSLayer)
-const isWMS = computed(() => layerConfig.type === LayerType.WMS)
+const isWMS = computed(() => layerConfig.type === 'WMS')
 const wmsLayerConfig = computed(() => layerConfig as GeoAdminWMSLayer | ExternalWMSLayer)
-const isGroup = computed(() => layerConfig.type === LayerType.GROUP)
+const isGroup = computed(() => layerConfig.type === 'GROUP')
 const groupConfig = computed(() => layerConfig as GeoAdminGroupOfLayers)
-const isAggregate = computed(() => layerConfig.type === LayerType.AGGREGATE)
+const isAggregate = computed(() => layerConfig.type === 'AGGREGATE')
 const aggregateConfig = computed(() => layerConfig as GeoAdminAggregateLayer)
 
 function shouldAggregateSubLayerBeVisible(subLayer: {
@@ -59,7 +58,7 @@ function shouldAggregateSubLayerBeVisible(subLayer: {
 
 <template>
     <CesiumVectorLayer
-        v-if="layerConfig.type === LayerType.VECTOR"
+        v-if="layerConfig.type === 'VECTOR'"
         :layer-config="layerConfig as GeoAdmin3DLayer"
     />
     <CesiumWMTSLayer
@@ -100,15 +99,15 @@ function shouldAggregateSubLayerBeVisible(subLayer: {
         </div>
     </div>
     <CesiumGeoJSONLayer
-        v-if="layerConfig.type === LayerType.GEOJSON && !layerConfig.isLoading"
+        v-if="layerConfig.type === 'GEOJSON' && !layerConfig.isLoading"
         :geo-json-config="layerConfig as GeoAdminGeoJSONLayer"
     />
     <CesiumKMLLayer
-        v-if="layerConfig.type === LayerType.KML && !layerConfig.isLoading"
+        v-if="layerConfig.type === 'KML' && !layerConfig.isLoading"
         :kml-layer-config="layerConfig as KMLLayer"
     />
     <CesiumGPXLayer
-        v-if="layerConfig.type === LayerType.GPX && !layerConfig.isLoading"
+        v-if="layerConfig.type === 'GPX' && !layerConfig.isLoading"
         :gpx-layer-config="layerConfig as GPXLayer"
     />
     <slot />
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
index 59aedbc57d..c11088c4de 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { GeoAdminLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { computed } from 'vue'
 
 import CesiumInternalLayer from '@/modules/map/components/cesium/CesiumInternalLayer.vue'
@@ -39,11 +38,11 @@ const startingZIndexForImageryLayers = computed(
 )
 
 function isImageryLayer(layer: Layer): boolean {
-    return [LayerType.WMTS, LayerType.WMS, LayerType.AGGREGATE].includes(layer.type)
+    return ['WMTS', 'WMS', 'AGGREGATE'].includes(layer.type)
 }
 
 function isPrimitiveLayer(layer: Layer): boolean {
-    return [LayerType.GEOJSON, LayerType.KML, LayerType.GPX].includes(layer.type)
+    return ['GEOJSON', 'KML', 'GPX'].includes(layer.type)
 }
 </script>
 
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue b/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
index b289b64063..36d5e941da 100644
--- a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
+++ b/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
@@ -4,7 +4,6 @@ import type { Viewer } from 'cesium'
 import type { ShallowRef } from 'vue'
 
 import { WGS84 } from '@swissgeo/coordinates'
-import { WMTSEncodingType } from '@swissgeo/layers'
 import { layerUtils } from '@swissgeo/layers/utils'
 import log from '@swissgeo/log'
 import { ErrorMessage } from '@swissgeo/log/Message'
@@ -126,7 +125,7 @@ function createProvider(): WebMapTileServiceImageryProvider | UrlTemplateImagery
     if (wmtsLayerConfigExternal.getTileEncoding !== undefined && tileMatrixSetId.value) {
         provider = new WebMapTileServiceImageryProvider({
             url:
-                wmtsLayerConfigExternal.getTileEncoding === WMTSEncodingType.KVP
+                wmtsLayerConfigExternal.getTileEncoding === 'KVP'
                     ? wmtsLayerConfigExternal.baseUrl
                     : wmtsLayerConfigExternal.urlTemplate,
             layer: wmtsLayerConfigExternal.id,
diff --git a/packages/mapviewer/src/modules/map/components/common/z-index.composable.ts b/packages/mapviewer/src/modules/map/components/common/z-index.composable.ts
index 9b50568f69..ff06c62a37 100644
--- a/packages/mapviewer/src/modules/map/components/common/z-index.composable.ts
+++ b/packages/mapviewer/src/modules/map/components/common/z-index.composable.ts
@@ -1,6 +1,5 @@
 import type { GeoAdminGroupOfLayers, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import log from '@swissgeo/log'
 import { computed } from 'vue'
 
@@ -25,8 +24,7 @@ export function useLayerZIndexCalculation() {
         if (is3dActive.value) {
             visibleLayersWithZIndex.push(
                 ...layersStore.visibleLayers.filter(
-                    (visibleLayer) =>
-                        ![LayerType.KML, LayerType.GEOJSON].includes(visibleLayer.type)
+                    (visibleLayer) => !['KML', 'GEOJSON'].includes(visibleLayer.type)
                 )
             )
         } else {
@@ -37,7 +35,7 @@ export function useLayerZIndexCalculation() {
 
     const startingZIndexForThingsOnTopOfLayers = computed(() => {
         const nbOfSubLayers = visibleLayers.value
-            .filter((l) => l?.type === LayerType.GROUP)
+            .filter((l) => l?.type === 'GROUP')
             .map((l) => (l as GeoAdminGroupOfLayers)?.layers.length - 1)
             .reduce((a, b) => a + b, 0)
         return visibleLayers.value.length + nbOfSubLayers
@@ -63,7 +61,7 @@ export function useLayerZIndexCalculation() {
         }
         const subLayersPresentUnderThisLayer = visibleLayers.value
             .slice(0, layerIndex)
-            .filter((previousLayer) => previousLayer?.type === LayerType.GROUP)
+            .filter((previousLayer) => previousLayer?.type === 'GROUP')
             .map((previousGroup) => (previousGroup as GeoAdminGroupOfLayers)?.layers.length - 1)
             .reduce((a, b) => a + b, 0)
         return subLayersPresentUnderThisLayer + layerIndex
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
index 9886be2f3c..b57587159c 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
@@ -1,27 +1,27 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
+import type { OpenLayersMarkerStyle } from '@/modules/map/components/openlayers/utils/markerStyle'
+
 import { useLayerZIndexCalculation } from '@/modules/map/components/common/z-index.composable'
 import OpenLayersMarker from '@/modules/map/components/openlayers/OpenLayersMarker.vue'
-import { OpenLayersMarkerStyles } from '@/modules/map/components/openlayers/utils/markerStyle'
 import usePositionStore from '@/store/modules/position'
-import { CrossHairs } from '@/store/modules/position/types'
 
 const positionStore = usePositionStore()
 const crossHair = computed(() => positionStore.crossHair)
 const crossHairPosition = computed(() => positionStore.crossHairPosition)
-const crossHairStyle = computed(() => {
+const crossHairStyle = computed<OpenLayersMarkerStyle | undefined>(() => {
     switch (crossHair.value) {
-        case CrossHairs.Point:
-            return OpenLayersMarkerStyles.Point
-        case CrossHairs.Cross:
-            return OpenLayersMarkerStyles.Cross
-        case CrossHairs.Bowl:
-            return OpenLayersMarkerStyles.Bowl
-        case CrossHairs.Marker:
-            return OpenLayersMarkerStyles.Balloon
-        case CrossHairs.Circle:
-            return OpenLayersMarkerStyles.Circle
+        case 'point':
+            return 'point'
+        case 'cross':
+            return 'cross'
+        case 'bowl':
+            return 'bowl'
+        case 'marker':
+            return 'balloon'
+        case 'circle':
+            return 'circle'
     }
     return undefined
 })
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
index 6b7c2ad96a..c429d88432 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
@@ -11,7 +11,6 @@ import { useLayerZIndexCalculation } from '@/modules/map/components/common/z-ind
 import OpenLayersAccuracyCircle from '@/modules/map/components/openlayers/OpenLayersAccuracyCircle.vue'
 import OpenLayersMarker from '@/modules/map/components/openlayers/OpenLayersMarker.vue'
 import OpenLayersVisionCone from '@/modules/map/components/openlayers/OpenLayersVisionCone.vue'
-import { OpenLayersMarkerStyles } from '@/modules/map/components/openlayers/utils/markerStyle'
 import useDeviceOrientation from '@/modules/map/components/openlayers/utils/useDeviceOrientation.composable.ts'
 import useGeolocationStore from '@/store/modules/geolocation'
 import usePositionStore from '@/store/modules/position'
@@ -135,7 +134,7 @@ function disableTrackingAndAutoRotation(): void {
     <OpenLayersMarker
         v-if="geolocationPosition"
         :position="geolocationPosition"
-        :marker-style="OpenLayersMarkerStyles.Position"
+        marker-style="position"
         :z-index="zIndexGeolocation + 2"
     />
 </template>
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
index 97c69dc1e2..247bb1e425 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
@@ -49,13 +49,10 @@ const profileStore = useProfileStore()
 const uiStore = useUiStore()
 const mapStore = useMapStore()
 
-const selectedFeatures = computed(() => featuresStore.selectedFeatures)
-const selectedEditableFeatures = computed(() => featuresStore.selectedEditableFeatures)
 const selectedLayerFeatures = computed(() => featuresStore.selectedLayerFeatures)
 const isCurrentlyDrawing = computed(() => drawingStore.overlay.show)
 const projection = computed(() => positionStore.projection)
 const highlightedFeatureId = computed(() => featuresStore.highlightedFeatureId)
-const tooltipFeatureInfo = computed(() => uiStore.showFeatureInfoInTooltip)
 const profileFeature = computed(() => profileStore.feature)
 const currentGeometryElements = computed(() => {
     const geometry = profileFeature.value?.geometry
@@ -112,8 +109,8 @@ const segmentTransformedAsOlFeatures = computed((): Feature[] => {
 const southPole = point([0.0, -90.0])
 const popoverCoordinate = computed((): SingleCoordinate | undefined => {
     // if we are dealing with any editable feature while drawing, we return its last coordinate
-    if (isCurrentlyDrawing.value && selectedEditableFeatures.value.length > 0) {
-        const [topEditableFeature] = selectedEditableFeatures.value
+    if (isCurrentlyDrawing.value && featuresStore.selectedEditableFeatures.length > 0) {
+        const [topEditableFeature] = featuresStore.selectedEditableFeatures
         if (
             topEditableFeature &&
             topEditableFeature.coordinates &&
@@ -128,7 +125,7 @@ const popoverCoordinate = computed((): SingleCoordinate | undefined => {
     }
     // If no editable feature is selected while drawing, we place the popover depending on the geometry of all
     // selected features. We will find the most southern coordinate present in all features and use it as anchor.
-    const mostSouthernFeature = selectedFeatures.value
+    const mostSouthernFeature = featuresStore.selectedFeatures
         .filter((feature) => feature.geometry !== undefined)
         .map((feature) => feature.geometry)
         .map((geometry) => geoJsonUtils.transformIntoTurfEquivalent(geometry, projection.value))
@@ -196,11 +193,11 @@ function setBottomPanelFeatureInfoPosition(): void {
 
 <template>
     <OpenLayersPopover
-        v-if="tooltipFeatureInfo && selectedFeatures.length > 0"
+        v-if="uiStore.showFeatureInfoInTooltip && featuresStore.selectedFeatures.length > 0"
         :coordinates="popoverCoordinate"
         :title="isCurrentlyDrawing ? t('draw_modify_description') : t('object_information')"
         authorize-print
-        :use-content-padding="selectedEditableFeatures.length > 0"
+        :use-content-padding="featuresStore.selectedEditableFeatures.length > 0"
         mode="FLOATING"
         @close="clearAllSelectedFeatures"
     >
@@ -215,7 +212,7 @@ function setBottomPanelFeatureInfoPosition(): void {
             </button>
         </template>
         <FeatureStyleEdit
-            v-for="feature in selectedEditableFeatures"
+            v-for="feature in featuresStore.selectedEditableFeatures"
             :key="feature.id"
             :read-only="!isCurrentlyDrawing"
             :feature="feature"
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
index 36089d3d45..2783493bd4 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
@@ -20,7 +20,6 @@ import type {
 } from '@swissgeo/layers'
 
 import { WEBMERCATOR } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { computed } from 'vue'
 
 import OpenLayersCOGTiffLayer from '@/modules/map/components/openlayers/OpenLayersCOGTiffLayer.vue'
@@ -58,19 +57,19 @@ const projection = computed(() => positionStore.projection)
             (see OpenLayersMap main component)
         -->
         <OpenLayersVectorLayer
-            v-if="projection.epsg === WEBMERCATOR.epsg && layerConfig?.type === LayerType.VECTOR"
+            v-if="projection.epsg === WEBMERCATOR.epsg && layerConfig?.type === 'VECTOR'"
             :vector-layer-config="layerConfig as GeoAdminVectorLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
         />
         <OpenLayersWMTSLayer
-            v-if="layerConfig?.type === LayerType.WMTS && !layerConfig?.isExternal"
+            v-if="layerConfig?.type === 'WMTS' && !layerConfig?.isExternal"
             :wmts-layer-config="layerConfig as GeoAdminWMTSLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
         />
         <OpenLayersExternalWMTSLayer
-            v-if="layerConfig?.type === LayerType.WMTS && layerConfig?.isExternal"
+            v-if="layerConfig?.type === 'WMTS' && layerConfig?.isExternal"
             :external-wmts-layer-config="layerConfig as ExternalWMTSLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
@@ -78,7 +77,7 @@ const projection = computed(() => positionStore.projection)
         <!-- as external and internal (geoadmin) WMS layers can be managed the same way,
              we do not have a specific component for external layers but we reuse the one for geoadmin's layers-->
         <OpenLayersWMSLayer
-            v-if="layerConfig?.type === LayerType.WMS"
+            v-if="layerConfig?.type === 'WMS'"
             :wms-layer-config="
                 layerConfig.isExternal
                     ? (layerConfig as ExternalWMSLayer)
@@ -88,12 +87,12 @@ const projection = computed(() => positionStore.projection)
             :z-index="zIndex"
         />
         <OpenLayersGeoJSONLayer
-            v-if="layerConfig?.type === LayerType.GEOJSON"
+            v-if="layerConfig?.type === 'GEOJSON'"
             :geo-json-config="layerConfig as GeoAdminGeoJSONLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
         />
-        <div v-if="layerConfig?.type === LayerType.GROUP">
+        <div v-if="layerConfig?.type === 'GROUP'">
             <OpenLayersInternalLayer
                 v-for="(layer, index) in (layerConfig as GeoAdminGroupOfLayers).layers"
                 :key="`${layer.id}-${index}`"
@@ -109,7 +108,7 @@ const projection = computed(() => positionStore.projection)
         component in another child (that would be OpenLayersAggregateLayer.vue component, that doesn't work).
         See https://vuejs.org/v2/guide/components-edge-cases.html#Recursive-Components for more info
         -->
-        <div v-if="layerConfig?.type === LayerType.AGGREGATE">
+        <div v-if="layerConfig?.type === 'AGGREGATE'">
             <!-- Aggregate layers requires a different management.
                  They are not OpenLayers layers per-se, but rather an ensemble of other layers.
                  This component will loop through all the layer contained by this aggregate layer
@@ -126,7 +125,7 @@ const projection = computed(() => positionStore.projection)
         <OpenLayersKMLLayer
             v-if="
                 layerConfig &&
-                    layerConfig.type === LayerType.KML &&
+                    layerConfig.type === 'KML' &&
                     (layerConfig as KMLLayer).kmlData &&
                     !(layerConfig as KMLLayer).isEdited
             "
@@ -135,13 +134,13 @@ const projection = computed(() => positionStore.projection)
             :z-index="zIndex"
         />
         <OpenLayersGPXLayer
-            v-if="layerConfig?.type === LayerType.GPX"
+            v-if="layerConfig?.type === 'GPX'"
             :gpx-layer-config="layerConfig as GPXLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
         />
         <OpenLayersCOGTiffLayer
-            v-if="layerConfig?.type === LayerType.COG"
+            v-if="layerConfig?.type === 'COG'"
             :geotiff-config="layerConfig as CloudOptimizedGeoTIFFLayer"
             :parent-layer-opacity="parentLayerOpacity"
             :z-index="zIndex"
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
index c522b9b3c4..37ab9eaf0f 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
@@ -10,22 +10,23 @@ import Feature from 'ol/Feature'
 import { Point } from 'ol/geom'
 import { computed, inject, watch } from 'vue'
 
+import type { OpenLayersMarkerStyle } from '@/modules/map/components/openlayers/utils/markerStyle'
+
 import {
     getMarkerStyle,
     highlightFeatureStyle,
-    OpenLayersMarkerStyles,
 } from '@/modules/map/components/openlayers/utils/markerStyle'
 import useVectorLayer from '@/modules/map/components/openlayers/utils/useVectorLayer.composable'
 
 const {
     position,
-    markerStyle = OpenLayersMarkerStyles.Balloon,
+    markerStyle = 'balloon',
     zIndex = -1,
     selectFeatureCallback = () => {},
     deselectAfterSelect = false,
 } = defineProps<{
     position: SingleCoordinate | SingleCoordinate[]
-    markerStyle?: OpenLayersMarkerStyles
+    markerStyle?: OpenLayersMarkerStyle
     zIndex?: number
     selectFeatureCallback?: (_feature: Feature) => void
     deselectAfterSelect?: boolean
@@ -71,7 +72,7 @@ watch(
  */
 function featuresForPosition(
     position: SingleCoordinate,
-    style: OpenLayersMarkerStyles
+    style: OpenLayersMarkerStyle
 ): Feature<Point> | undefined {
     if (!Array.isArray(position)) {
         return undefined
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
index 54e3a377d7..1f36095a13 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
+++ b/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
@@ -3,7 +3,6 @@ import type { ActionDispatcher } from '@/store/types'
 
 import { useLayerZIndexCalculation } from '@/modules/map/components/common/z-index.composable'
 import OpenLayersMarker from '@/modules/map/components/openlayers/OpenLayersMarker.vue'
-import { OpenLayersMarkerStyles } from '@/modules/map/components/openlayers/utils/markerStyle'
 import useMapStore from '@/store/modules/map'
 
 const mapStore = useMapStore()
@@ -21,7 +20,7 @@ function selectFeatureCallback(): void {
     <OpenLayersMarker
         v-if="mapStore.pinnedLocation"
         :position="mapStore.pinnedLocation"
-        :marker-style="OpenLayersMarkerStyles.Balloon"
+        marker-style="balloon"
         :z-index="zIndexDroppedPin"
         :deselect-after-select="true"
         :select-feature-callback="selectFeatureCallback"
@@ -29,7 +28,7 @@ function selectFeatureCallback(): void {
     <OpenLayersMarker
         v-if="mapStore.previewedPinnedLocation"
         :position="mapStore.previewedPinnedLocation"
-        :marker-style="OpenLayersMarkerStyles.Balloon"
+        marker-style="balloon"
         :z-index="zIndexPreviewPosition"
     />
 </template>
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.ts b/packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.ts
index a6aa314fc9..b09cbabf48 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.ts
+++ b/packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.ts
@@ -10,38 +10,37 @@ import crossImage from '@/modules/map/assets/cross.png'
 import markerImage from '@/modules/map/assets/marker.png'
 import pointImage from '@/modules/map/assets/point.png'
 
-export enum OpenLayersMarkerStyles {
-    Balloon = 'balloon',
-    Position = 'position',
-    Feature = 'feature',
-    Hidden = 'hidden',
-    Bowl = 'bowl',
-    Circle = 'circle',
-    Cross = 'cross',
-    Point = 'point',
-}
+export type OpenLayersMarkerStyle =
+    | 'balloon'
+    | 'position'
+    | 'feature'
+    | 'hidden'
+    | 'bowl'
+    | 'circle'
+    | 'cross'
+    | 'point'
 
-function imageForMarkerStyle(markerStyle: OpenLayersMarkerStyles): string | undefined {
+function imageForMarkerStyle(markerStyle: OpenLayersMarkerStyle): string | undefined {
     switch (markerStyle) {
-        case OpenLayersMarkerStyles.Bowl:
+        case 'bowl':
             return bowlImage
-        case OpenLayersMarkerStyles.Balloon:
+        case 'balloon':
             return markerImage
-        case OpenLayersMarkerStyles.Circle:
+        case 'circle':
             return circleImage
-        case OpenLayersMarkerStyles.Cross:
+        case 'cross':
             return crossImage
-        case OpenLayersMarkerStyles.Point:
+        case 'point':
             return pointImage
     }
 }
 
-export function getMarkerStyle(markerStyle: OpenLayersMarkerStyles): Style {
+export function getMarkerStyle(markerStyle: OpenLayersMarkerStyle): Style {
     switch (markerStyle) {
-        case OpenLayersMarkerStyles.Position:
+        case 'position':
             return styleUtils.geolocationPointStyle
 
-        case OpenLayersMarkerStyles.Balloon:
+        case 'balloon':
             return new Style({
                 image: new IconStyle({
                     anchor: [0.5, 1],
@@ -49,10 +48,10 @@ export function getMarkerStyle(markerStyle: OpenLayersMarkerStyles): Style {
                 }),
             })
 
-        case OpenLayersMarkerStyles.Bowl:
-        case OpenLayersMarkerStyles.Circle:
-        case OpenLayersMarkerStyles.Cross:
-        case OpenLayersMarkerStyles.Point:
+        case 'bowl':
+        case 'circle':
+        case 'cross':
+        case 'point':
             return new Style({
                 image: new IconStyle({
                     anchor: [0.5, 0.5],
@@ -60,10 +59,10 @@ export function getMarkerStyle(markerStyle: OpenLayersMarkerStyles): Style {
                 }),
             })
 
-        case OpenLayersMarkerStyles.Feature:
+        case 'feature':
             return styleUtils.highlightPointStyle
 
-        case OpenLayersMarkerStyles.Hidden:
+        case 'hidden':
         default:
             return new Style({
                 image: new IconStyle({
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.ts b/packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.ts
index 6946ede41f..824ccef270 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.ts
+++ b/packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.ts
@@ -15,7 +15,6 @@ import type {
 import type Circle from 'ol/geom/Circle'
 
 import { gpxUtils, kmlUtils } from '@swissgeo/api/utils'
-import { LayerType } from '@swissgeo/layers'
 import log from '@swissgeo/log'
 import { DEFAULT_FEATURE_IDENTIFICATION_TOLERANCE } from '@swissgeo/staging-config/constants'
 import {
@@ -37,7 +36,6 @@ import type { ActionDispatcher } from '@/store/types'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
 import useMapStore from '@/store/modules/map'
-import { ClickType } from '@/store/modules/map/types'
 import usePositionStore from '@/store/modules/position'
 import { createLayerFeature } from '@/utils/layerUtils'
 
@@ -98,11 +96,11 @@ export function useDragBoxSelect(): {
 
         const dragBox = polygon(dragBoxCoordinates as number[][][])
         const visibleLayers = layersStore.visibleLayers.filter((layer) =>
-            [LayerType.GEOJSON, LayerType.GPX, LayerType.KML].includes(layer.type)
+            ['GEOJSON', 'GPX', 'KML'].includes(layer.type)
         )
         const vectorFeatures: LayerFeature[] = visibleLayers
             .flatMap((layer) => {
-                if (layer.type === LayerType.KML) {
+                if (layer.type === 'KML') {
                     const kmlFeatures = kmlUtils.parseKml(
                         layer as KMLLayer,
                         positionStore.projection,
@@ -111,7 +109,7 @@ export function useDragBoxSelect(): {
                     )
                     return kmlFeatures.map((feature) => ({ feature: feature, layer }))
                 }
-                if (layer.type === LayerType.GPX) {
+                if (layer.type === 'GPX') {
                     const gpxData = (layer as GPXLayer).gpxData
                     if (!gpxData) {
                         return []
@@ -121,7 +119,7 @@ export function useDragBoxSelect(): {
                         ? gpxFeatures.map((feature) => ({ feature: feature, layer }))
                         : []
                 }
-                if (layer.type === LayerType.GEOJSON) {
+                if (layer.type === 'GEOJSON') {
                     const geojsonFormat = new GeoJSON()
                     // Use type assertion to access geoJsonData
                     const geoJsonData = (layer as GeoAdminGeoJSONLayer).geoJsonData
@@ -145,7 +143,7 @@ export function useDragBoxSelect(): {
             {
                 coordinate: selectExtent as FlatExtent,
                 features: vectorFeatures,
-                clickType: ClickType.DrawBox,
+                clickType: 'DRAW_BOX',
             },
             dispatcher
         )
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.ts b/packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.ts
index f2095633ff..a3737fc82d 100644
--- a/packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.ts
+++ b/packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.ts
@@ -4,7 +4,6 @@ import type { Layer } from '@swissgeo/layers'
 import type { Map, MapBrowserEvent } from 'ol'
 import type { MaybeRef } from 'vue'
 
-import { LayerType } from '@swissgeo/layers'
 import log from '@swissgeo/log'
 import { DRAWING_HIT_TOLERANCE } from '@swissgeo/staging-config/constants'
 import { altKeyOnly, platformModifierKeyOnly, primaryAction } from 'ol/events/condition'
@@ -12,6 +11,7 @@ import { DragPan, DragRotate, MouseWheelZoom } from 'ol/interaction'
 import DoubleClickZoomInteraction from 'ol/interaction/DoubleClickZoom'
 import { computed, onBeforeUnmount, toValue, watch } from 'vue'
 
+import type { ClickType } from '@/store/modules/map/types'
 import type { ActionDispatcher } from '@/store/types'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config'
@@ -20,7 +20,6 @@ import { useDragBoxSelect } from '@/modules/map/components/openlayers/utils/useD
 import useDrawingStore from '@/store/modules/drawing'
 import useLayersStore from '@/store/modules/layers'
 import useMapStore from '@/store/modules/map'
-import { ClickType } from '@/store/modules/map/types'
 import { createLayerFeature } from '@/utils/layerUtils'
 
 const dispatcher: ActionDispatcher = {
@@ -46,9 +45,7 @@ export default function useMapInteractions(map: MaybeRef<Map>): void {
 
     const isCurrentlyDrawing = computed(() => drawingStore.overlay.show)
     const activeVectorLayers = computed(() =>
-        layersStore.activeLayers.filter((layer) =>
-            [LayerType.KML, LayerType.GPX, LayerType.GEOJSON].includes(layer.type)
-        )
+        layersStore.activeLayers.filter((layer) => ['KML', 'GPX', 'GEOJSON'].includes(layer.type))
     )
 
     // NOTE: we cannot use the {constraintResolution: true} as it has zooming issue with some devices and/or os
@@ -181,16 +178,16 @@ export default function useMapInteractions(map: MaybeRef<Map>): void {
                     }
                 })
         })
-        let clickType = ClickType.LeftSingleClick
+        let clickType: ClickType = 'LEFT_SINGLE_CLICK'
         if (platformModifierKeyOnly(event)) {
-            clickType = ClickType.CtrlLeftSingleClick
+            clickType = 'CTRL_LEFT_SINGLE_CLICK'
         }
         mapStore.click(
             {
                 coordinate: coordinate as SingleCoordinate,
                 pixelCoordinate: pixel as SingleCoordinate,
                 features: features.filter((f): f is LayerFeature => f !== undefined),
-                clickType: clickType,
+                clickType,
             },
             dispatcher
         )
@@ -208,7 +205,7 @@ export default function useMapInteractions(map: MaybeRef<Map>): void {
                 coordinate: event.coordinate as SingleCoordinate,
                 pixelCoordinate: event.pixel as SingleCoordinate,
                 features: [],
-                clickType: ClickType.ContextMenu,
+                clickType: 'CONTEXT_MENU',
             },
             dispatcher
         )
diff --git a/packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue b/packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue
index b3902f5f05..0276b8ac87 100644
--- a/packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue
+++ b/packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue
@@ -9,7 +9,6 @@ import type { ExternalWMSLayer, GeoAdminGroupOfLayers, Layer } from '@swissgeo/l
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { LV95 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import log from '@swissgeo/log'
 import { booleanContains, polygon } from '@turf/turf'
 import { computed, onMounted, ref, watch } from 'vue'
@@ -62,10 +61,10 @@ const showItem = computed(() => {
 })
 
 const isGroupOfLayers = (layer: Layer): layer is GeoAdminGroupOfLayers => {
-    return layer.type === LayerType.GROUP
+    return layer.type === 'GROUP'
 }
 const isWmsLayer = (layer: Layer): layer is ExternalWMSLayer => {
-    return layer.type === LayerType.WMS
+    return layer.type === 'WMS'
 }
 
 const hasChildren = computed(
diff --git a/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue b/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
index 66b9de53cf..5ced786f51 100644
--- a/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
+++ b/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
@@ -4,12 +4,11 @@
  * visibility, opacity or position in the layer stack)
  */
 
-import type { FlatExtent, CoordinateSystem } from '@swissgeo/coordinates'
-import type { ExternalLayer, KMLLayer, GPXLayer, Layer } from '@swissgeo/layers'
+import type { CoordinateSystem, FlatExtent } from '@swissgeo/coordinates'
+import type { ExternalLayer, GPXLayer, KMLLayer, Layer, KMLStyle } from '@swissgeo/layers'
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { WGS84 } from '@swissgeo/coordinates'
-import { KMLStyle, LayerType } from '@swissgeo/layers'
 import { timeConfigUtils } from '@swissgeo/layers/utils'
 import GeoadminTooltip from '@swissgeo/tooltip'
 import { computed, onMounted, ref, useTemplateRef } from 'vue'
@@ -65,13 +64,18 @@ const layerDownButton = useTemplateRef<HTMLButtonElement>('layerDownButton')
 const currentKmlStyle = ref<KMLStyle | undefined>((layer as KMLLayer)?.style)
 const id = computed<string>(() => layer.id)
 
-const kmlStylesAsDropdownItems = computed<DropdownItem<KMLStyle>[]>(() =>
-    Object.values(KMLStyle).map((style: KMLStyle) => ({
-        id: style,
-        title: style.toLowerCase(),
-        value: style,
-    }))
-)
+const kmlStylesAsDropdownItems = computed<DropdownItem<KMLStyle>[]>(() => [
+    {
+        id: 'DEFAULT',
+        title: 'default',
+        value: 'DEFAULT',
+    },
+    {
+        id: 'GEOADMIN',
+        title: 'geoadmin',
+        value: 'GEOADMIN',
+    },
+])
 const isLocalFile = computed<boolean>(() => layersStore.isLocalFile(layer))
 const hasDataDisclaimer = computed<boolean>(() =>
     layersStore.hasDataDisclaimer(id.value, {
@@ -87,7 +91,7 @@ const hasMultipleTimestamps = computed<boolean>(() => timeConfigUtils.hasMultipl
 
 const isPhoneMode = computed<boolean>(() => uiStore.isPhoneMode)
 const is3dActive = computed<boolean>(() => cesiumStore.active)
-const isLayerKml = computed<boolean>(() => layer.type === LayerType.KML)
+const isLayerKml = computed<boolean>(() => layer.type === 'KML')
 const isLayerClampedToGround = computed<boolean>({
     get: () => 'clampToGround' in layer && !!layer.clampToGround,
     set: (value: boolean) => {
@@ -105,15 +109,15 @@ const isLayerClampedToGround = computed<boolean>({
 const showSpinner = computed<boolean>(() => layer.isLoading && layer.isExternal && !layer.hasError)
 
 const layerExtent = computed<FlatExtent | undefined>(() => {
-    if (layer.type === LayerType.KML) {
+    if (layer.type === 'KML') {
         return (layer as KMLLayer).extent
-    } else if (layer.type === LayerType.GPX) {
+    } else if (layer.type === 'GPX') {
         return (layer as GPXLayer).extent
     }
     return undefined
 })
 const layerExtentProjection = computed<CoordinateSystem>(() => {
-    if (layer.type === LayerType.KML) {
+    if (layer.type === 'KML') {
         return (layer as KMLLayer).extentProjection ?? WGS84
     }
     return WGS84
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/NodeType.enum.ts b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/NodeType.enum.ts
deleted file mode 100644
index 28b3d982a6..0000000000
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/NodeType.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum NodeType {
-    Group = 'group',
-    SubGroup = 'sub-group',
-    Url = 'url',
-}
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
index 7416aed057..b2e0c7d7cb 100644
--- a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
+++ b/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
@@ -2,7 +2,6 @@
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { onMounted, reactive, ref, useTemplateRef, watch } from 'vue'
 
-import { NodeType } from '@/modules/menu/components/advancedTools/ImportCatalogue/NodeType.enum'
 import TextSearchMarker from '@/utils/components/TextSearchMarker.vue'
 import { getLongestCommonPrefix } from '@/utils/utils'
 
@@ -16,7 +15,7 @@ interface Provider {
 interface ProviderTreeNode {
     id: string
     name: string
-    type: NodeType
+    type: 'group' | 'sub-group' | 'url'
     url?: string
     emphasize: string
     expanded?: boolean
@@ -58,7 +57,7 @@ function buildTreeNode(baseUrl: string, providers: Provider[]): ProviderTreeNode
         return {
             id: baseUrl,
             name: firstProvider.htmlDisplay,
-            type: NodeType.Url,
+            type: 'url',
             url: firstProvider.url,
             emphasize: firstProvider.emphasize,
         }
@@ -87,7 +86,7 @@ function buildTreeNode(baseUrl: string, providers: Provider[]): ProviderTreeNode
     return {
         id: baseUrl,
         name: commonPrefix ?? baseUrl,
-        type: NodeType.Group,
+        type: 'group',
         expanded: filterApplied,
         emphasize: filterText ?? '',
         children: Object.entries(subGroups).map(([key, subGroupProviders]) => {
@@ -96,7 +95,7 @@ function buildTreeNode(baseUrl: string, providers: Provider[]): ProviderTreeNode
                 return {
                     id: firstSubProvider.url,
                     name: `${key}/${firstSubProvider.relativeUrl}`,
-                    type: NodeType.Url,
+                    type: 'url',
                     url: firstSubProvider.url,
                     emphasize: firstSubProvider.emphasize,
                 }
@@ -104,13 +103,13 @@ function buildTreeNode(baseUrl: string, providers: Provider[]): ProviderTreeNode
             return {
                 id: `${baseUrl}-${key}`,
                 name: key,
-                type: NodeType.SubGroup,
+                type: 'sub-group',
                 expanded: false,
                 emphasize: filterText ?? '',
                 children: subGroupProviders.map((provider) => ({
                     id: provider.url,
                     name: provider.relativeUrl ?? '',
-                    type: NodeType.Url,
+                    type: 'url',
                     url: provider.url,
                     emphasize: provider.emphasize,
                 })),
@@ -171,19 +170,19 @@ onMounted(() => {
 
 // Methods
 function toggleNode(node: ProviderTreeNode) {
-    if (node.type === NodeType.Group || node.type === NodeType.SubGroup) {
+    if (node.type === 'group' || node.type === 'sub-group') {
         node.expanded = !node.expanded
     }
 }
 
 function expandNode(node: ProviderTreeNode) {
-    if (node.type === NodeType.Group || node.type === NodeType.SubGroup) {
+    if (node.type === 'group' || node.type === 'sub-group') {
         node.expanded = true
     }
 }
 
 function collapseNode(node: ProviderTreeNode) {
-    if (node.type === NodeType.Group || node.type === NodeType.SubGroup) {
+    if (node.type === 'group' || node.type === 'sub-group') {
         node.expanded = false
     }
 }
@@ -267,7 +266,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                 <!-- The first level container  -->
                 <div :data-cy="`import-provider-${node.type}`">
                     <div
-                        v-if="node.type === NodeType.Group"
+                        v-if="node.type === 'group'"
                         ref="providerListEntries"
                         class="providers-header fw-bold position-sticky top-0 z-2 w-100 cursor-pointer px-2 py-1 text-nowrap"
                         :tabindex="getTabIndex(node)"
@@ -290,7 +289,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                         />
                     </div>
                     <div
-                        v-if="node.type === NodeType.Group && node.expanded"
+                        v-if="node.type === 'group' && node.expanded"
                         class="ms-3 ps-2"
                     >
                         <template
@@ -300,7 +299,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                             <!-- The second level container  -->
                             <div :data-cy="`import-provider-${child.type}`">
                                 <div
-                                    v-if="child.type === NodeType.SubGroup"
+                                    v-if="child.type === 'sub-group'"
                                     class="providers-header fw-bold position-sticky top-3 z-1 w-100 cursor-pointer px-2 py-1 text-nowrap"
                                     :tabindex="getTabIndex(child)"
                                     @click="toggleNode(child)"
@@ -325,7 +324,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                                     />
                                 </div>
                                 <div
-                                    v-if="child.type === NodeType.SubGroup && child.expanded"
+                                    v-if="child.type === 'sub-group' && child.expanded"
                                     class="ms-3 cursor-pointer ps-2"
                                 >
                                     <div
@@ -354,7 +353,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                                     </div>
                                 </div>
                                 <div
-                                    v-else-if="child.type === NodeType.Url"
+                                    v-else-if="child.type === 'url'"
                                     class="providers-item cursor-pointer px-2 py-1 text-nowrap"
                                     data-cy="import-provider-item"
                                     :tabindex="getTabIndex(child)"
@@ -376,7 +375,7 @@ defineExpose<ProviderListExpose>({ goToFirst })
                         </template>
                     </div>
                     <div
-                        v-else-if="node.type === NodeType.Url"
+                        v-else-if="node.type === 'url'"
                         class="providers-item cursor-pointer px-2 py-1 text-nowrap"
                         data-cy="import-provider-item"
                         :tabindex="getTabIndex(node)"
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue b/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue
index eadab0380a..ee0e351db2 100644
--- a/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue
+++ b/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import type { GeoAdminLayer } from '@swissgeo/layers'
+import type { GeoAdminLayer, LayerType } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { timeConfigUtils } from '@swissgeo/layers/utils'
 import { computed, ref } from 'vue'
 
@@ -17,7 +16,7 @@ const withTooltip = ref(null)
 const withLegend = ref(null)
 
 const layers = computed<GeoAdminLayer[]>(() => layersStore.config as GeoAdminLayer[])
-const possibleLayerTypes = [LayerType.WMTS, LayerType.WMS, LayerType.AGGREGATE, LayerType.GEOJSON]
+const possibleLayerTypes: LayerType[] = ['WMTS', 'WMS', 'AGGREGATE', 'GEOJSON']
 const currentLayerType = ref([...possibleLayerTypes])
 
 const dispatcher = { name: 'DebugLayerFinder.vue' }
diff --git a/packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue b/packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue
index 553588a19e..91a126ea65 100644
--- a/packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue
+++ b/packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue
@@ -4,7 +4,7 @@ import type { ComputedRef } from 'vue'
 
 import { feedbackAPI, filesAPI, shortLinkAPI } from '@swissgeo/api'
 import { layerUtils } from '@swissgeo/layers/utils'
-import log from '@swissgeo/log'
+import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { FEEDBACK_EMAIL_SUBJECT } from '@swissgeo/staging-config/constants'
 import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -17,8 +17,8 @@ import { ENVIRONMENT } from '@/config'
 import HeaderLink from '@/modules/menu/components/header/HeaderLink.vue'
 import SendActionButtons from '@/modules/menu/components/help/common/SendActionButtons.vue'
 import useDrawingStore from '@/store/modules/drawing'
-import { OnlineMode } from '@/store/modules/drawing/types'
 import useLayersStore from '@/store/modules/layers'
+import useMapStore from '@/store/modules/map'
 import useUIStore from '@/store/modules/ui'
 import DropdownButton from '@/utils/components/DropdownButton.vue'
 import EmailInput from '@/utils/components/EmailInput.vue'
@@ -34,6 +34,7 @@ const acceptedFileTypes = ['.kml', '.gpx', '.pdf', '.zip', '.jpg', '.jpeg', '.pn
 const { t } = useI18n()
 const drawingStore = useDrawingStore()
 const layersStore = useLayersStore()
+const mapStore = useMapStore()
 const uiStore = useUIStore()
 
 const feedbackCategories: DropdownItem<string>[] = [
@@ -195,7 +196,7 @@ function onEmailValidate(validation: ValidationResult) {
 async function generateShortLink() {
     const createdShortlink = await shortLinkAPI.createShortLink({
         url: window.location.href,
-        staging: ENVIRONMENT
+        staging: ENVIRONMENT,
     })
     if (createdShortlink) {
         shortLink.value = createdShortlink
@@ -217,18 +218,24 @@ function openForm() {
 }
 
 function toggleDrawingOverlay() {
-    drawingStore.toggleDrawingOverlay(
-        {
-            kmlId: temporaryKmlId,
-            title: 'feedback_drawing',
-        },
-        dispatcher
-    )
-    if (drawingStore.onlineMode === OnlineMode.Online) {
-        drawingStore.setOnlineMode(OnlineMode.OfflineWhileOnline, dispatcher)
-    } else if (drawingStore.onlineMode === OnlineMode.None) {
-        drawingStore.setOnlineMode(OnlineMode.Offline, dispatcher)
-    }
+    // when entering the drawing menu, we need to clear the location popup
+    mapStore.clearLocationPopupCoordinates(dispatcher)
+    drawingStore
+        .initiateDrawing(
+            {
+                online: false,
+                temporaryKmlId,
+                title: 'feedback_drawing',
+            },
+            dispatcher
+        )
+        .catch((error) => {
+            log.error({
+                title: 'ReportProblemButton / toggleDrawingOverlay',
+                titleColor: LogPreDefinedColor.Red,
+                messages: ['Failed to initiate drawing', error],
+            })
+        })
 }
 
 function selectItem(dropdownItem: DropdownItem<string>) {
diff --git a/packages/mapviewer/src/modules/menu/components/menu/MenuDrawingSection.vue b/packages/mapviewer/src/modules/menu/components/menu/MenuDrawingSection.vue
index d1bd958b7b..4de80a1607 100644
--- a/packages/mapviewer/src/modules/menu/components/menu/MenuDrawingSection.vue
+++ b/packages/mapviewer/src/modules/menu/components/menu/MenuDrawingSection.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { KMLLayer } from '@swissgeo/layers'
 import type { Map } from 'ol'
 
 import log from '@swissgeo/log'
@@ -9,7 +10,7 @@ import type { ActionDispatcher } from '@/store/types'
 
 import MenuSection from '@/modules/menu/components/menu/MenuSection.vue'
 import useDrawingStore from '@/store/modules/drawing'
-import { OnlineMode } from '@/store/modules/drawing/types'
+import useLayersStore from '@/store/modules/layers'
 import useMapStore from '@/store/modules/map'
 import useUIStore from '@/store/modules/ui'
 
@@ -23,6 +24,7 @@ const emits = defineEmits<{
 const { t } = useI18n()
 
 const drawingStore = useDrawingStore()
+const layersStore = useLayersStore()
 const mapStore = useMapStore()
 const uiStore = useUIStore()
 
@@ -44,17 +46,24 @@ function openDrawingModule() {
 
     // when entering the drawing menu, we need to clear the location popup
     mapStore.clearLocationPopupCoordinates(dispatcher)
-    drawingStore.toggleDrawingOverlay(
-        {
-            title: 'draw_mode_title',
-        },
-        dispatcher
-    )
-    if (drawingStore.onlineMode === OnlineMode.Offline) {
-        drawingStore.setOnlineMode(OnlineMode.OnlineWhileOffline, dispatcher)
-    } else if (drawingStore.onlineMode === OnlineMode.None) {
-        drawingStore.setOnlineMode(OnlineMode.Online, dispatcher)
-    }
+    drawingStore
+        .initiateDrawing(
+            {
+                online: true,
+                preExistingDrawing: layersStore.activeLayers
+                    .filter((layer) => layer.type === 'KML')
+                    .map((layer) => layer as KMLLayer)
+                    .find((kmlLayer) => !kmlLayer.isExternal),
+                title: 'draw_mode_title',
+            },
+            dispatcher
+        )
+        .catch((error) => {
+            log.error({
+                title: 'MenuDrawingSection.vue',
+                messages: ['Failed to initiate drawing', error],
+            })
+        })
 }
 </script>
 
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/clearDrawingFeatures.ts b/packages/mapviewer/src/store/modules/drawing/actions/clearDrawingFeatures.ts
index 935a6137df..087c393d30 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/clearDrawingFeatures.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/clearDrawingFeatures.ts
@@ -1,10 +1,8 @@
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { DrawingSaveState } from '@/store/modules/drawing/types'
-
 export default function clearDrawingFeatures(this: DrawingStore, dispatcher: ActionDispatcher) {
     this.feature.all = []
     this.feature.current = undefined
-    this.save.state = DrawingSaveState.Initial
+    this.save.state = 'INITIAL'
 }
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/closeDrawing.ts b/packages/mapviewer/src/store/modules/drawing/actions/closeDrawing.ts
index 5292e0169a..61b472cbb9 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/closeDrawing.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/closeDrawing.ts
@@ -6,9 +6,7 @@ import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config'
-import { OnlineMode } from '@/store/modules/drawing/types'
 import debounceSaveDrawing from '@/store/modules/drawing/utils/debounceSaveDrawing'
-import { isOnlineMode } from '@/store/modules/drawing/utils/isOnlineMode'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
 import useUIStore from '@/store/modules/ui'
@@ -16,11 +14,16 @@ import useUIStore from '@/store/modules/ui'
 const LOADING_BAR_REQUESTER = 'closing-drawing'
 
 export default async function closeDrawing(this: DrawingStore, dispatcher: ActionDispatcher) {
+    const isDrawingModified =
+        this.save.state !== 'INITIAL' &&
+        this.save.state !== 'LOADED' &&
+        this.save.state !== 'LOAD_ERROR'
+
     log.debug({
         title: 'Drawing store / closeDrawing',
         titleColor: LogPreDefinedColor.Lime,
         messages: [
-            `Closing drawing menu: isModified=${this.isDrawingModified}, isNew=${this.isDrawingNew}, isEmpty=${this.isDrawingEmpty}`,
+            `Closing drawing menu: isModified=${isDrawingModified}, isNew=${this.isDrawingNew}, isEmpty=${this.isDrawingEmpty}`,
         ],
     })
 
@@ -39,15 +42,15 @@ export default async function closeDrawing(this: DrawingStore, dispatcher: Actio
         }
 
         // Save on close when modified and (not new or not empty)
-        if (this.isDrawingModified && (!this.isDrawingNew || !this.isDrawingEmpty)) {
+        if (isDrawingModified && (!this.isDrawingNew || !this.isDrawingEmpty)) {
             await debounceSaveDrawing({ debounceTime: 0, retryOnError: false })
         }
 
-        if (this.layer.config) {
+        if (layersStore.activeKmlLayer) {
             // flagging the layer as not edited anymore (not displayed on the map by the drawing module anymore)
-            if (isOnlineMode(this.onlineMode)) {
+            if (this.online) {
                 layersStore.updateLayer<KMLLayer>(
-                    this.layer.config as KMLLayer,
+                    layersStore.activeKmlLayer,
                     {
                         isEdited: false,
                     },
@@ -56,25 +59,14 @@ export default async function closeDrawing(this: DrawingStore, dispatcher: Actio
             } else {
                 layersStore.updateSystemLayer<KMLLayer>(
                     {
-                        id: this.layer.config.id,
+                        id: layersStore.activeKmlLayer.id,
                         isEdited: false,
                     },
                     dispatcher
                 )
             }
-
-            delete this.layer.config
         }
 
-        if (this.onlineMode === OnlineMode.Offline) {
-            this.setOnlineMode(OnlineMode.None, dispatcher)
-        } else if (this.onlineMode === OnlineMode.OfflineWhileOnline) {
-            this.setOnlineMode(OnlineMode.Online, dispatcher)
-        } else if (this.onlineMode === OnlineMode.Online) {
-            this.setOnlineMode(OnlineMode.None, dispatcher)
-        } else if (this.onlineMode === OnlineMode.OnlineWhileOffline) {
-            this.setOnlineMode(OnlineMode.Offline, dispatcher)
-        }
         this.overlay.show = false
         this.edit.featureType = undefined
         this.layer.ol?.getSource()?.clear()
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/deleteCurrentDrawing.ts b/packages/mapviewer/src/store/modules/drawing/actions/deleteCurrentDrawing.ts
index 17506bcaa5..be681b05ff 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/deleteCurrentDrawing.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/deleteCurrentDrawing.ts
@@ -1,23 +1,50 @@
+import { filesAPI } from '@swissgeo/api'
+import log, { LogPreDefinedColor } from '@swissgeo/log'
+
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { DrawingSaveState } from '@/store/modules/drawing/types'
-import { isOnlineMode } from '@/store/modules/drawing/utils/isOnlineMode'
+import { ENVIRONMENT } from '@/config'
+import debounceSaveDrawing from '@/store/modules/drawing/utils/debounceSaveDrawing'
 import useLayersStore from '@/store/modules/layers'
 
 export default function deleteCurrentDrawing(this: DrawingStore, dispatcher: ActionDispatcher) {
-    if (!this.layer.config && !this.layer.temporaryKmlId) {
+    const layersStore = useLayersStore()
+
+    if (!layersStore.activeKmlLayer && !this.layer.temporaryKmlId) {
         return
     }
     this.clearDrawingFeatures(dispatcher)
-    this.setDrawingSaveState(DrawingSaveState.Initial, dispatcher)
+    this.setDrawingSaveState('INITIAL', dispatcher)
     this.setDrawingMode(undefined, dispatcher)
     this.setIsDrawingEditShared(false, dispatcher)
 
-    const layersStore = useLayersStore()
+    if (this.online && layersStore.activeKmlLayer?.id) {
+        layersStore.removeLayer(layersStore.activeKmlLayer.id, dispatcher)
 
-    if (isOnlineMode(this.onlineMode) && this.layer.config?.id) {
-        layersStore.removeLayer(this.layer.config.id, dispatcher)
+        if (layersStore.activeKmlLayer.adminId) {
+            filesAPI
+                .deleteKml(
+                    layersStore.activeKmlLayer.fileId,
+                    layersStore.activeKmlLayer.adminId,
+                    ENVIRONMENT
+                )
+                .catch((error) => {
+                    log.error({
+                        title: 'Drawing store / deleteCurrentDrawing',
+                        titleColor: LogPreDefinedColor.Lime,
+                        messages: ['Error while deleting feature', error],
+                    })
+                })
+        } else {
+            debounceSaveDrawing({ debounceTime: 0 }).catch((error) => {
+                log.error({
+                    title: 'Drawing store / deleteCurrentDrawing',
+                    titleColor: LogPreDefinedColor.Lime,
+                    messages: ['Error while creating an empty copy of a KML', error],
+                })
+            })
+        }
     } else if (this.layer.temporaryKmlId) {
         layersStore.removeSystemLayer(`KML|${this.layer.temporaryKmlId}`, dispatcher)
     }
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/initiateDrawing.ts b/packages/mapviewer/src/store/modules/drawing/actions/initiateDrawing.ts
index cbe4670a26..160f26423a 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/initiateDrawing.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/initiateDrawing.ts
@@ -1,7 +1,6 @@
 import type { KMLLayer } from '@swissgeo/layers'
 
-import { filesAPI } from '@swissgeo/api'
-import { layerUtils } from '@swissgeo/layers/utils'
+import { kmlUtils } from '@swissgeo/api/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import VectorLayer from 'ol/layer/Vector'
 import VectorSource from 'ol/source/Vector'
@@ -10,17 +9,17 @@ import { markRaw } from 'vue'
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { ENVIRONMENT, IS_TESTING_WITH_CYPRESS } from '@/config'
+import { IS_TESTING_WITH_CYPRESS } from '@/config'
 import useFeaturesStore from '@/store/modules/features'
-import useLayersStore from '@/store/modules/layers'
+import usePositionStore from '@/store/modules/position'
 import useUIStore from '@/store/modules/ui'
 
-import { isOnlineMode } from '../utils/isOnlineMode'
-
 interface InitiateDrawingOptions {
-    adminId?: string
     preExistingDrawing?: KMLLayer
     temporaryKmlId?: string
+    online?: boolean
+    /** Title to give to the drawing menu. */
+    title?: string
 }
 
 export default async function initiateDrawing(
@@ -50,7 +49,7 @@ export default async function initiateDrawing(
     }
 
     const featuresStore = useFeaturesStore()
-    const layersStore = useLayersStore()
+    const positionStore = usePositionStore()
     const uiStore = useUIStore()
 
     // Force feature info to be visible in drawing mode
@@ -59,8 +58,14 @@ export default async function initiateDrawing(
     // Make sure no drawing features are selected when entering the drawing mode
     featuresStore.clearAllSelectedFeatures(dispatcher)
 
-    const { adminId, preExistingDrawing, temporaryKmlId } = options
+    const {
+        preExistingDrawing,
+        temporaryKmlId,
+        online = false,
+        title = 'draw_mode_title',
+    } = options
 
+    this.online = online
     try {
         if (this.iconSets.length === 0) {
             // if icons have not yet been loaded, load them
@@ -68,36 +73,48 @@ export default async function initiateDrawing(
         }
 
         let kmlLayer: KMLLayer | undefined
-        if (preExistingDrawing && isOnlineMode(this.onlineMode)) {
+        if (preExistingDrawing) {
             kmlLayer = preExistingDrawing
             this.isDrawingNew = !!kmlLayer.adminId
-        } else if (adminId) {
-            const kmlMetadata = await filesAPI.getKmlMetadataByAdminId(adminId, ENVIRONMENT)
-            kmlLayer = layerUtils.makeKMLLayer({
-                name: this.name,
-                kmlFileUrl: filesAPI.getKmlUrl(kmlMetadata.id, ENVIRONMENT),
-                isVisible: true,
-                isEdited: true,
-                adminId: kmlMetadata.adminId,
-                kmlMetadata,
-            })
-            this.isDrawingNew = false
+
+            if (kmlLayer.isLoading) {
+                log.debug({
+                    title: 'Drawing store / initiateDrawing',
+                    titleColor: LogPreDefinedColor.Lime,
+                    messages: ['Waiting on layer to be loaded', kmlLayer.id],
+                })
+                await kmlLayer.loadedPromise
+            }
+        }
+
+        const preExistingFeatures = []
+        if (kmlLayer) {
+            preExistingFeatures.push(
+                ...kmlUtils
+                    .parseKml(
+                        kmlLayer,
+                        positionStore.projection,
+                        this.iconSets,
+                        positionStore.resolution
+                    )
+                    .filter((feature) => !!feature.get('editableFeature'))
+            )
         }
 
         this.layer = {
             ol: markRaw(
                 new VectorLayer({
                     source: new VectorSource({
-                        useSpatialIndex: false,
                         wrapX: true,
-                        // TODO PB-2027: load any pre-existing feature in the drawing layer source, setting the ID the same way we do when we draw new features
+                        features: preExistingFeatures,
                     }),
                     zIndex: 9999,
                 })
             ),
-            config: kmlLayer,
+            hasLoaded: false,
             temporaryKmlId: temporaryKmlId ?? this.layer.temporaryKmlId,
         }
+        this.layer.ol.set('id', 'drawing-layer')
 
         log.debug({
             title: 'Drawing store / initiateDrawing',
@@ -105,23 +122,12 @@ export default async function initiateDrawing(
             messages: ['Opening drawing mode with', this.layer],
         })
 
-        if (this.layer.config) {
-            // checking if the layer is already in the active layers, if so hiding it (we will show it through the system layers)
-            const index = layersStore.getIndexOfActiveLayerById(this.layer.config.id)
-            if (index === -1) {
-                layersStore.addLayer(this.layer.config as KMLLayer, dispatcher)
-            } else {
-                layersStore.updateLayer<KMLLayer>(
-                    this.layer.config as KMLLayer,
-                    { isEdited: true },
-                    dispatcher
-                )
-            }
-        }
-
         if (IS_TESTING_WITH_CYPRESS) {
             window.drawingLayer = this.layer.ol
         }
+
+        this.overlay.title = title
+        this.overlay.show = true
     } catch (error) {
         log.error({
             title: 'Drawing store / initiateDrawing',
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/setCurrentlyDrawnFeature.ts b/packages/mapviewer/src/store/modules/drawing/actions/setCurrentlyDrawnFeature.ts
index 7e0aaf77f6..d6f6f700a8 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/setCurrentlyDrawnFeature.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/setCurrentlyDrawnFeature.ts
@@ -5,7 +5,6 @@ import log, { LogPreDefinedColor } from '@swissgeo/log'
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { EditMode } from '@/store/modules/drawing/types'
 import debounceSaveDrawing from '@/store/modules/drawing/utils/debounceSaveDrawing'
 import useFeaturesStore from '@/store/modules/features'
 import useProfileStore from '@/store/modules/profile'
@@ -21,7 +20,7 @@ export default function setCurrentlyDrawnFeature(
     const profileStore = useProfileStore()
 
     if (this.feature.current) {
-        this.edit.mode = EditMode.Modify
+        this.edit.mode = 'MODIFY'
         featureStore.setSelectedFeatures([this.feature.current], dispatcher)
         // showing the profile for measure and line/polygon features
         if (
@@ -41,7 +40,7 @@ export default function setCurrentlyDrawnFeature(
             })
         }
     } else {
-        this.edit.mode = EditMode.Off
+        this.edit.mode = 'OFF'
         featureStore.clearAllSelectedFeatures(dispatcher)
     }
 }
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/setIsVisitWithAdminId.ts b/packages/mapviewer/src/store/modules/drawing/actions/setDrawingHasLoaded.ts
similarity index 57%
rename from packages/mapviewer/src/store/modules/drawing/actions/setIsVisitWithAdminId.ts
rename to packages/mapviewer/src/store/modules/drawing/actions/setDrawingHasLoaded.ts
index 0c64e31919..9928d452d3 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/setIsVisitWithAdminId.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/setDrawingHasLoaded.ts
@@ -1,10 +1,10 @@
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-export default function setIsVisitWithAdminId(
+export default function setDrawingHasLoaded(
     this: DrawingStore,
-    isVisitingWithAdminId: boolean,
+    hasLoaded: boolean,
     dispatcher: ActionDispatcher
 ) {
-    this.isVisitWithAdminId = isVisitingWithAdminId
+    this.layer.hasLoaded = hasLoaded
 }
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/setEditingMode.ts b/packages/mapviewer/src/store/modules/drawing/actions/setEditingMode.ts
index 98abae3c97..b4abf8fb15 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/setEditingMode.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/setEditingMode.ts
@@ -1,8 +1,6 @@
-import type { DrawingStore } from '@/store/modules/drawing/types'
+import type { DrawingStore, EditMode } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { EditMode } from '@/store/modules/drawing/types'
-
 export default function setEditingMode(
     this: DrawingStore,
     mode: EditMode,
@@ -10,7 +8,7 @@ export default function setEditingMode(
     dispatcher: ActionDispatcher
 ) {
     this.edit.mode = mode
-    if (mode !== EditMode.Extend) {
+    if (mode !== 'EXTEND') {
         this.edit.reverseLineStringExtension = false
     } else {
         this.edit.reverseLineStringExtension = reverseLineStringExtension
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/setOnlineMode.ts b/packages/mapviewer/src/store/modules/drawing/actions/setOnlineMode.ts
deleted file mode 100644
index c8104f3391..0000000000
--- a/packages/mapviewer/src/store/modules/drawing/actions/setOnlineMode.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { OnlineMode, DrawingStore } from '@/store/modules/drawing/types'
-import type { ActionDispatcher } from '@/store/types'
-
-export default function setOnlineMode(
-    this: DrawingStore,
-    onlineMode: OnlineMode,
-    dispatcher: ActionDispatcher
-) {
-    this.onlineMode = onlineMode
-}
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/toggleDrawingOverlay.ts b/packages/mapviewer/src/store/modules/drawing/actions/toggleDrawingOverlay.ts
deleted file mode 100644
index 1b3b66dc63..0000000000
--- a/packages/mapviewer/src/store/modules/drawing/actions/toggleDrawingOverlay.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { DrawingStore } from '@/store/modules/drawing/types'
-import type { ActionDispatcher } from '@/store/types'
-
-import useMapStore from '@/store/modules/map'
-
-interface ToggleDrawingOverlayOptions {
-    show?: boolean
-    kmlId?: string
-    title?: string
-}
-
-export default function toggleDrawingOverlay(this: DrawingStore, dispatcher: ActionDispatcher): void
-export default function toggleDrawingOverlay(
-    this: DrawingStore,
-    options: ToggleDrawingOverlayOptions,
-    dispatcher: ActionDispatcher
-): void
-
-export default function toggleDrawingOverlay(
-    this: DrawingStore,
-    optionsOrDispatcher: ToggleDrawingOverlayOptions | ActionDispatcher,
-    dispatcherOrNothing?: ActionDispatcher
-) {
-    const dispatcher = dispatcherOrNothing ?? (optionsOrDispatcher as ActionDispatcher)
-    const options = dispatcherOrNothing ? (optionsOrDispatcher as ToggleDrawingOverlayOptions) : {}
-    const { show, kmlId, title = 'draw_mode_title' } = options
-    this.overlay.show = typeof show === 'boolean' ? show : !this.overlay.show
-    this.overlay.title = title
-    this.layer.temporaryKmlId = kmlId
-    if (this.overlay.show) {
-        // when entering the drawing menu, we need to clear the location popup
-        useMapStore().clearLocationPopupCoordinates(dispatcher)
-    }
-}
diff --git a/packages/mapviewer/src/store/modules/drawing/actions/updateCurrentDrawingFeature.ts b/packages/mapviewer/src/store/modules/drawing/actions/updateCurrentDrawingFeature.ts
index 6b649c6f15..806869fae7 100644
--- a/packages/mapviewer/src/store/modules/drawing/actions/updateCurrentDrawingFeature.ts
+++ b/packages/mapviewer/src/store/modules/drawing/actions/updateCurrentDrawingFeature.ts
@@ -7,7 +7,6 @@ import log, { LogPreDefinedColor } from '@swissgeo/log'
 import type { DrawingStore } from '@/store/modules/drawing/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { DrawingSaveState } from '@/store/modules/drawing/types'
 import debounceSaveDrawing from '@/store/modules/drawing/utils/debounceSaveDrawing'
 import useProfileStore from '@/store/modules/profile'
 
@@ -17,7 +16,7 @@ export default function updateCurrentDrawingFeature(
     dispatcher: ActionDispatcher
 ) {
     if (this.feature.current) {
-        this.save.state = DrawingSaveState.UnsavedChanges
+        this.save.state = 'UNSAVED_CHANGES'
 
         Object.assign(this.feature.current, valuesToUpdate)
 
@@ -68,10 +67,10 @@ export default function updateCurrentDrawingFeature(
 
         debounceSaveDrawing()
             .then(() => {
-                this.save.state = DrawingSaveState.Saved
+                this.save.state = 'SAVED'
             })
             .catch((error) => {
-                this.save.state = DrawingSaveState.SaveError
+                this.save.state = 'SAVE_ERROR'
                 log.error({
                     title: 'Drawing store / updateCurrentDrawingFeature',
                     titleColor: LogPreDefinedColor.Lime,
diff --git a/packages/mapviewer/src/store/modules/drawing/getters/isDrawingModified.ts b/packages/mapviewer/src/store/modules/drawing/getters/isDrawingModified.ts
deleted file mode 100644
index 1af29fa1ce..0000000000
--- a/packages/mapviewer/src/store/modules/drawing/getters/isDrawingModified.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { DrawingStore } from '@/store/modules/drawing/types'
-
-import { DrawingSaveState } from '@/store/modules/drawing/types'
-
-export default function isDrawingModified(this: DrawingStore): boolean {
-    return (
-        this.save.state !== DrawingSaveState.Initial &&
-        this.save.state !== DrawingSaveState.Loaded &&
-        this.save.state !== DrawingSaveState.LoadError
-    )
-}
diff --git a/packages/mapviewer/src/store/modules/drawing/getters/showNotSharedDrawingWarning.ts b/packages/mapviewer/src/store/modules/drawing/getters/showNotSharedDrawingWarning.ts
deleted file mode 100644
index 25532f0374..0000000000
--- a/packages/mapviewer/src/store/modules/drawing/getters/showNotSharedDrawingWarning.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { DrawingStore } from '@/store/modules/drawing/types'
-
-import { OnlineMode } from '@/store/modules/drawing/types'
-
-export default function showNotSharedDrawingWarning(this: DrawingStore): boolean {
-    return (
-        !this.isVisitWithAdminId &&
-        !this.isDrawingEditShared &&
-        this.isDrawingModified &&
-        !(
-            this.onlineMode === OnlineMode.Offline ||
-            this.onlineMode === OnlineMode.OfflineWhileOnline
-        )
-    )
-}
diff --git a/packages/mapviewer/src/store/modules/drawing/index.ts b/packages/mapviewer/src/store/modules/drawing/index.ts
index 768274d800..0aabc34de7 100644
--- a/packages/mapviewer/src/store/modules/drawing/index.ts
+++ b/packages/mapviewer/src/store/modules/drawing/index.ts
@@ -11,32 +11,27 @@ import initiateDrawing from '@/store/modules/drawing/actions/initiateDrawing'
 import loadAvailableIconSets from '@/store/modules/drawing/actions/loadAvailableIconSets'
 import setCurrentlyDrawnFeature from '@/store/modules/drawing/actions/setCurrentlyDrawnFeature'
 import setDrawingFeatures from '@/store/modules/drawing/actions/setDrawingFeatures'
+import setDrawingHasLoaded from '@/store/modules/drawing/actions/setDrawingHasLoaded'
 import setDrawingMode from '@/store/modules/drawing/actions/setDrawingMode'
 import setDrawingName from '@/store/modules/drawing/actions/setDrawingName'
 import setDrawingSaveState from '@/store/modules/drawing/actions/setDrawingSaveState'
 import setEditingMode from '@/store/modules/drawing/actions/setEditingMode'
 import setIsDrawingEditShared from '@/store/modules/drawing/actions/setIsDrawingEditShared'
-import setIsVisitWithAdminId from '@/store/modules/drawing/actions/setIsVisitWithAdminId'
-import setOnlineMode from '@/store/modules/drawing/actions/setOnlineMode'
-import toggleDrawingOverlay from '@/store/modules/drawing/actions/toggleDrawingOverlay'
 import updateCurrentDrawingFeature from '@/store/modules/drawing/actions/updateCurrentDrawingFeature'
 import updateDrawingPreferences from '@/store/modules/drawing/actions/updateDrawingPreferences'
 import { isDrawingEmpty } from '@/store/modules/drawing/getters/isDrawingEmpty'
-import isDrawingModified from '@/store/modules/drawing/getters/isDrawingModified'
-import showNotSharedDrawingWarning from '@/store/modules/drawing/getters/showNotSharedDrawingWarning'
-import { DrawingSaveState, EditMode, OnlineMode } from '@/store/modules/drawing/types'
 
 const defaultDrawingTitle = 'draw_mode_title'
 
 const state = (): DrawingStoreState => ({
     layer: {
         ol: undefined,
-        config: undefined,
         temporaryKmlId: undefined,
+        hasLoaded: false,
     },
     edit: {
         featureType: undefined,
-        mode: EditMode.Off,
+        mode: 'OFF',
         reverseLineStringExtension: false,
         preferred: {
             size: featureStyleUtils.MEDIUM,
@@ -54,25 +49,21 @@ const state = (): DrawingStoreState => ({
         title: defaultDrawingTitle,
     },
     save: {
-        state: DrawingSaveState.Initial,
+        state: 'INITIAL',
         pending: undefined,
     },
-    // online: true,
-    onlineMode: OnlineMode.Online,
+    online: true,
     name: undefined,
     isDrawingNew: true,
     isDrawingEditShared: false,
-    isVisitWithAdminId: false,
+    hasLoadedDrawingWithOnlyAdminId: false,
 })
 
 const getters: DrawingStoreGetters = {
     isDrawingEmpty,
-    isDrawingModified,
-    showNotSharedDrawingWarning,
 }
 
 const actions = {
-    setOnlineMode,
     deleteCurrentDrawing,
     clearDrawingFeatures,
     deleteDrawingFeature,
@@ -82,14 +73,13 @@ const actions = {
     setDrawingMode,
     setDrawingName,
     setIsDrawingEditShared,
-    setIsVisitWithAdminId,
-    toggleDrawingOverlay,
     updateCurrentDrawingFeature,
     setDrawingSaveState,
     setCurrentlyDrawnFeature,
     initiateDrawing,
     closeDrawing,
     updateDrawingPreferences,
+    setDrawingHasLoaded,
 }
 
 const useDrawingStore = defineStore('drawing', {
diff --git a/packages/mapviewer/src/store/modules/drawing/types.ts b/packages/mapviewer/src/store/modules/drawing/types.ts
index 7533e93a6c..6a5d025c3e 100644
--- a/packages/mapviewer/src/store/modules/drawing/types.ts
+++ b/packages/mapviewer/src/store/modules/drawing/types.ts
@@ -15,43 +15,34 @@ import type { Raw } from 'vue'
 
 import type useDrawingStore from '@/store/modules/drawing'
 
-export enum DrawingSaveState {
-    /** First state when entering the drawing mode */
-    Initial = 'INITIAL',
-    /** Drawing has been loaded */
-    Loaded = 'LOADED',
-    /** Pending changes -> drawing has been modified and is not saved */
-    UnsavedChanges = 'UNSAVED_CHANGES',
-    /** Drawing is being saved */
-    Saving = 'SAVING',
-    /** Drawing has been saved and no pending changes are remaining */
-    Saved = 'SAVED',
-    /** Could not save drawing */
-    SaveError = 'SAVE_ERROR',
-    /** Could not load drawing */
-    LoadError = 'LOAD_ERROR',
-}
-
-export enum EditMode {
-    Off = 'OFF',
-    /** Mode for modifying existing features */
-    Modify = 'MODIFY',
-    /** Mode for extending existing features (for line only) */
-    Extend = 'EXTEND',
-}
+/**
+ * Possible states of the drawing save process:
+ *
+ * - INITIAL: First state when entering the drawing mode
+ * - LOADED: Drawing has been loaded
+ * - UNSAVED_CHANGES: Pending changes -> drawing has been modified and is not saved
+ * - SAVING: Drawing is being saved
+ * - SAVED: Drawing has been saved and no pending changes are remaining
+ * - SAVE_ERROR: Could not save drawing
+ * - LOAD_ERROR: Could not load drawing
+ */
+export type DrawingSaveState =
+    | 'INITIAL'
+    | 'LOADED'
+    | 'UNSAVED_CHANGES'
+    | 'SAVING'
+    | 'SAVED'
+    | 'SAVE_ERROR'
+    | 'LOAD_ERROR'
 
-export enum OnlineMode {
-    // No online/offline mode selected
-    None = 'NONE',
-    // KML is saved online
-    Online = 'ONLINE',
-    // KML is saved only locally
-    Offline = 'OFFLINE',
-    // KML is saved online but an Offline drawing is also currently open
-    OnlineWhileOffline = 'ONLINE_WHILE_OFFLINE',
-    // KML is saved locally but an Online drawing is also currently open
-    OfflineWhileOnline = 'OFFLINE_WHILE_ONLINE',
-}
+/**
+ * Mode when editing features:
+ *
+ * - OFF: No editing mode selected
+ * - MODIFY: Modify existing features
+ * - EXTEND: Extend existing features (for line only)
+ */
+export type EditMode = 'OFF' | 'MODIFY' | 'EXTEND'
 
 export interface DrawingPreferences {
     size: FeatureStyleSize
@@ -62,9 +53,9 @@ export interface DrawingPreferences {
 export interface DrawingStoreState {
     layer: {
         ol?: Raw<VectorLayer<VectorSource<Feature<Geometry>>>>
-        config?: KMLLayer
         /** KML ID to use for temporary local KML (only used when online === false) */
         temporaryKmlId?: string
+        hasLoaded: boolean
     }
     edit: {
         /** Current drawing type (or `undefined` if there is none). */
@@ -96,30 +87,23 @@ export interface DrawingStoreState {
         state: DrawingSaveState
         pending: ReturnType<typeof setTimeout> | undefined
     }
-    /**
-     * KML is saved online using the KML backend service Options:
-     *
-     * - Online: KML is saved online
-     * - Offline: KML is saved only locally
-     * - OnlineWhileOffline: KML is saved online but an Offline drawing is also currently open
-     * - OfflineWhileOnline: KML is saved locally but an Online drawing is also currently open
-     * - None: No online/offline mode selected
-     */
-    onlineMode: OnlineMode
+    online: boolean
     /** The name of the drawing, or undefined if no drawing is currently edited. */
     name?: string
     /** Flag to indicate if the drawing is new (not yet saved/existing on the backend) */
     isDrawingNew: boolean
     /** Flag to indicate if the drawing is shared with an admin id */
     isDrawingEditShared: boolean
-    /** Flag to indicate if the website is visited with an admin id */
-    isVisitWithAdminId: boolean
+    /**
+     * Flag to indicate if the drawing has been loaded with only the admin id, meaning that the
+     * drawing "edit later" link has been used by the user, and we can stop prompting him/her about
+     * saving it.
+     */
+    hasLoadedDrawingWithOnlyAdminId: boolean
 }
 
 export interface DrawingStoreGetters {
     isDrawingEmpty(): boolean
-    isDrawingModified(): boolean
-    showNotSharedDrawingWarning(): boolean
 }
 
 export type DrawingStore = ReturnType<typeof useDrawingStore>
diff --git a/packages/mapviewer/src/store/modules/drawing/utils/addKmlFeaturesToDrawingLayer.ts b/packages/mapviewer/src/store/modules/drawing/utils/addKmlFeaturesToDrawingLayer.ts
index 7df934437d..1b890b625c 100644
--- a/packages/mapviewer/src/store/modules/drawing/utils/addKmlFeaturesToDrawingLayer.ts
+++ b/packages/mapviewer/src/store/modules/drawing/utils/addKmlFeaturesToDrawingLayer.ts
@@ -7,7 +7,6 @@ import type { ActionDispatcher } from '@/store/types'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config'
 import useDrawingStore from '@/store/modules/drawing'
-import { DrawingSaveState } from '@/store/modules/drawing/types'
 import usePositionStore from '@/store/modules/position'
 
 const dispatcher: ActionDispatcher = { name: 'addKmlFeaturesToDrawingLayer' }
@@ -62,7 +61,8 @@ export default function addKmlFeaturesToDrawingLayer(
                 .filter((editableFeature) => !!editableFeature),
             dispatcher
         )
-        drawingStore.setDrawingSaveState(DrawingSaveState.Loaded, dispatcher)
+        drawingStore.setDrawingSaveState('LOADED', dispatcher)
+        drawingStore.setDrawingHasLoaded(true, dispatcher)
     } catch (error) {
         if (!kmlLayer.isLocalFile) {
             log.error({
@@ -78,7 +78,7 @@ export default function addKmlFeaturesToDrawingLayer(
             })
         }
 
-        drawingStore.setDrawingSaveState(DrawingSaveState.LoadError, dispatcher)
+        drawingStore.setDrawingSaveState('LOAD_ERROR', dispatcher)
         if (!IS_TESTING_WITH_CYPRESS && retryOnError) {
             addKmlLayerTimeout = setTimeout(() => {
                 addKmlFeaturesToDrawingLayer(kmlLayer, { retryOnError: false })
diff --git a/packages/mapviewer/src/store/modules/drawing/utils/debounceSaveDrawing.ts b/packages/mapviewer/src/store/modules/drawing/utils/debounceSaveDrawing.ts
index 22c5a04f55..e94128b71c 100644
--- a/packages/mapviewer/src/store/modules/drawing/utils/debounceSaveDrawing.ts
+++ b/packages/mapviewer/src/store/modules/drawing/utils/debounceSaveDrawing.ts
@@ -9,8 +9,6 @@ import type { ActionDispatcher } from '@/store/types'
 import { ENVIRONMENT, IS_TESTING_WITH_CYPRESS } from '@/config'
 import { generateKmlString } from '@/modules/drawing/lib/export-utils'
 import useDrawingStore from '@/store/modules/drawing'
-import { DrawingSaveState } from '@/store/modules/drawing/types'
-import { isOnlineMode } from '@/store/modules/drawing/utils/isOnlineMode'
 import useLayersStore from '@/store/modules/layers'
 import usePositionStore from '@/store/modules/position'
 
@@ -36,8 +34,8 @@ function clearPendingSaveDrawing() {
  */
 function willModify() {
     const drawingStore = useDrawingStore()
-    if (drawingStore.save.state !== DrawingSaveState.SaveError) {
-        drawingStore.setDrawingSaveState(DrawingSaveState.UnsavedChanges, dispatcher)
+    if (drawingStore.save.state !== 'SAVE_ERROR') {
+        drawingStore.setDrawingSaveState('UNSAVED_CHANGES', dispatcher)
     }
 }
 
@@ -56,7 +54,6 @@ async function saveLocalDrawing(kmlData: string) {
         adminId: kmlMetadata.adminId,
         isEdited: true,
     })
-    drawingStore.layer.config = kmlLayer
 
     if (!layersStore.systemLayers.find((systemLayer) => systemLayer.id === kmlLayer.id)) {
         layersStore.addSystemLayer(kmlLayer, dispatcher)
@@ -77,16 +74,16 @@ async function saveDrawing({ retryOnError = true }: { retryOnError?: boolean })
         drawingStore.layer.ol?.getSource()?.getFeatures() ?? [],
         drawingStore.name
     )
-    if (!isOnlineMode(drawingStore.onlineMode)) {
+    if (!drawingStore.online) {
         await saveLocalDrawing(kmlData)
         // This has to be set so that the snot shared drawing warning is not shown after drawing an offline drawing
         // and then opening the drawing overlay and leaving it without drawing something
-        drawingStore.setDrawingSaveState(DrawingSaveState.Initial, dispatcher)
+        drawingStore.setDrawingSaveState('INITIAL', dispatcher)
         return
     }
     const layersStore = useLayersStore()
 
-    const drawingLayer = drawingStore.layer.config as KMLLayer
+    const drawingLayer = layersStore.activeKmlLayer
 
     try {
         log.debug({
@@ -97,7 +94,7 @@ async function saveDrawing({ retryOnError = true }: { retryOnError?: boolean })
             ],
         })
         clearPendingSaveDrawing()
-        drawingStore.setDrawingSaveState(DrawingSaveState.Saving, dispatcher)
+        drawingStore.setDrawingSaveState('SAVING', dispatcher)
 
         const kmlData = generateKmlString(
             positionStore.projection,
@@ -105,19 +102,19 @@ async function saveDrawing({ retryOnError = true }: { retryOnError?: boolean })
             drawingStore.name
         )
 
-        if (drawingStore.layer.config?.adminId) {
+        if (layersStore.activeKmlLayer?.adminId) {
             log.debug({
                 title: 'Drawing store / saveDrawing',
                 titleColor: LogPreDefinedColor.Lime,
-                messages: [`Updating drawing with adminId ${drawingStore.layer.config.adminId}`],
+                messages: [`Updating drawing with adminId ${layersStore.activeKmlLayer.adminId}`],
             })
-            drawingStore.layer.config.kmlMetadata = await filesAPI.updateKml(
-                drawingStore.layer.config.fileId,
-                drawingStore.layer.config.adminId,
+            layersStore.activeKmlLayer.kmlMetadata = await filesAPI.updateKml(
+                layersStore.activeKmlLayer.fileId,
+                layersStore.activeKmlLayer.adminId,
                 kmlData,
                 ENVIRONMENT
             )
-            drawingStore.layer.config.kmlData = kmlData
+            layersStore.activeKmlLayer.kmlData = kmlData
 
             layersStore.updateLayer<KMLLayer>(drawingLayer, drawingLayer, dispatcher)
         } else {
@@ -125,21 +122,21 @@ async function saveDrawing({ retryOnError = true }: { retryOnError?: boolean })
             const kmlMetadata = await filesAPI.createKml(kmlData, ENVIRONMENT)
 
             let kmlLayer: KMLLayer
-            if (drawingStore.layer.config) {
+            if (layersStore.activeKmlLayer) {
                 log.debug({
                     title: 'Drawing store / saveDrawing',
                     titleColor: LogPreDefinedColor.Lime,
-                    messages: ['Copying existing KML layer', drawingStore.layer.config],
+                    messages: ['Copying existing KML layer', layersStore.activeKmlLayer],
                 })
                 // copying the existing drawing's data/config (we don't have the adminId so we can't/mustn't update it)
                 kmlLayer = layerUtils.cloneLayer<KMLLayer>(drawingLayer, {
                     kmlMetadata,
-                    opacity: drawingStore.layer.config.opacity,
+                    opacity: layersStore.activeKmlLayer.opacity,
                     isEdited: true,
                     isLoading: false,
                 })
                 // If we are copying the active layer (no adminId), remove the old one to avoid duplicates
-                layersStore.removeLayer(drawingStore.layer.config.id, dispatcher)
+                layersStore.removeLayer(layersStore.activeKmlLayer.id, dispatcher)
             } else {
                 log.debug({
                     title: 'Drawing store / saveDrawing',
@@ -158,20 +155,19 @@ async function saveDrawing({ retryOnError = true }: { retryOnError?: boolean })
             }
 
             kmlLayer.isVisible = true
-            drawingStore.layer.config = kmlLayer
 
             if (!layerUtils.isKmlLayerEmpty(kmlLayer)) {
                 layersStore.addLayer(kmlLayer, dispatcher)
             }
         }
-        drawingStore.setDrawingSaveState(DrawingSaveState.Saved, dispatcher)
+        drawingStore.setDrawingSaveState('SAVED', dispatcher)
     } catch (e) {
         log.error({
             title: 'Drawing store / saveDrawing',
             titleColor: LogPreDefinedColor.Lime,
             messages: ['Could not save KML layer: ', e],
         })
-        drawingStore.setDrawingSaveState(DrawingSaveState.SaveError, dispatcher)
+        drawingStore.setDrawingSaveState('SAVE_ERROR', dispatcher)
         if (!IS_TESTING_WITH_CYPRESS && retryOnError) {
             // Retry saving in 5 seconds
             debounceSaveDrawing({ debounceTime: 5000, retryOnError: false }).catch((error) => {
diff --git a/packages/mapviewer/src/store/modules/drawing/utils/isOnlineMode.ts b/packages/mapviewer/src/store/modules/drawing/utils/isOnlineMode.ts
deleted file mode 100644
index 526d6d4c4e..0000000000
--- a/packages/mapviewer/src/store/modules/drawing/utils/isOnlineMode.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { OnlineMode } from '@/store/modules/drawing/types'
-
-export function isOnlineMode(onlineMode: OnlineMode, includingNone: boolean = false): boolean {
-    return (
-        onlineMode === OnlineMode.Online ||
-        onlineMode === OnlineMode.OnlineWhileOffline ||
-        (includingNone && onlineMode === OnlineMode.None)
-    )
-}
diff --git a/packages/mapviewer/src/store/modules/layers/actions/removeLayer.ts b/packages/mapviewer/src/store/modules/layers/actions/removeLayer.ts
index 7c4fee73e0..f6ece7aa60 100644
--- a/packages/mapviewer/src/store/modules/layers/actions/removeLayer.ts
+++ b/packages/mapviewer/src/store/modules/layers/actions/removeLayer.ts
@@ -1,7 +1,5 @@
 import type { GeoAdminGeoJSONLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
-
 import type {
     GetLayerIdOptions,
     GetLayerIdResult,
@@ -57,7 +55,7 @@ export default function removeLayer(
         )
     }
     removedLayers.forEach((layer) => {
-        if (layer.type === LayerType.GEOJSON) {
+        if (layer.type === 'GEOJSON') {
             const geoJsonLayer = layer as GeoAdminGeoJSONLayer
             if (geoJsonLayer.updateDelay && geoJsonLayer.updateDelay > 0) {
                 clearAutoReload(geoJsonLayer)
diff --git a/packages/mapviewer/src/store/modules/layers/actions/setKmlGpxLayerData.ts b/packages/mapviewer/src/store/modules/layers/actions/setKmlGpxLayerData.ts
index 402abcd7d2..a211a682c2 100644
--- a/packages/mapviewer/src/store/modules/layers/actions/setKmlGpxLayerData.ts
+++ b/packages/mapviewer/src/store/modules/layers/actions/setKmlGpxLayerData.ts
@@ -3,7 +3,7 @@ import type { GPXLayer, GPXMetadata, KMLLayer, KMLMetadata, Layer } from '@swiss
 
 import { gpxUtils, kmlUtils } from '@swissgeo/api/utils'
 import { extentUtils, WGS84 } from '@swissgeo/coordinates'
-import { addErrorMessageToLayer, LayerType, removeErrorMessageFromLayer } from '@swissgeo/layers'
+import { addErrorMessageToLayer, removeErrorMessageFromLayer } from '@swissgeo/layers'
 import { layerUtils } from '@swissgeo/layers/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { ErrorMessage } from '@swissgeo/log/Message'
@@ -26,7 +26,7 @@ export default function setKmlGpxLayerData(
     dispatcher: ActionDispatcher
 ) {
     const layers: Layer[] = this.getActiveLayersById(layerId)
-    if (!layers || layers.some((layer) => [LayerType.KML, LayerType.GPX].includes(layer.type))) {
+    if (!layers || layers.some((layer) => ['KML', 'GPX'].includes(layer.type))) {
         log.error({
             title: 'Layers store / setKmlGpxLayerData',
             titleColor: LogPreDefinedColor.Red,
@@ -41,7 +41,7 @@ export default function setKmlGpxLayerData(
         const clone = layerUtils.cloneLayer(layer)
         let extent: FlatExtent | undefined
 
-        if (clone.type === LayerType.KML) {
+        if (clone.type === 'KML') {
             const kmlLayer = clone as KMLLayer
             let kmlName: string | undefined = kmlUtils.parseKmlName(data)
             if (!kmlName || kmlName === '') {
@@ -53,7 +53,7 @@ export default function setKmlGpxLayerData(
             kmlLayer.kmlData = data
             kmlLayer.kmlMetadata = metadata as KMLMetadata
             extent = kmlUtils.getKmlExtent(data)
-        } else if (clone.type === LayerType.GPX) {
+        } else if (clone.type === 'GPX') {
             const gpxLayer = clone as GPXLayer
             const gpxMetadata = metadata as GPXMetadata
             // The name of the GPX is derived from the metadata below
diff --git a/packages/mapviewer/src/store/modules/layers/actions/setPreviewLayer.ts b/packages/mapviewer/src/store/modules/layers/actions/setPreviewLayer.ts
index e14cd653d0..9182bb3921 100644
--- a/packages/mapviewer/src/store/modules/layers/actions/setPreviewLayer.ts
+++ b/packages/mapviewer/src/store/modules/layers/actions/setPreviewLayer.ts
@@ -1,6 +1,5 @@
 import type { GeoAdminGeoJSONLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { layerUtils } from '@swissgeo/layers/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 
@@ -54,7 +53,7 @@ export default function setPreviewLayer(
     clone.isVisible = true
     this.previewLayer = clone
 
-    if (clone.type === LayerType.GEOJSON) {
+    if (clone.type === 'GEOJSON') {
         const { promise, abortController } = loadGeoJsonDataAndStyle(
             clone as GeoAdminGeoJSONLayer,
             dispatcher
diff --git a/packages/mapviewer/src/store/modules/layers/getters/activeKmlLayer.ts b/packages/mapviewer/src/store/modules/layers/getters/activeKmlLayer.ts
index 77206cc03e..b099ba2cac 100644
--- a/packages/mapviewer/src/store/modules/layers/getters/activeKmlLayer.ts
+++ b/packages/mapviewer/src/store/modules/layers/getters/activeKmlLayer.ts
@@ -1,12 +1,10 @@
 import type { KMLLayer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
-
 import type { LayersStore } from '@/store/modules/layers/types'
 
 export default function activeKmlLayer(this: LayersStore): KMLLayer | undefined {
     const kmlLayer = this.activeLayers.find(
-        (layer) => layer.type === LayerType.KML && (layer as KMLLayer).isEdited
+        (layer) => layer.type === 'KML' && !(layer as KMLLayer).isExternal
     )
     if (kmlLayer) {
         return kmlLayer as KMLLayer
diff --git a/packages/mapviewer/src/store/modules/layers/getters/hasDataDisclaimer.ts b/packages/mapviewer/src/store/modules/layers/getters/hasDataDisclaimer.ts
index 6bfd29d37d..7b4de57b33 100644
--- a/packages/mapviewer/src/store/modules/layers/getters/hasDataDisclaimer.ts
+++ b/packages/mapviewer/src/store/modules/layers/getters/hasDataDisclaimer.ts
@@ -1,6 +1,5 @@
 import type { KMLLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { EXTERNAL_PROVIDER_WHITELISTED_URL_REGEXES } from '@swissgeo/staging-config/constants'
 
 import type { LayerActionFilter, LayersStore } from '@/store/modules/layers/types'
@@ -12,7 +11,7 @@ export default function hasDataDisclaimer(
         this.getActiveLayersById(layerId, options).some(
             (layer: Layer) =>
                 (layer && layer.isExternal && !checkLayerUrlWhitelisting(options?.baseUrl)) ||
-                (layer.type === LayerType.KML && !(layer as KMLLayer).adminId)
+                (layer.type === 'KML' && !(layer as KMLLayer).adminId)
         )
 }
 
diff --git a/packages/mapviewer/src/store/modules/layers/getters/isLocalFile.ts b/packages/mapviewer/src/store/modules/layers/getters/isLocalFile.ts
index 8667671c21..a934b21fb0 100644
--- a/packages/mapviewer/src/store/modules/layers/getters/isLocalFile.ts
+++ b/packages/mapviewer/src/store/modules/layers/getters/isLocalFile.ts
@@ -1,7 +1,5 @@
 import type { KMLLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
-
 export default function isLocalFile(): (layer?: Layer) => boolean {
     return (layer?: Layer): boolean => {
         if (!layer) {
@@ -11,7 +9,7 @@ export default function isLocalFile(): (layer?: Layer) => boolean {
         return (
             layer &&
             !isBaseUrlValidUrl &&
-            (layer.isExternal || (layer.type === LayerType.KML && !(layer as KMLLayer).adminId))
+            (layer.isExternal || (layer.type === 'KML' && !(layer as KMLLayer).adminId))
         )
     }
 }
diff --git a/packages/mapviewer/src/store/modules/layers/getters/visibleLayers.ts b/packages/mapviewer/src/store/modules/layers/getters/visibleLayers.ts
index 9701abb2f4..13d62b004e 100644
--- a/packages/mapviewer/src/store/modules/layers/getters/visibleLayers.ts
+++ b/packages/mapviewer/src/store/modules/layers/getters/visibleLayers.ts
@@ -1,6 +1,5 @@
-import type { Layer, KMLLayer } from '@swissgeo/layers'
+import type { KMLLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { timeConfigUtils } from '@swissgeo/layers/utils'
 
 import type { LayersStore } from '@/store/modules/layers/types'
@@ -26,7 +25,7 @@ export default function visibleLayers(this: LayersStore): Layer[] {
     }
     return visibleLayers.filter((layer) => {
         // we filter out any "drawing" layer that are currently edited (it will be loaded by the drawing module onto the map)
-        if (layer.type === LayerType.KML) {
+        if (layer.type === 'KML') {
             return !(layer as KMLLayer).isEdited
         }
         return true
diff --git a/packages/mapviewer/src/store/modules/layers/utils/afterAddOperations.ts b/packages/mapviewer/src/store/modules/layers/utils/afterAddOperations.ts
index c627a42343..8fae0260a5 100644
--- a/packages/mapviewer/src/store/modules/layers/utils/afterAddOperations.ts
+++ b/packages/mapviewer/src/store/modules/layers/utils/afterAddOperations.ts
@@ -6,7 +6,6 @@ import type {
     Layer,
 } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 
 import type { ActionDispatcher } from '@/store/types'
@@ -24,18 +23,20 @@ import loadLayerFromCapabilities, {
  * its state)
  */
 export default function afterAddOperations(layer: Layer, dispatcher: ActionDispatcher) {
-    if (layer.type === LayerType.COG) {
-        loadCOGMetadataAndUpdateLayer(layer as CloudOptimizedGeoTIFFLayer, dispatcher).catch(
-            (error) => {
-                log.error({
-                    title: 'Layers store / afterAddOperations',
-                    titleColor: LogPreDefinedColor.Green,
-                    messages: ['Error while loading metadata for a COG layer', layer, error],
-                })
-            }
-        )
-    } else if (layer.type === LayerType.GEOJSON) {
+    if (layer.type === 'COG') {
+        layer.loadedPromise = loadCOGMetadataAndUpdateLayer(
+            layer as CloudOptimizedGeoTIFFLayer,
+            dispatcher
+        ).catch((error) => {
+            log.error({
+                title: 'Layers store / afterAddOperations',
+                titleColor: LogPreDefinedColor.Green,
+                messages: ['Error while loading metadata for a COG layer', layer, error],
+            })
+        })
+    } else if (layer.type === 'GEOJSON') {
         const { promise } = loadGeoJsonDataAndStyle(layer as GeoAdminGeoJSONLayer, dispatcher)
+        layer.loadedPromise = promise
         promise.catch((error) => {
             log.error({
                 title: 'Layers store / afterAddOperations',
@@ -43,16 +44,16 @@ export default function afterAddOperations(layer: Layer, dispatcher: ActionDispa
                 messages: ['Error while loading data and style for a GeoJSON layer', layer, error],
             })
         })
-    } else if (layer.type === LayerType.GPX) {
-        loadGpxData(layer as GPXLayer, dispatcher).catch((error) => {
+    } else if (layer.type === 'GPX') {
+        layer.loadedPromise = loadGpxData(layer as GPXLayer, dispatcher).catch((error) => {
             log.error({
                 title: 'Layers store / afterAddOperations',
                 titleColor: LogPreDefinedColor.Green,
                 messages: ['Error while loading data for a GPX layer', layer, error],
             })
         })
-    } else if (layer.type === LayerType.KML) {
-        loadKmlKmzData(layer as KMLLayer, dispatcher).catch((error) => {
+    } else if (layer.type === 'KML') {
+        layer.loadedPromise = loadKmlKmzData(layer as KMLLayer, dispatcher).catch((error) => {
             log.error({
                 title: 'Layers store / afterAddOperations',
                 titleColor: LogPreDefinedColor.Green,
@@ -60,7 +61,7 @@ export default function afterAddOperations(layer: Layer, dispatcher: ActionDispa
             })
         })
     } else if (isAnExternalLayerRequiringCapabilitesLoading(layer)) {
-        loadLayerFromCapabilities(layer, dispatcher).catch((error) => {
+        layer.loadedPromise = loadLayerFromCapabilities(layer, dispatcher).catch((error) => {
             log.error({
                 title: 'Layers store / afterAddOperations',
                 titleColor: LogPreDefinedColor.Green,
diff --git a/packages/mapviewer/src/store/modules/layers/utils/cloneActiveLayerConfig.ts b/packages/mapviewer/src/store/modules/layers/utils/cloneActiveLayerConfig.ts
index f72fbedd35..c0f2c92e4e 100644
--- a/packages/mapviewer/src/store/modules/layers/utils/cloneActiveLayerConfig.ts
+++ b/packages/mapviewer/src/store/modules/layers/utils/cloneActiveLayerConfig.ts
@@ -1,6 +1,5 @@
 import type { GeoAdminGeoJSONLayer, Layer } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { layerUtils, timeConfigUtils } from '@swissgeo/layers/utils'
 
 export default function cloneActiveLayerConfig(
@@ -26,7 +25,7 @@ export default function cloneActiveLayerConfig(
                     )
                 )
             }
-            if (updateDelay && clone.type === LayerType.GEOJSON) {
+            if (updateDelay && clone.type === 'GEOJSON') {
                 ;(clone as GeoAdminGeoJSONLayer).updateDelay = updateDelay
             }
         }
diff --git a/packages/mapviewer/src/store/modules/layers/utils/loadKmlKmzData.ts b/packages/mapviewer/src/store/modules/layers/utils/loadKmlKmzData.ts
index 5719652b98..ee32efa740 100644
--- a/packages/mapviewer/src/store/modules/layers/utils/loadKmlKmzData.ts
+++ b/packages/mapviewer/src/store/modules/layers/utils/loadKmlKmzData.ts
@@ -1,4 +1,4 @@
-import type { KMLLayer } from '@swissgeo/layers'
+import type { KMLLayer, KMLMetadata } from '@swissgeo/layers'
 
 import { filesAPI, fileProxyAPI } from '@swissgeo/api'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
@@ -32,14 +32,27 @@ async function loadMetadata(kmlLayer: KMLLayer, dispatcher: ActionDispatcher): P
     uiStore.setLoadingBarRequester(`${LOADING_BAR_REQUEST_NAME}/metadata`, dispatcher)
 
     try {
-        const metadata = await filesAPI.loadKmlMetadata(kmlLayer, ENVIRONMENT)
-        layersStore.updateLayer<KMLLayer>(
-            kmlLayer.id,
-            {
-                kmlMetadata: metadata,
-            },
-            dispatcher
-        )
+        let metadata: KMLMetadata | undefined
+        if (kmlLayer.fileId) {
+            metadata = await filesAPI.loadKmlMetadata(kmlLayer, ENVIRONMENT)
+        } else if (kmlLayer.adminId) {
+            metadata = await filesAPI.getKmlMetadataByAdminId(kmlLayer.adminId, ENVIRONMENT)
+        }
+        if (metadata) {
+            layersStore.updateLayer<KMLLayer>(
+                kmlLayer.id,
+                {
+                    kmlMetadata: metadata,
+                },
+                dispatcher
+            )
+        } else {
+            log.warn({
+                title: 'Layer store / loadKmlKmzData',
+                titleColor: LogPreDefinedColor.Indigo,
+                messages: [`KML metadata not found for layer ${kmlLayer?.id}`],
+            })
+        }
     } catch (error) {
         log.error({
             title: 'Layer store / loadKmlKmzData',
diff --git a/packages/mapviewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts b/packages/mapviewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts
index 02f55613fe..97926c5beb 100644
--- a/packages/mapviewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts
+++ b/packages/mapviewer/src/store/modules/layers/utils/loadLayerFromCapabilities.ts
@@ -5,7 +5,7 @@ import type {
     WMSCapabilitiesResponse,
 } from '@swissgeo/layers'
 
-import { CapabilitiesError, LayerType } from '@swissgeo/layers'
+import { CapabilitiesError } from '@swissgeo/layers'
 import { readWmsCapabilities, readWmtsCapabilities } from '@swissgeo/layers/api'
 import { wmsCapabilitiesParser, wmtsCapabilitiesParser } from '@swissgeo/layers/parsers'
 import { timeConfigUtils } from '@swissgeo/layers/utils'
@@ -25,9 +25,7 @@ import usePositionStore from '@/store/modules/position'
  * @param layer
  */
 export function isAnExternalLayerRequiringCapabilitesLoading(layer: Layer): boolean {
-    return (
-        layer.isExternal && layer.isLoading && [LayerType.WMS, LayerType.WMTS].includes(layer.type)
-    )
+    return layer.isExternal && layer.isLoading && ['WMS', 'WMTS'].includes(layer.type)
 }
 
 /**
@@ -50,7 +48,7 @@ export default async function loadLayerFromCapabilities(
     let parsedLayer: ExternalWMSLayer | ExternalWMTSLayer | undefined
 
     try {
-        if (layer.type === LayerType.WMS) {
+        if (layer.type === 'WMS') {
             const capabilities = await readWmsCapabilities(layer.baseUrl, i18nStore.lang)
             parsedLayer = wmsCapabilitiesParser.getExternalLayer(
                 capabilities as unknown as WMSCapabilitiesResponse,
diff --git a/packages/mapviewer/src/store/modules/map/actions/click.ts b/packages/mapviewer/src/store/modules/map/actions/click.ts
index 103fed8b40..d022bbe640 100644
--- a/packages/mapviewer/src/store/modules/map/actions/click.ts
+++ b/packages/mapviewer/src/store/modules/map/actions/click.ts
@@ -10,7 +10,6 @@ import type { ActionDispatcher } from '@/store/types'
 import useDrawingStore from '@/store/modules/drawing'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
-import { ClickType } from '@/store/modules/map/types'
 import useUIStore from '@/store/modules/ui'
 
 export default function click(
@@ -30,13 +29,23 @@ export default function click(
     const featuresStore = useFeaturesStore()
     const layersStore = useLayersStore()
     const uiStore = useUIStore()
-    if (clickInfo.clickType === ClickType.DrawBox) {
+
+    if (drawingStore.overlay.show) {
+        log.debug({
+            title: 'Map store / click',
+            messages: [
+                'Ignoring click on map while drawing is active. (the drawing overlay is handling clicks itself)',
+            ],
+        })
+        return
+    }
+    if (clickInfo.clickType === 'DRAW_BOX') {
         // If the click is a box selection, we set the rectangle selection extent to the
         // coordinates of the click.
         this.setRectangleSelectionExtent(clickInfo.coordinate as FlatExtent, dispatcher)
     } else if (
-        clickInfo.clickType === ClickType.CtrlLeftSingleClick ||
-        clickInfo.clickType === ClickType.ContextMenu
+        clickInfo.clickType === 'CTRL_LEFT_SINGLE_CLICK' ||
+        clickInfo.clickType === 'CONTEXT_MENU'
     ) {
         // If the click is a ctrl left single click or a right click, we keep the rectangle selection extent
     } else {
@@ -44,49 +53,44 @@ export default function click(
         this.setRectangleSelectionExtent(undefined, dispatcher)
     }
 
-    if (!drawingStore.overlay.show) {
-        // if a click occurs, we only take it into account (for identify and fullscreen toggle)
-        // when the user is not currently drawing something on the map.
-        const isCtrlLeftSingleClick = clickInfo.clickType === ClickType.CtrlLeftSingleClick
-        const isContextMenuClick = clickInfo.clickType === ClickType.ContextMenu
-        const isIdentifyingFeature =
-            clickInfo.clickType === ClickType.LeftSingleClick ||
-            clickInfo.clickType === ClickType.CtrlLeftSingleClick ||
-            clickInfo.clickType === ClickType.DrawBox
+    // if a click occurs, we only take it into account (for identify and fullscreen toggle)
+    // when the user is not currently drawing something on the map.
+    const isCtrlLeftSingleClick = clickInfo.clickType === 'CTRL_LEFT_SINGLE_CLICK'
+    const isContextMenuClick = clickInfo.clickType === 'CONTEXT_MENU'
+    const isIdentifyingFeature =
+        clickInfo.clickType === 'LEFT_SINGLE_CLICK' ||
+        clickInfo.clickType === 'CTRL_LEFT_SINGLE_CLICK' ||
+        clickInfo.clickType === 'DRAW_BOX'
 
-        if (isIdentifyingFeature) {
-            const identifyMode: IdentifyMode = isCtrlLeftSingleClick ? 'TOGGLE' : 'NEW'
+    if (isIdentifyingFeature) {
+        const identifyMode: IdentifyMode = isCtrlLeftSingleClick ? 'TOGGLE' : 'NEW'
 
-            featuresStore
-                .identifyFeatureAt(
-                    layersStore.visibleLayers.filter((layer: Layer) => layer.hasTooltip),
-                    clickInfo.coordinate,
-                    clickInfo.features ?? [],
-                    identifyMode,
-                    dispatcher
-                )
-                .then(() => {
-                    if (
-                        uiStore.noFeatureInfo &&
-                        featuresStore.selectedFeaturesByLayerId.length > 0
-                    ) {
-                        // we only change the feature Info position when it's set to 'NONE', as
-                        // we want to keep the user's choice of position between clicks.
-                        uiStore.setFeatureInfoPosition('default', dispatcher)
-                    }
-                })
-                .catch((error) => {
-                    log.error({
-                        title: 'Map store / click',
-                        messages: ['Error during feature identification', error],
-                    })
+        featuresStore
+            .identifyFeatureAt(
+                layersStore.visibleLayers.filter((layer: Layer) => layer.hasTooltip),
+                clickInfo.coordinate,
+                clickInfo.features ?? [],
+                identifyMode,
+                dispatcher
+            )
+            .then(() => {
+                if (uiStore.noFeatureInfo && featuresStore.selectedFeaturesByLayerId.length > 0) {
+                    // we only change the feature Info position when it's set to 'NONE', as
+                    // we want to keep the user's choice of position between clicks.
+                    uiStore.setFeatureInfoPosition('default', dispatcher)
+                }
+            })
+            .catch((error) => {
+                log.error({
+                    title: 'Map store / click',
+                    messages: ['Error during feature identification', error],
                 })
-        }
+            })
+    }
 
-        if (isContextMenuClick) {
-            if (Array.isArray(clickInfo.coordinate) && clickInfo.coordinate.length === 2) {
-                this.locationPopupCoordinates = clickInfo.coordinate
-            }
+    if (isContextMenuClick) {
+        if (Array.isArray(clickInfo.coordinate) && clickInfo.coordinate.length === 2) {
+            this.locationPopupCoordinates = clickInfo.coordinate
         }
     }
 }
diff --git a/packages/mapviewer/src/store/modules/map/types.ts b/packages/mapviewer/src/store/modules/map/types.ts
index 91f6757bda..d5b8334701 100644
--- a/packages/mapviewer/src/store/modules/map/types.ts
+++ b/packages/mapviewer/src/store/modules/map/types.ts
@@ -3,17 +3,17 @@ import type { FlatExtent, SingleCoordinate } from '@swissgeo/coordinates'
 
 import type useMapStore from '@/store/modules/map'
 
-export enum ClickType {
-    /* Any action that triggers the context menu, so for example, right click with a mouse or
-    a long click with the finger on a touch device.*/
-    ContextMenu = 'ContextMenu',
-    /* A single click, with the left mouse button or with the finger on a touch device */
-    LeftSingleClick = 'LEFT_SINGLECLICK',
-    /* A single click with the CTRL button pressed */
-    CtrlLeftSingleClick = 'CTRL_LEFT_SINGLECLICK',
-    /* Drawing a box with ctrl and dragging a left click */
-    DrawBox = 'DRAW_BOX',
-}
+/**
+ * Actions that can be performed on the map:
+ *
+ * - CONTEXT_MENU: Any action that triggers the context menu, so for example, right click with a mouse
+ *   or a long click with the finger on a touch device.
+ * - LEFT_SINGLE_CLICK: A single click, with the left mouse button or with the finger on a touch
+ *   device
+ * - CTRL_LEFT_SINGLE_CLICK: A single click with the CTRL button pressed
+ * - DRAW_BOX: Drawing a box with ctrl and dragging a left click
+ */
+export type ClickType = 'CONTEXT_MENU' | 'LEFT_SINGLE_CLICK' | 'CTRL_LEFT_SINGLE_CLICK' | 'DRAW_BOX'
 
 export interface ClickInfo {
     coordinate: SingleCoordinate | FlatExtent
diff --git a/packages/mapviewer/src/store/modules/position/actions/setCrossHair.ts b/packages/mapviewer/src/store/modules/position/actions/setCrossHair.ts
index a77e2097a9..2ee7eec3b7 100644
--- a/packages/mapviewer/src/store/modules/position/actions/setCrossHair.ts
+++ b/packages/mapviewer/src/store/modules/position/actions/setCrossHair.ts
@@ -1,14 +1,12 @@
 import type { SingleCoordinate } from '@swissgeo/coordinates'
 
-import type { PositionStore } from '@/store/modules/position/types'
+import type { CrossHair, PositionStore } from '@/store/modules/position/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { CrossHairs } from '@/store/modules/position/types'
-
 export default function setCrossHair(
     this: PositionStore,
     payload: {
-        crossHair?: CrossHairs
+        crossHair?: CrossHair
         crossHairPosition?: SingleCoordinate
     },
     dispatcher: ActionDispatcher
@@ -17,9 +15,7 @@ export default function setCrossHair(
     if (!crossHair) {
         this.crossHair = undefined
         this.crossHairPosition = undefined
-    } else if (Object.values(CrossHairs).includes(crossHair)) {
-        // Use Object.values().includes() to check if the crosshair is a valid enum value
-        // (e.g., 'point', 'cross', etc.) rather than checking if it's an enum key
+    } else {
         this.crossHair = crossHair
         // if a position is defined as param we use it
         // if no position was given, we use the current center of the map as crosshair position
diff --git a/packages/mapviewer/src/store/modules/position/types.ts b/packages/mapviewer/src/store/modules/position/types.ts
index 3472172457..56d23c79ad 100644
--- a/packages/mapviewer/src/store/modules/position/types.ts
+++ b/packages/mapviewer/src/store/modules/position/types.ts
@@ -3,13 +3,8 @@ import type { NormalizedExtent, SingleCoordinate, CoordinateSystem } from '@swis
 import type usePositionStore from '@/store/modules/position'
 import type { CoordinateFormat } from '@/utils/coordinates/coordinateFormat'
 
-export enum CrossHairs {
-    Cross = 'cross',
-    Circle = 'circle',
-    Bowl = 'bowl',
-    Point = 'point',
-    Marker = 'marker',
-}
+export const CrossHairs = ['cross', 'circle', 'bowl', 'point', 'marker'] as const
+export type CrossHair = (typeof CrossHairs)[number]
 
 export interface CameraPosition {
     /** X position of the camera in the 3D reference system (metric mercator) */
@@ -64,7 +59,7 @@ export interface PositionStoreState {
      * 1:100'000, etc...)
      */
     projection: CoordinateSystem
-    crossHair?: CrossHairs
+    crossHair?: CrossHair
     crossHairPosition?: SingleCoordinate
     /**
      * Position of the view when we are in 3D, always expressed in EPSG:3857 (only projection system
diff --git a/packages/mapviewer/src/store/modules/search/actions/selectResultEntry.ts b/packages/mapviewer/src/store/modules/search/actions/selectResultEntry.ts
index 889e8af70d..6deaf4e417 100644
--- a/packages/mapviewer/src/store/modules/search/actions/selectResultEntry.ts
+++ b/packages/mapviewer/src/store/modules/search/actions/selectResultEntry.ts
@@ -11,7 +11,6 @@ import type Feature from 'ol/Feature'
 import { featuresAPI, searchAPI } from '@swissgeo/api'
 import { gpxUtils, kmlUtils } from '@swissgeo/api/utils'
 import { extentUtils } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { layerUtils } from '@swissgeo/layers/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 
@@ -123,7 +122,7 @@ export default function selectResultEntry(
             // For imported KML and GPX files
             let features: Feature[] = []
 
-            if (featureEntry.layer.type === LayerType.KML) {
+            if (featureEntry.layer.type === 'KML') {
                 const kmlLayer: KMLLayer = featureEntry.layer as KMLLayer
 
                 features = kmlUtils.parseKml(
@@ -132,7 +131,7 @@ export default function selectResultEntry(
                     [],
                     positionStore.resolution
                 )
-            } else if (featureEntry.layer.type === LayerType.GPX) {
+            } else if (featureEntry.layer.type === 'GPX') {
                 const gpxLayer = featureEntry.layer as GPXLayer
 
                 if (gpxLayer.gpxData) {
diff --git a/packages/mapviewer/src/store/modules/ui/actions/setFeatureInfoPosition.ts b/packages/mapviewer/src/store/modules/ui/actions/setFeatureInfoPosition.ts
index 9abbda9772..93475e4513 100644
--- a/packages/mapviewer/src/store/modules/ui/actions/setFeatureInfoPosition.ts
+++ b/packages/mapviewer/src/store/modules/ui/actions/setFeatureInfoPosition.ts
@@ -1,11 +1,11 @@
 import { MAX_WIDTH_SHOW_FLOATING_TOOLTIP } from '@swissgeo/staging-config/constants'
 
-import type { FeatureInfoPositions, UIStore } from '@/store/modules/ui/types'
+import type { FeatureInfoPosition, UIStore } from '@/store/modules/ui/types'
 import type { ActionDispatcher } from '@/store/types'
 
 export default function setFeatureInfoPosition(
     this: UIStore,
-    position: FeatureInfoPositions,
+    position: FeatureInfoPosition,
     dispatcher: ActionDispatcher
 ): void {
     if (position !== 'none' && this.width < MAX_WIDTH_SHOW_FLOATING_TOOLTIP) {
diff --git a/packages/mapviewer/src/store/modules/ui/actions/setSize.ts b/packages/mapviewer/src/store/modules/ui/actions/setSize.ts
index 12a32a3594..6f6643b876 100644
--- a/packages/mapviewer/src/store/modules/ui/actions/setSize.ts
+++ b/packages/mapviewer/src/store/modules/ui/actions/setSize.ts
@@ -4,11 +4,9 @@ import {
     MAX_WIDTH_SHOW_FLOATING_TOOLTIP,
 } from '@swissgeo/staging-config/constants'
 
-import type { UIStore } from '@/store/modules/ui/types'
+import type { UIStore, UIMode } from '@/store/modules/ui/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { UIModes } from '@/store/modules/ui/types'
-
 export default function setSize(
     this: UIStore,
     width: number,
@@ -22,12 +20,12 @@ export default function setSize(
         this.featureInfoPosition = 'bottomPanel'
     }
 
-    let wantedUiMode: UIModes
+    let wantedUiMode: UIMode
     if (this.width < BREAKPOINT_PHONE_WIDTH || this.height < BREAKPOINT_PHONE_HEIGHT) {
-        wantedUiMode = UIModes.Phone
+        wantedUiMode = 'phone'
     } else {
         // so the UI mode Desktop also includes the tablet mode.
-        wantedUiMode = UIModes.Desktop
+        wantedUiMode = 'desktop'
     }
     if (wantedUiMode !== this.mode) {
         this.setUiMode(wantedUiMode, dispatcher)
diff --git a/packages/mapviewer/src/store/modules/ui/actions/setUiMode.ts b/packages/mapviewer/src/store/modules/ui/actions/setUiMode.ts
index 9d2c33c7de..4871afc39f 100644
--- a/packages/mapviewer/src/store/modules/ui/actions/setUiMode.ts
+++ b/packages/mapviewer/src/store/modules/ui/actions/setUiMode.ts
@@ -1,15 +1,7 @@
-import type { UIStore } from '@/store/modules/ui/types'
+import type { UIStore, UIMode } from '@/store/modules/ui/types'
 import type { ActionDispatcher } from '@/store/types'
 
-import { UIModes } from '@/store/modules/ui/types'
-
-export default function setUiMode(
-    this: UIStore,
-    mode: UIModes,
-    dispatcher: ActionDispatcher
-): void {
-    if (mode in UIModes) {
-        this.mode = mode
-        this.fullscreenMode = false
-    }
+export default function setUiMode(this: UIStore, mode: UIMode, dispatcher: ActionDispatcher): void {
+    this.mode = mode
+    this.fullscreenMode = false
 }
diff --git a/packages/mapviewer/src/store/modules/ui/getters/isDesktopMode.ts b/packages/mapviewer/src/store/modules/ui/getters/isDesktopMode.ts
index ff23a6ac01..c6bf792fbf 100644
--- a/packages/mapviewer/src/store/modules/ui/getters/isDesktopMode.ts
+++ b/packages/mapviewer/src/store/modules/ui/getters/isDesktopMode.ts
@@ -1,7 +1,5 @@
 import type { UIStore } from '@/store/modules/ui/types'
 
-import { UIModes } from '@/store/modules/ui/types'
-
 export default function isDesktopMode(this: UIStore): boolean {
-    return this.mode === UIModes.Desktop
+    return this.mode === 'desktop'
 }
diff --git a/packages/mapviewer/src/store/modules/ui/getters/isMenuTrayShown.ts b/packages/mapviewer/src/store/modules/ui/getters/isMenuTrayShown.ts
index c601590f68..5f37628614 100644
--- a/packages/mapviewer/src/store/modules/ui/getters/isMenuTrayShown.ts
+++ b/packages/mapviewer/src/store/modules/ui/getters/isMenuTrayShown.ts
@@ -1,7 +1,5 @@
 import type { UIStore } from '@/store/modules/ui/types'
 
-import { UIModes } from '@/store/modules/ui/types'
-
 export default function isMenuTrayShown(this: UIStore): boolean {
-    return this.mode === UIModes.Phone ? this.isMenuShown : this.isHeaderShown
+    return this.mode === 'phone' ? this.isMenuShown : this.isHeaderShown
 }
diff --git a/packages/mapviewer/src/store/modules/ui/getters/isPhoneMode.ts b/packages/mapviewer/src/store/modules/ui/getters/isPhoneMode.ts
index 4e13af8487..c357ae08f2 100644
--- a/packages/mapviewer/src/store/modules/ui/getters/isPhoneMode.ts
+++ b/packages/mapviewer/src/store/modules/ui/getters/isPhoneMode.ts
@@ -1,7 +1,5 @@
 import type { UIStore } from '@/store/modules/ui/types'
 
-import { UIModes } from '@/store/modules/ui/types'
-
 export default function isPhoneMode(this: UIStore): boolean {
-    return this.mode === UIModes.Phone
+    return this.mode === 'phone'
 }
diff --git a/packages/mapviewer/src/store/modules/ui/getters/showFeatureInfoInTooltip.ts b/packages/mapviewer/src/store/modules/ui/getters/showFeatureInfoInTooltip.ts
index 1586ec5bc3..05ea8f8b47 100644
--- a/packages/mapviewer/src/store/modules/ui/getters/showFeatureInfoInTooltip.ts
+++ b/packages/mapviewer/src/store/modules/ui/getters/showFeatureInfoInTooltip.ts
@@ -3,6 +3,6 @@ import type { UIStore } from '@/store/modules/ui/types'
 export default function showFeatureInfoInTooltip(this: UIStore): boolean {
     return (
         this.featureInfoPosition === 'tooltip' ||
-        (this.featureInfoPosition === 'default' && !this.isPhoneMode)
+        (this.featureInfoPosition === 'default' && this.isDesktopMode)
     )
 }
diff --git a/packages/mapviewer/src/store/modules/ui/index.ts b/packages/mapviewer/src/store/modules/ui/index.ts
index aca2f5e776..9a1ea3572e 100644
--- a/packages/mapviewer/src/store/modules/ui/index.ts
+++ b/packages/mapviewer/src/store/modules/ui/index.ts
@@ -48,7 +48,6 @@ import screenDensity from '@/store/modules/ui/getters/screenDensity'
 import showFeatureInfoInBottomPanel from '@/store/modules/ui/getters/showFeatureInfoInBottomPanel'
 import showFeatureInfoInTooltip from '@/store/modules/ui/getters/showFeatureInfoInTooltip'
 import showLoadingBar from '@/store/modules/ui/getters/showLoadingBar'
-import { UIModes } from '@/store/modules/ui/types'
 
 export const MAP_LOADING_BAR_REQUESTER = 'app-map-loading'
 
@@ -60,7 +59,7 @@ const state = (): UIStoreState => ({
     embed: false,
     noSimpleZoomEmbed: false,
     loadingBarRequesters: { [MAP_LOADING_BAR_REQUESTER]: 1 },
-    mode: UIModes.Phone,
+    mode: 'phone',
     featureInfoPosition: 'none',
     hostname: window.location.hostname,
     importCatalogue: false,
diff --git a/packages/mapviewer/src/store/modules/ui/types.ts b/packages/mapviewer/src/store/modules/ui/types.ts
index 9e7a589b44..01779f9b4c 100644
--- a/packages/mapviewer/src/store/modules/ui/types.ts
+++ b/packages/mapviewer/src/store/modules/ui/types.ts
@@ -6,17 +6,14 @@ import type useUiStore from '@/store/modules/ui'
  * 'default' is not the default value, but the default behavior, which depends on the UI size:
  * 'bottomPanel' on phones, 'tooltip' on desktop
  */
-export type FeatureInfoPositions = 'default' | 'bottomPanel' | 'tooltip' | 'none'
+export type FeatureInfoPosition = 'default' | 'bottomPanel' | 'tooltip' | 'none'
 
 /**
  * Describes the different mode the UI can have. Either desktop / tablet (menu is always shown, info
  * box is a side tray) or phone (menu has to be opened with a button, info box is a swipeable
  * element)
  */
-export enum UIModes {
-    Desktop,
-    Phone,
-}
+export type UIMode = 'desktop' | 'phone'
 
 /**
  * Module that stores all information related to the UI, for instance if a portion of the UI (like
@@ -65,14 +62,14 @@ export interface UIStoreState {
      * menu has to be opened through a button, for desktop it is always shown) and how the
      * information about a selected feature are shown.
      */
-    mode: UIModes
+    mode: UIMode
     /**
      * Expected position of the features tooltip position when selecting features.
      *
      * The default position is set to NONE, as we want people who want to share a feature without
      * the tooltip to have a very simple URL.
      */
-    featureInfoPosition: FeatureInfoPositions
+    featureInfoPosition: FeatureInfoPosition
     /**
      * Hostname on which the application is running (use to display warnings to the user on
      * 'non-production' hosts)
diff --git a/packages/mapviewer/src/store/plugins/storeSync/__tests__/LayerParamConfig.class.spec.ts b/packages/mapviewer/src/store/plugins/storeSync/__tests__/LayerParamConfig.class.spec.ts
index 3b2bfe8e53..dc77510748 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/__tests__/LayerParamConfig.class.spec.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/__tests__/LayerParamConfig.class.spec.ts
@@ -1,4 +1,3 @@
-import { LayerType } from '@swissgeo/layers'
 import { encodeExternalLayerParam } from '@swissgeo/layers/api'
 import { getServiceKmlBaseUrl } from '@swissgeo/staging-config'
 import { describe, expect, it } from 'vitest'
@@ -9,16 +8,16 @@ describe('External layer parsing with decodeUrlLayerId', () => {
     it('parses a KML layer correctly', () => {
         const kmlFileId = '1234567abc'
         const kmlFileUrl = `https://${getServiceKmlBaseUrl()}/api/kml/files/${kmlFileId}`
-        const result = decodeUrlLayerId(`${LayerType.KML}|${encodeExternalLayerParam(kmlFileUrl)}`)
-        expect(result.type).to.eq(LayerType.KML)
+        const result = decodeUrlLayerId(`${'KML'}|${encodeExternalLayerParam(kmlFileUrl)}`)
+        expect(result.type).to.eq('KML')
         expect(result.baseUrl).to.eq(kmlFileUrl)
         expect(result.id).to.eq(kmlFileUrl)
     })
     it('parses a KML external layer correctly', () => {
         const kmlFileId = '1234567abc'
         const kmlFileUrl = `https://totally.random.kml.url/${kmlFileId}`
-        const result = decodeUrlLayerId(`${LayerType.KML}|${encodeExternalLayerParam(kmlFileUrl)}`)
-        expect(result.type).to.eq(LayerType.KML)
+        const result = decodeUrlLayerId(`${'KML'}|${encodeExternalLayerParam(kmlFileUrl)}`)
+        expect(result.type).to.eq('KML')
         expect(result.baseUrl).to.eq(kmlFileUrl)
         expect(result.id).to.eq(kmlFileUrl)
     })
@@ -26,9 +25,9 @@ describe('External layer parsing with decodeUrlLayerId', () => {
         const wmsBaseUrl = 'https://base.wms.url/?SERVICE=GetMap'
         const wmsLayerId = 'random.wms.layer_id'
         const result = decodeUrlLayerId(
-            `${LayerType.WMS}|${encodeExternalLayerParam(wmsBaseUrl)}|${encodeExternalLayerParam(wmsLayerId)}`
+            `${'WMS'}|${encodeExternalLayerParam(wmsBaseUrl)}|${encodeExternalLayerParam(wmsLayerId)}`
         )
-        expect(result.type).to.equal(LayerType.WMS)
+        expect(result.type).to.equal('WMS')
         expect(result.baseUrl).to.eq(wmsBaseUrl)
         expect(result.id).to.eq(wmsLayerId)
     })
@@ -36,9 +35,9 @@ describe('External layer parsing with decodeUrlLayerId', () => {
         const wmtsGetCapUrl = 'https://base.wmts.url/getCapabilitiesEndpoint.xml'
         const wmtsLayerId = 'random.wmts.layer_id'
         const result = decodeUrlLayerId(
-            `${LayerType.WMTS}|${encodeExternalLayerParam(wmtsGetCapUrl)}|${encodeExternalLayerParam(wmtsLayerId)}`
+            `${'WMTS'}|${encodeExternalLayerParam(wmtsGetCapUrl)}|${encodeExternalLayerParam(wmtsLayerId)}`
         )
-        expect(result.type).to.equal(LayerType.WMTS)
+        expect(result.type).to.equal('WMTS')
         expect(result.baseUrl).to.eq(wmtsGetCapUrl)
         expect(result.id).to.eq(wmtsLayerId)
     })
diff --git a/packages/mapviewer/src/store/plugins/storeSync/__tests__/layersParamParser.spec.ts b/packages/mapviewer/src/store/plugins/storeSync/__tests__/layersParamParser.spec.ts
index ae22905ff2..5436f4cc55 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/__tests__/layersParamParser.spec.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/__tests__/layersParamParser.spec.ts
@@ -5,7 +5,6 @@ import type {
     LayerTimeConfigEntry,
 } from '@swissgeo/layers'
 
-import { LayerType } from '@swissgeo/layers'
 import { layerUtils } from '@swissgeo/layers/utils'
 import { getServiceKmlBaseUrl } from '@swissgeo/staging-config'
 import { cloneDeep } from 'lodash'
@@ -85,13 +84,13 @@ describe('Testing layersParamParser', () => {
                     },
                 },
                 {
-                    type: LayerType.KML,
+                    type: 'KML',
                     id: 'somerandomurl.ch/file.kml',
                     baseUrl: 'somerandomurl.ch/file.kml',
                     opacity: 0.4,
                 },
                 {
-                    type: LayerType.WMTS,
+                    type: 'WMTS',
                     baseUrl: 'https://totally.fake.wmts.url/WMTSGetCapabilties.xml',
                     id: 'a.layer.id',
                     opacity: 0.8,
@@ -204,7 +203,7 @@ describe('Testing layersParamParser', () => {
                 expect(result).to.be.an('Array').with.lengthOf(1)
                 const [layer] = result
                 expect(layer).toBeDefined()
-                expect(layer.type).to.eq(LayerType.KML)
+                expect(layer.type).to.eq('KML')
                 expect(layer.id).to.eq(kmlFileUrl)
                 expect(layer.baseUrl).to.eq(kmlFileUrl)
                 expect(layer.isVisible).to.be.false
@@ -219,7 +218,8 @@ describe('Testing layersParamParser', () => {
                 const [externalWMTSLayer] = results
                 expect(externalWMTSLayer).to.be.an('Object')
                 expect(externalWMTSLayer.id).to.eq(layerId)
-                expect(externalWMTSLayer.type).to.eq(LayerType.WMTS)
+                expect(externalWMTSLayer.id).to.eq(layerId)
+                expect(externalWMTSLayer.type).to.eq('WMTS')
                 expect(externalWMTSLayer.baseUrl).to.eq(baseUrl)
                 expect(externalWMTSLayer.isVisible).to.be.true
                 expect(externalWMTSLayer.opacity).to.eq(1.0)
@@ -233,7 +233,7 @@ describe('Testing layersParamParser', () => {
                 const [externalWMSLayer] = results
                 expect(externalWMSLayer).to.be.an('Object')
                 expect(externalWMSLayer.id).to.eq(layerId)
-                expect(externalWMSLayer.type).to.eq(LayerType.WMS)
+                expect(externalWMSLayer.type).to.eq('WMS')
                 expect(externalWMSLayer.baseUrl).to.eq(baseUrl)
                 expect(externalWMSLayer.isVisible).to.be.true
                 expect(externalWMSLayer.opacity).to.eq(0.8)
diff --git a/packages/mapviewer/src/store/plugins/storeSync/layersParamParser.ts b/packages/mapviewer/src/store/plugins/storeSync/layersParamParser.ts
index 380141fdc5..e3a0f3bd29 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/layersParamParser.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/layersParamParser.ts
@@ -5,13 +5,14 @@ import type {
     KMLLayer,
     Layer,
     LayerCustomAttributes,
+    LayerType,
 } from '@swissgeo/layers'
 import type { LocationQueryRaw } from 'vue-router'
 
 import { legacyLayerParamUtils } from '@swissgeo/api/utils'
-import { KMLStyle, LayerType } from '@swissgeo/layers'
+import { LayerTypes } from '@swissgeo/layers'
 import { decodeExternalLayerParam, encodeExternalLayerParam } from '@swissgeo/layers/api'
-import { layerUtils, timeConfigUtils } from '@swissgeo/layers/utils'
+import { timeConfigUtils } from '@swissgeo/layers/utils'
 import { isNumber } from '@swissgeo/numbers'
 
 import useLayersStore from '@/store/modules/layers'
@@ -29,17 +30,17 @@ const ENC_AT: string = '%40'
 export function encodeLayerId(layer: Layer): string {
     // special case for internal KMLs, we still want the type identifier before the fileUrl
     // (they won't be available in the layers config, so we treat them as "external" too)
-    if (layer.isExternal || layer.type === LayerType.KML) {
+    if (layer.isExternal || layer.type === 'KML') {
         let externalLayerUrlId = ''
         // Group of layers uses type WMS
-        if (layer.type === LayerType.GROUP) {
-            externalLayerUrlId += LayerType.WMS
+        if (layer.type === 'GROUP') {
+            externalLayerUrlId += 'WMS'
         } else {
             externalLayerUrlId += `${layer.type}`
         }
         externalLayerUrlId += `|${encodeExternalLayerParam(layer.baseUrl)}`
         // WMS and WMTS (GROUP are essentially WMS too) need to specify the ID of the layer in the getCap
-        if ([LayerType.GROUP, LayerType.WMTS, LayerType.WMS].includes(layer.type)) {
+        if (['GROUP', 'WMTS', 'WMS'].includes(layer.type)) {
             externalLayerUrlId += `|${encodeExternalLayerParam(layer.id)}`
         }
         return externalLayerUrlId
@@ -53,7 +54,9 @@ export function encodeLayerId(layer: Layer): string {
  */
 export function decodeUrlLayerId(urlLayerId: string): Partial<Layer> {
     const [rawLayerType = '', layerBaseUrl = '', layerId] = urlLayerId.split('|')
-    const layerType: LayerType | undefined = layerUtils.transformToLayerTypeEnum(rawLayerType)
+    const layerType: LayerType | undefined = LayerTypes.includes(rawLayerType as LayerType)
+        ? (rawLayerType as LayerType)
+        : undefined
     if (layerType) {
         const decodedBaseUrl = decodeExternalLayerParam(layerBaseUrl)
         // KML/GPX do not have layer IDs, so we use their baseUrl as "ID"
@@ -128,7 +131,7 @@ export function parseLayersParam(queryValue: string): Partial<Layer>[] {
                     } else if (
                         value &&
                         key === 'style' &&
-                        Object.keys(KMLStyle).includes(value.toUpperCase())
+                        (value.toLowerCase() === 'GEOADMIN' || value.toLowerCase() === 'DEFAULT')
                     ) {
                         parsedValue = value.toUpperCase()
                     } else {
@@ -197,10 +200,10 @@ export function transformLayerIntoUrlString(
         layerUrlString += `@updateDelay=${layerUpdateDelay}`
     }
 
-    if (layer.type === LayerType.KML) {
+    if (layer.type === 'KML') {
         const kmlLayer = layer as KMLLayer
         // for our own files, the default style is GeoAdmin (and we don't want to write that in the URL)
-        const defaultKmlStyle = kmlLayer.isExternal ? KMLStyle.DEFAULT : KMLStyle.GEOADMIN
+        const defaultKmlStyle = kmlLayer.isExternal ? 'DEFAULT' : 'GEOADMIN'
         if (kmlLayer.style && kmlLayer.style !== defaultKmlStyle) {
             layerUrlString += `@style=${kmlLayer.style.toLowerCase()}`
         }
@@ -208,8 +211,8 @@ export function transformLayerIntoUrlString(
         // - when style is geoadmin, and clamp to ground is false
         // - when style is default, and clamp to ground is true
         if (
-            (kmlLayer.style === KMLStyle.DEFAULT && kmlLayer.clampToGround) ||
-            (kmlLayer.style === KMLStyle.GEOADMIN && !kmlLayer.clampToGround)
+            (kmlLayer.style === 'DEFAULT' && kmlLayer.clampToGround) ||
+            (kmlLayer.style === 'GEOADMIN' && !kmlLayer.clampToGround)
         ) {
             layerUrlString += `@clampToGround=${kmlLayer.clampToGround}`
         }
diff --git a/packages/mapviewer/src/store/plugins/storeSync/params/crosshair.param.ts b/packages/mapviewer/src/store/plugins/storeSync/params/crosshair.param.ts
index 21de06d29f..1774ee2654 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/params/crosshair.param.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/params/crosshair.param.ts
@@ -4,6 +4,7 @@ import type { RouteLocationNormalizedGeneric } from 'vue-router'
 import { round } from '@swissgeo/numbers'
 import { isEqual } from 'lodash'
 
+import type { CrossHair } from '@/store/modules/position/types'
 import type { ValidationResponse } from '@/store/plugins/storeSync/validation'
 
 import usePositionStore from '@/store/modules/position'
@@ -12,15 +13,14 @@ import UrlParamConfig, {
     STORE_DISPATCHER_ROUTER_PLUGIN,
 } from '@/store/plugins/storeSync/UrlParamConfig.class'
 import { getDefaultValidationResponse } from '@/store/plugins/storeSync/validation'
-import { isEnumValue } from '@/utils/utils'
 
 interface ParsedCrosshair {
-    crossHair?: CrossHairs
+    crossHair?: CrossHair
     crossHairPosition?: SingleCoordinate
 }
 
 function parseCrosshairParam(urlParamValue?: string): ParsedCrosshair {
-    let crossHair: CrossHairs | undefined
+    let crossHair: CrossHair | undefined
     let crossHairPosition: SingleCoordinate | undefined
 
     if (urlParamValue) {
@@ -42,14 +42,14 @@ function parseCrosshairParam(urlParamValue?: string): ParsedCrosshair {
 function setValuesInStore(to: RouteLocationNormalizedGeneric, urlParamValue?: string) {
     const positionStore = usePositionStore()
 
-    let crossHair: CrossHairs | undefined
+    let crossHair: CrossHair | undefined
     let crossHairPosition: [number, number] | undefined
 
     if (typeof urlParamValue === 'string') {
         const parsedValue = parseCrosshairParam(urlParamValue)
 
         if (parsedValue.crossHair || parsedValue.crossHairPosition) {
-            crossHair = parsedValue.crossHair ?? CrossHairs.Marker
+            crossHair = parsedValue.crossHair ?? 'marker'
             crossHairPosition = parsedValue.crossHairPosition
         }
     }
@@ -83,24 +83,12 @@ function extractValueFromStore(): string | undefined {
     return
 }
 
-function parseCrossHairValue(crosshair?: string): CrossHairs | undefined {
+function parseCrossHairValue(crosshair?: string): CrossHair | undefined {
     if (!crosshair) {
         return undefined
     }
-    if (isEnumValue<CrossHairs>(CrossHairs.Bowl, crosshair)) {
-        return CrossHairs.Bowl
-    }
-    if (isEnumValue<CrossHairs>(CrossHairs.Circle, crosshair)) {
-        return CrossHairs.Circle
-    }
-    if (isEnumValue<CrossHairs>(CrossHairs.Cross, crosshair)) {
-        return CrossHairs.Cross
-    }
-    if (isEnumValue<CrossHairs>(CrossHairs.Marker, crosshair)) {
-        return CrossHairs.Marker
-    }
-    if (isEnumValue<CrossHairs>(CrossHairs.Point, crosshair)) {
-        return CrossHairs.Point
+    if (CrossHairs.includes(crosshair as CrossHair)) {
+        return crosshair as CrossHair
     }
     return undefined
 }
diff --git a/packages/mapviewer/src/store/plugins/storeSync/params/featureInfo.param.ts b/packages/mapviewer/src/store/plugins/storeSync/params/featureInfo.param.ts
index 50385f6e88..3f8c619d26 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/params/featureInfo.param.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/params/featureInfo.param.ts
@@ -1,6 +1,6 @@
 import type { RouteLocationNormalizedGeneric } from 'vue-router'
 
-import type { FeatureInfoPositions } from '@/store/modules/ui/types'
+import type { FeatureInfoPosition } from '@/store/modules/ui/types'
 
 import useUIStore from '@/store/modules/ui'
 import UrlParamConfig, {
@@ -8,7 +8,7 @@ import UrlParamConfig, {
 } from '@/store/plugins/storeSync/UrlParamConfig.class'
 import { getDefaultValidationResponse } from '@/store/plugins/storeSync/validation'
 
-function parseFeatureInfoPosition(urlParamValue?: string): FeatureInfoPositions | undefined {
+function parseFeatureInfoPosition(urlParamValue?: string): FeatureInfoPosition | undefined {
     if (!urlParamValue) {
         return undefined
     }
diff --git a/packages/mapviewer/src/store/plugins/storeSync/params/layers.param.ts b/packages/mapviewer/src/store/plugins/storeSync/params/layers.param.ts
index 2df655917f..86b25ccf6e 100644
--- a/packages/mapviewer/src/store/plugins/storeSync/params/layers.param.ts
+++ b/packages/mapviewer/src/store/plugins/storeSync/params/layers.param.ts
@@ -9,21 +9,23 @@ import type {
     KMLLayer,
     Layer,
 } from '@swissgeo/layers'
-import type { RouteLocationNormalizedGeneric, RouteLocation } from 'vue-router'
+import type { RouteLocation, RouteLocationNormalizedGeneric } from 'vue-router'
 
-import { featuresAPI } from '@swissgeo/api'
+import { featuresAPI, filesAPI } from '@swissgeo/api'
 import { extentUtils } from '@swissgeo/coordinates'
-import { DEFAULT_OPACITY, LayerType } from '@swissgeo/layers'
-import { layerUtils, timeConfigUtils, geoJsonUtils } from '@swissgeo/layers/utils'
+import { DEFAULT_OPACITY } from '@swissgeo/layers'
+import { geoJsonUtils, layerUtils, timeConfigUtils } from '@swissgeo/layers/utils'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { ErrorMessage, WarningMessage } from '@swissgeo/log/Message'
 
 import type { ValidationResponse } from '@/store/plugins/storeSync/validation'
 
+import { ENVIRONMENT } from '@/config'
 import useDrawingStore from '@/store/modules/drawing'
 import useFeaturesStore from '@/store/modules/features'
 import useI18nStore from '@/store/modules/i18n'
 import useLayersStore from '@/store/modules/layers'
+import loadKmlKmzData from '@/store/modules/layers/utils/loadKmlKmzData'
 import usePositionStore from '@/store/modules/position'
 import useUIStore from '@/store/modules/ui'
 import {
@@ -40,7 +42,7 @@ function createWMTSLayerObject(parsedLayer: Partial<Layer>): ExternalWMTSLayer {
     const { year } = parsedLayer.customAttributes ?? {}
 
     return layerUtils.makeExternalWMTSLayer({
-        type: LayerType.WMTS,
+        type: 'WMTS',
         id: parsedLayer.id,
         name: parsedLayer.id,
         opacity: parsedLayer.opacity,
@@ -110,7 +112,7 @@ export function createLayerObject(parsedLayer: Partial<Layer>, currentLayer?: La
 
     let layer: Layer | undefined
 
-    if (currentLayer && (currentLayer.isExternal || currentLayer.type === LayerType.KML)) {
+    if (currentLayer && (currentLayer.isExternal || currentLayer.type === 'KML')) {
         // the layer is already present in the active layers, so simply update it instead of
         // replacing it. This avoids reloading the data of the layer (e.g. KML name, external
         // layer display name) when using the browser history navigation.
@@ -119,10 +121,10 @@ export function createLayerObject(parsedLayer: Partial<Layer>, currentLayer?: La
         // external layer have a default opacity of 1.0
         layer.opacity = parsedLayer.opacity ?? DEFAULT_OPACITY
 
-        if (adminId && layer.type === LayerType.KML) {
+        if (adminId && layer.type === 'KML') {
             ;(layer as KMLLayer).adminId = adminId
         }
-    } else if (parsedLayer.type === LayerType.KML) {
+    } else if (parsedLayer.type === 'KML') {
         // format is KML|FILE_URL
         if (parsedLayer.baseUrl?.startsWith('http')) {
             layer = createKmlLayer(parsedLayer, adminId)
@@ -131,22 +133,22 @@ export function createLayerObject(parsedLayer: Partial<Layer>, currentLayer?: La
             // to the layer list upon start as we cannot load it anymore.
         }
         // format is GPX|FILE_URL
-    } else if (parsedLayer.type === LayerType.GPX) {
+    } else if (parsedLayer.type === 'GPX') {
         if (parsedLayer.baseUrl?.startsWith('http')) {
             layer = createGPGXLayer(parsedLayer)
         } else {
             // we can't re-load GPX files loaded through a file import; this GPX file is ignored
         }
-    } else if (parsedLayer.type === LayerType.COG) {
+    } else if (parsedLayer.type === 'COG') {
         // format is GEOTIFF|FILE_URL
         if (parsedLayer.baseUrl?.startsWith('http')) {
             layer = createCloudOptimizedGeoTIFFLayer(parsedLayer)
         }
         // format is WMTS|GET_CAPABILITIES_URL|LAYER_ID
-    } else if (parsedLayer.type === LayerType.WMTS) {
+    } else if (parsedLayer.type === 'WMTS') {
         layer = createWMTSLayerObject(parsedLayer)
         // format is : WMS|BASE_URL|LAYER_ID
-    } else if (parsedLayer.type === LayerType.WMS) {
+    } else if (parsedLayer.type === 'WMS') {
         layer = createWMSLayerObject(parsedLayer)
     } else if (parsedLayer.id) {
         const matchingLayer = layersStore.getLayerConfigById(parsedLayer.id)
@@ -166,7 +168,7 @@ export function createLayerObject(parsedLayer: Partial<Layer>, currentLayer?: La
             }
 
             // If we have a WMS layer add extra params from custom attributes
-            if (layer.type === LayerType.WMS) {
+            if (layer.type === 'WMS') {
                 layer.customAttributes = customAttributes
             }
         }
@@ -178,7 +180,7 @@ export function createLayerObject(parsedLayer: Partial<Layer>, currentLayer?: La
     if (layer && !layer.isExternal) {
         const internalLayer = layer as GeoAdminLayer
 
-        if (internalLayer.type === LayerType.GEOJSON && updateDelay !== undefined) {
+        if (internalLayer.type === 'GEOJSON' && updateDelay !== undefined) {
             ;(internalLayer as GeoAdminGeoJSONLayer).updateDelay = updateDelay
         }
 
@@ -255,14 +257,25 @@ function dispatchLayersFromUrlIntoStore(
             }
 
             if (layerObject) {
-                if (layerObject.type === LayerType.KML && (layerObject as KMLLayer).adminId) {
-                    drawingStore.toggleDrawingOverlay(
-                        {
-                            show: true,
-                        },
-                        STORE_DISPATCHER_ROUTER_PLUGIN
-                    )
-                    drawingStore.setIsVisitWithAdminId(true, STORE_DISPATCHER_ROUTER_PLUGIN)
+                if (layerObject.type === 'KML' && (layerObject as KMLLayer).adminId) {
+                    drawingStore
+                        .initiateDrawing(
+                            {
+                                online: true,
+                                preExistingDrawing: layerObject as KMLLayer,
+                            },
+                            STORE_DISPATCHER_ROUTER_PLUGIN
+                        )
+                        .catch((error) => {
+                            log.error({
+                                title: 'Layers URL param / dispatchLayersFromUrlIntoStore',
+                                titleColor: LogPreDefinedColor.Red,
+                                messages: [
+                                    `Failed to initiate drawing for KML layer ${parsedLayer.id}`,
+                                    error,
+                                ],
+                            })
+                        })
                 }
                 log.debug({
                     title: 'Layers URL param / dispatchLayersFromUrlIntoStore',
diff --git a/packages/mapviewer/src/utils/__tests__/utils.spec.ts b/packages/mapviewer/src/utils/__tests__/utils.spec.ts
index 0e9a26b966..1b15c9c473 100644
--- a/packages/mapviewer/src/utils/__tests__/utils.spec.ts
+++ b/packages/mapviewer/src/utils/__tests__/utils.spec.ts
@@ -5,7 +5,6 @@ import {
     formatPointCoordinates,
     getLongestCommonPrefix,
     humanFileSize,
-    isEnumValue,
     parseUrlHashQuery,
     transformUrlMapToEmbed,
 } from '@/utils/utils'
@@ -150,30 +149,4 @@ describe('utils', () => {
             expect(getLongestCommonPrefix(urls)).to.equal('https://example.com/path')
         })
     })
-
-    describe('isEnumValue', () => {
-        enum TestEnum {
-            // eslint-disable-next-line no-unused-vars
-            Value1 = 'value1',
-            // eslint-disable-next-line no-unused-vars
-            Value2 = 'value2',
-            // eslint-disable-next-line no-unused-vars
-            Value3 = 'something-else',
-        }
-        it('returns false if the value if a specific enum value is matched', () => {
-            expect(isEnumValue<TestEnum>(TestEnum.Value1, 'value1')).to.be.true
-            expect(isEnumValue<TestEnum>(TestEnum.Value2, 'value2')).to.be.true
-            expect(isEnumValue<TestEnum>(TestEnum.Value3, 'something-else')).to.be.true
-        })
-        it('returns false if there is a mismatch between the specific enum value and the candidate (even if it belongs to the enum)', () => {
-            expect(isEnumValue<TestEnum>(TestEnum.Value2, 'value1')).to.be.false
-            expect(isEnumValue<TestEnum>(TestEnum.Value3, 'value1')).to.be.false
-
-            expect(isEnumValue<TestEnum>(TestEnum.Value1, 'value2')).to.be.false
-            expect(isEnumValue<TestEnum>(TestEnum.Value3, 'value2')).to.be.false
-
-            expect(isEnumValue<TestEnum>(TestEnum.Value1, 'something-else')).to.be.false
-            expect(isEnumValue<TestEnum>(TestEnum.Value2, 'something-else')).to.be.false
-        })
-    })
 })
diff --git a/packages/mapviewer/src/utils/layerUtils.ts b/packages/mapviewer/src/utils/layerUtils.ts
index 13e20d02da..aa5941a7df 100644
--- a/packages/mapviewer/src/utils/layerUtils.ts
+++ b/packages/mapviewer/src/utils/layerUtils.ts
@@ -5,7 +5,6 @@ import type { Feature } from 'ol'
 import type { FeatureLike } from 'ol/Feature'
 import type { GeoJSONGeometry } from 'ol/format/GeoJSON'
 
-import { LayerType } from '@swissgeo/layers'
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 import { randomIntBetween } from '@swissgeo/numbers'
 import { centroid } from '@turf/turf'
@@ -78,6 +77,6 @@ export function createLayerFeature(
         coordinates: featureCoordinates,
         geometry: geometryToReturn,
         extent: olFeatureGeometry.getExtent() as FlatExtent,
-        popupDataCanBeTrusted: !layer.isExternal && layer.type !== LayerType.KML,
+        popupDataCanBeTrusted: !layer.isExternal && layer.type !== 'KML',
     }
 }
diff --git a/packages/mapviewer/src/utils/utils.ts b/packages/mapviewer/src/utils/utils.ts
index 67299b5ac3..70111d6c88 100644
--- a/packages/mapviewer/src/utils/utils.ts
+++ b/packages/mapviewer/src/utils/utils.ts
@@ -376,31 +376,3 @@ export function getSafe<T>(obj: unknown, prop: string): T | undefined {
     const dict = asDict(obj)
     return isKeyOf(obj, prop) ? (dict[prop] as T) : undefined
 }
-
-/** Check if a candidate string matches a specific enum value */
-export function isEnumValue<E>(enumValue: E[keyof E], candidate: string): boolean {
-    // For string enums, compare as string
-    if (typeof enumValue === 'string') {
-        return enumValue === candidate
-    }
-    // For numeric enums, the candidate must be a number-like string and match the numeric value
-    if (typeof enumValue === 'number') {
-        return Number(candidate) === enumValue
-    }
-    return false
-}
-
-/** Check if a candidate string matches any value in an enum */
-export function isAnyEnumValue<E>(enumType: Record<string, E>, candidate: string): boolean {
-    return Object.values(enumType).some((enumValue) => {
-        // For string enums, compare as string
-        if (typeof enumValue === 'string') {
-            return enumValue === candidate
-        }
-        // For numeric enums, the candidate must be a number-like string and match the numeric value
-        if (typeof enumValue === 'number') {
-            return Number(candidate) === enumValue
-        }
-        return false
-    })
-}
diff --git a/packages/mapviewer/src/views/MapView.vue b/packages/mapviewer/src/views/MapView.vue
index 21dc644da2..e8eae6cc3b 100644
--- a/packages/mapviewer/src/views/MapView.vue
+++ b/packages/mapviewer/src/views/MapView.vue
@@ -17,7 +17,6 @@ import MenuModule from '@/modules/menu/MenuModule.vue'
 import useCesiumStore from '@/store/modules/cesium'
 import useDrawingStore from '@/store/modules/drawing'
 import useUIStore from '@/store/modules/ui'
-import { UIModes } from '@/store/modules/ui/types'
 import AppVersion from '@/utils/components/AppVersion.vue'
 import DragDropOverlay from '@/utils/components/DragDropOverlay.vue'
 import LoadingBar from '@/utils/components/LoadingBar.vue'
@@ -29,41 +28,34 @@ const cesiumStore = useCesiumStore()
 const uiStore = useUIStore()
 const drawingStore = useDrawingStore()
 
-const is3DActive = computed(() => cesiumStore.active)
-const isDrawingMode = computed(() => drawingStore.overlay.show)
-const isPhoneMode = computed(() => uiStore.mode === UIModes.Phone)
-const showLoadingBar = computed(() => uiStore.showLoadingBar)
-const showDragAndDropOverlay = computed(() => uiStore.showDragAndDropOverlay)
-const loadDrawingModule = computed(() => {
-    return isDrawingMode.value && !is3DActive.value
-})
+const loadDrawingModule = computed<boolean>(() => drawingStore.overlay.show && !cesiumStore.active)
 </script>
 
 <template>
     <div class="view no-print">
-        <LoadingBar v-show="showLoadingBar" />
+        <LoadingBar v-show="uiStore.showLoadingBar" />
         <MapModule>
             <MenuModule />
             <MapToolbox
                 geoloc-button
-                :full-screen-button="!isDrawingMode"
-                :toggle3d-button="!isDrawingMode"
+                :full-screen-button="!drawingStore.overlay.show"
+                :toggle3d-button="!drawingStore.overlay.show"
                 compass-button
             >
-                <TimeSliderButton v-if="!is3DActive" />
+                <TimeSliderButton v-if="!cesiumStore.active" />
             </MapToolbox>
             <!-- we place the drawing module here so that it can receive the OpenLayers map instance through provide/inject -->
             <DrawingModule v-if="loadDrawingModule" />
             <template #footer>
                 <MapFooter>
                     <template
-                        v-if="isPhoneMode"
+                        v-if="uiStore.isPhoneMode"
                         #top-left
                     >
                         <div class="d-flex flex-column align-items-start">
                             <BackgroundSelector class="background-selector p-2" />
                             <OpenLayersScale
-                                v-if="!is3DActive"
+                                v-if="!cesiumStore.active"
                                 class="p-1"
                             />
                         </div>
@@ -71,7 +63,7 @@ const loadDrawingModule = computed(() => {
                     <template #top-right>
                         <div class="d-flex flex-column align-items-end">
                             <BackgroundSelector
-                                v-if="!isPhoneMode"
+                                v-if="!uiStore.isPhoneMode"
                                 class="background-selector p-2"
                             />
                             <MapFooterAttributionList class="rounded-top-2 rounded-end-0" />
@@ -81,19 +73,19 @@ const loadDrawingModule = computed(() => {
                         <InfoboxModule />
                     </template>
                     <template
-                        v-if="!isPhoneMode"
+                        v-if="!uiStore.isPhoneMode"
                         #bottom-left
                     >
-                        <template v-if="!is3DActive">
+                        <template v-if="!cesiumStore.active">
                             <OpenLayersScale />
                             <OpenLayersMouseTracker />
                         </template>
-                        <template v-if="is3DActive">
+                        <template v-if="cesiumStore.active">
                             <CesiumMouseTracker />
                         </template>
                     </template>
                     <template
-                        v-if="!isPhoneMode"
+                        v-if="!uiStore.isPhoneMode"
                         #bottom-right
                     >
                         <AppVersion />
@@ -103,7 +95,7 @@ const loadDrawingModule = computed(() => {
                 </MapFooter>
             </template>
         </MapModule>
-        <DragDropOverlay v-if="showDragAndDropOverlay" />
+        <DragDropOverlay v-if="uiStore.showDragAndDropOverlay" />
     </div>
 </template>
 
diff --git a/packages/mapviewer/tests/cypress/support/drawing.ts b/packages/mapviewer/tests/cypress/support/drawing.ts
index fbe89d1455..e2c066aa80 100644
--- a/packages/mapviewer/tests/cypress/support/drawing.ts
+++ b/packages/mapviewer/tests/cypress/support/drawing.ts
@@ -21,12 +21,18 @@ function transformHeaders(headers: { [key: string]: string | string[] }): Header
 }
 
 export function addIconFixtureAndIntercept(): void {
-    cy.intercept(`**/api/icons/sets/default/icons/**${featureStyleUtils.generateRGBFillString(featureStyleUtils.RED)}.png`, {
-        fixture: 'service-icons/placeholder.png',
-    }).as('icon-default')
-    cy.intercept(`**/api/icons/sets/default/icons/**${featureStyleUtils.generateRGBFillString(featureStyleUtils.GREEN)}.png`, {
-        fixture: 'service-icons/placeholder.png',
-    }).as('icon-default-green')
+    cy.intercept(
+        `**/api/icons/sets/default/icons/**${featureStyleUtils.generateRGBFillString(featureStyleUtils.RED)}.png`,
+        {
+            fixture: 'service-icons/placeholder.png',
+        }
+    ).as('icon-default')
+    cy.intercept(
+        `**/api/icons/sets/default/icons/**${featureStyleUtils.generateRGBFillString(featureStyleUtils.GREEN)}.png`,
+        {
+            fixture: 'service-icons/placeholder.png',
+        }
+    ).as('icon-default-green')
     cy.intercept(`**/api/icons/sets/babs/icons/*@*.png`, {
         fixture: 'service-icons/placeholder.png',
     }).as('icon-babs')
@@ -52,7 +58,9 @@ function addProfileFixtureAndIntercept(): void {
     }).as('profileAsCsv')
 }
 
-async function handlePostKmlRequest(req: CyHttpMessages.IncomingHttpRequest): Promise<string | FormData | undefined> {
+async function handlePostKmlRequest(
+    req: CyHttpMessages.IncomingHttpRequest
+): Promise<string | FormData | undefined> {
     try {
         return await getKmlFromRequest(req)
     } catch (error) {
@@ -266,17 +274,15 @@ Cypress.Commands.add('goToDrawing', (queryParams = {}, withHash = true) => {
         const drawingStore = useDrawingStore(pinia)
         expect(drawingStore.overlay.show).to.be.true
     })
-    cy.waitUntilState((pinia) => {
-        const drawingStore = useDrawingStore(pinia)
-        return drawingStore.iconSets.length > 0
-    })
+    // it should load all icon sets as soon as we enter the drawing module
+    cy.wait('@icon-sets')
+    cy.wait('@icon-set-default')
 })
 
 Cypress.Commands.add('openDrawingMode', () => {
     cy.openMenuIfMobile()
     cy.get('[data-cy="menu-tray-drawing-section"]:visible').click()
-    // Make sure that the map pointer events are unregistered to avoid interference with drawing
-    // pointer events
+    // Make sure that the map pointer events are unregistered to avoid interference with drawing pointer events
     cy.window().its('mapPointerEventReady').should('be.false')
 })
 
@@ -286,8 +292,8 @@ Cypress.Commands.add('closeDrawingMode', (closeDrawingNotSharedAdmin = true) =>
     if (closeDrawingNotSharedAdmin) {
         // Close the drawing not shared admin modal if it is open
         cy.get('body').then(($body) => {
-            if ($body.find('[data-cy="drawing-share-admin-close"]').length > 0) {
-                cy.get('[data-cy="drawing-share-admin-close"]').click()
+            if ($body.find('[data-cy="drawing-not-shared-admin-warning"]').length > 0) {
+                cy.get('[data-cy="modal-confirm-button"]').click()
             }
         })
         cy.waitUntilState((pinia) => {
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.ts
index ef85e8be36..540933c68b 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.ts
@@ -3,7 +3,6 @@ import { registerProj4, WEBMERCATOR, WGS84 } from '@swissgeo/coordinates'
 import proj4 from 'proj4'
 
 import useMapStore from '@/store/modules/map'
-import { ClickType } from '@/store/modules/map/types'
 
 registerProj4(proj4)
 
@@ -27,7 +26,7 @@ describe('Testing click', () => {
             const mapStore = useMapStore(pinia)
             const clickInfo = mapStore.clickInfo
             expect(clickInfo?.clickType).to.equal(
-                ClickType.LeftSingleClick,
+                'LEFT_SINGLE_CLICK',
                 'Click type is correctly detected'
             )
 
@@ -45,7 +44,6 @@ describe('Testing click', () => {
             )
         })
 
-
         // since switching to fake tileset and tiles for testing
         // these tests here do not functioning properly, they are commented until we find
         // a way to give fake tile that Cesium can "pick" (ray trace) with again
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.ts
index fd7d5cf354..ef022c8c1f 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.ts
@@ -4,7 +4,6 @@ import { changeUrlParam } from 'support/utils'
 
 import { DEFAULT_PROJECTION } from '@/config'
 import usePositionStore from '@/store/modules/position'
-import { CrossHairs } from '@/store/modules/position/types'
 
 describe('Testing the crosshair URL param', () => {
     context('At app startup', () => {
@@ -17,10 +16,10 @@ describe('Testing the crosshair URL param', () => {
             })
         })
         it('adds the crosshair at the center of the map if only the crosshair param is given', () => {
-            cy.goToMapView({ queryParams: { crosshair: CrossHairs.Point } })
+            cy.goToMapView({ queryParams: { crosshair: 'point' } })
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                expect(positionStore.crossHair).to.eq(CrossHairs.Point)
+                expect(positionStore.crossHair).to.eq('point')
                 expect(positionStore.crossHairPosition).to.eql(positionStore.center)
             })
         })
@@ -29,33 +28,33 @@ describe('Testing the crosshair URL param', () => {
                 (value: number) => value + 1000
             )
             cy.goToMapView({
-                queryParams: { crosshair: `${CrossHairs.Bowl},${crossHairPosition.join(',')}` },
+                queryParams: { crosshair: `${'bowl'},${crossHairPosition.join(',')}` },
             })
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                expect(positionStore.crossHair).to.eq(CrossHairs.Bowl)
+                expect(positionStore.crossHair).to.eq('bowl')
                 expect(positionStore.crossHairPosition).to.eql(crossHairPosition)
             })
         })
     })
     context('Changes of URL param value while the app has been loaded', () => {
         it('Changes the crosshair types correctly if changed after app load', () => {
-            cy.goToMapView({ queryParams: { crosshair: CrossHairs.Point } })
+            cy.goToMapView({ queryParams: { crosshair: 'point' } })
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                cy.wrap(positionStore.crossHair).should('eq', CrossHairs.Point)
+                cy.wrap(positionStore.crossHair).should('eq', 'point')
             })
-            changeUrlParam('crosshair', CrossHairs.Marker)
+            changeUrlParam('crosshair', 'marker')
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                cy.wrap(positionStore.crossHair).should('eq', CrossHairs.Marker)
+                cy.wrap(positionStore.crossHair).should('eq', 'marker')
             })
         })
         it('Changes the crosshair position if set after app reload', () => {
-            cy.goToMapView({ queryParams: { crosshair: CrossHairs.Cross } })
+            cy.goToMapView({ queryParams: { crosshair: 'cross' } })
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                expect(positionStore.crossHair).to.eq(CrossHairs.Cross)
+                expect(positionStore.crossHair).to.eq('cross')
                 expect(positionStore.crossHairPosition).to.eql(positionStore.center)
             })
 
@@ -64,21 +63,21 @@ describe('Testing the crosshair URL param', () => {
             )
             changeUrlParam(
                 'crosshair',
-                `${CrossHairs.Cross},${newCrossHairPosition.join(',')}`,
+                `${'cross'},${newCrossHairPosition.join(',')}`,
                 // a change of the crosshair param with position triggers two dispatches: setCrossHair and setCrossHairPosition
                 2
             )
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                expect(positionStore.crossHair).to.eq(CrossHairs.Cross)
+                expect(positionStore.crossHair).to.eq('cross')
                 expect(positionStore.crossHairPosition).to.eql(newCrossHairPosition)
             })
         })
         it('removes the crosshair if the URL param is removed (or set to undefined)', () => {
-            cy.goToMapView({ queryParams: { crosshair: CrossHairs.Circle } })
+            cy.goToMapView({ queryParams: { crosshair: 'circle' } })
             cy.getPinia().then((pinia) => {
                 const positionStore = usePositionStore(pinia)
-                expect(positionStore.crossHair).to.eq(CrossHairs.Circle)
+                expect(positionStore.crossHair).to.eq('circle')
                 expect(positionStore.crossHairPosition).to.eql(positionStore.center)
             })
             changeUrlParam('crosshair', undefined, 2)
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.ts
index 28d1f94fff..739602f5aa 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.ts
@@ -9,7 +9,6 @@ import type { Pinia } from 'pinia'
 
 import { featureStyleUtils, kmlUtils } from '@swissgeo/api/utils'
 import { registerProj4, WGS84 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { randomIntBetween } from '@swissgeo/numbers'
 import { getServiceKmlBaseUrl } from '@swissgeo/staging-config'
 import { recurse } from 'cypress-recurse'
@@ -22,10 +21,11 @@ import {
     kmlMetadataTemplate,
 } from 'support/drawing'
 
-import { DEFAULT_PROJECTION } from '@/config'
+import { DEFAULT_PROJECTION, ENVIRONMENT } from '@/config'
 import useDrawingStore from '@/store/modules/drawing'
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
+import useUIStore from '@/store/modules/ui'
 
 registerProj4(proj4)
 
@@ -79,7 +79,6 @@ describe('Drawing module tests', () => {
                     )
                 )
         }
-
         function addDescription(description: string): void {
             cy.get('[data-cy="drawing-style-feature-description"]').type(description)
             cy.get('[data-cy="drawing-style-feature-description"]').should(
@@ -87,57 +86,19 @@ describe('Drawing module tests', () => {
                 description
             )
             cy.wait('@update-kml').then(() => {
-                cy.getPinia().then((pinia) => {
+                cy.getPinia().should((pinia) => {
                     const featuresStore = useFeaturesStore(pinia)
                     expect(featuresStore.selectedFeatures[0]?.description).to.eq(description)
                 })
             })
         }
-
-        // we use the description to identify the feature and check its
-        // geometry type, number of points and type (measure or linepolygon)
-        function checkDrawnFeature(
-            description: string,
-            numberOfPoints: number,
-            featureType: string,
-            type: EditableFeatureTypes
-        ): void {
-            cy.window()
-                .its('drawingLayer')
-                .then((drawingLayer) => drawingLayer.getSource().getFeatures())
-                .should((features) => {
-                    const matchingFeature = features.find(
-                        (feature: Feature) => feature.get('description') === description
-                    )
-                    expect(matchingFeature).to.not.be.undefined
-                    expect(matchingFeature.getGeometry().getType()).to.eq(featureType)
-                    expect(matchingFeature.get('editableFeature')?.featureType).to.eq(
-                        type.toLowerCase()
-                    )
-                    if (featureType === 'LineString') {
-                        const lineStringCoordinates = matchingFeature.getGeometry().getCoordinates()
-                        expect(lineStringCoordinates).to.be.an('Array').lengthOf(numberOfPoints)
-                    } else if (featureType === 'Polygon') {
-                        const polygonCoordinates = matchingFeature.getGeometry().getCoordinates()
-                        expect(polygonCoordinates).to.be.an('Array').lengthOf(1)
-                        expect(polygonCoordinates[0]).to.be.an('Array').lengthOf(numberOfPoints)
-                    }
-                })
-        }
-
-        beforeEach(() => {
-            cy.goToDrawing()
-        })
         it('can create marker/icons and edit them', () => {
-            // it should load all icon sets as soon as we enter the drawing module
-            cy.wait('@icon-sets')
-            cy.wait('@icon-set-default')
-
+            cy.goToDrawing()
             cy.clickDrawingTool('MARKER')
             cy.get('[data-cy="ol-map"]:visible').click()
 
             cy.wait('@post-kml').then((interception) => {
-                const kmlUrl = `${getServiceKmlBaseUrl()}api/kml/files/${interception.response?.body.id}`
+                const kmlUrl = `${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${interception.response?.body.id}`
                 const bgLayer = 'test.background.layer2'
 
                 cy.log(
@@ -250,7 +211,7 @@ describe('Drawing module tests', () => {
                 cy.log('Test text placement and offset')
                 cy.get('[data-cy="drawing-style-text-button"]').click()
                 cy.get('[data-cy="drawing-style-placement-selector-top-left"]').click()
-                cy.getPinia().then((pinia) => {
+                cy.getPinia().should((pinia) => {
                     const drawingStore = useDrawingStore(pinia)
                     expect(drawingStore.feature.current?.textPlacement).to.eq('top-left')
                     const offset = drawingStore.feature.current?.textOffset
@@ -279,12 +240,9 @@ describe('Drawing module tests', () => {
                     description
                 )
                 waitForKmlUpdate(`<description>${description}</description>`)
-                cy.getPinia().then((pinia) => {
-                    const featuresStore2 = useFeaturesStore(pinia)
-                    cy.wrap(featuresStore2.selectedFeatures[0]?.description).should(
-                        'eq',
-                        description
-                    )
+                cy.getPinia().should((pinia) => {
+                    const featuresStore = useFeaturesStore(pinia)
+                    expect(featuresStore.selectedFeatures[0]?.description).to.eq(description)
                 })
 
                 cy.log('Can generate and display media links')
@@ -486,6 +444,7 @@ describe('Drawing module tests', () => {
             })
         })
         it('can create annotation/text and edit them', () => {
+            cy.goToDrawing()
             cy.clickDrawingTool('ANNOTATION')
             cy.get('[data-cy="ol-map"]').click()
             cy.wait('@post-kml')
@@ -569,7 +528,46 @@ describe('Drawing module tests', () => {
             readCoordinateClipboard('feature-detail-coordinate-copy', "2'660'013.50, 1'185'172.00")
         })
         it('can create line / measurement, extend it, and delete the last node by right click / button, and make a polygon', () => {
+            // we use the description to identify the feature and check its
+            // geometry type, number of points and type (measure or linepolygon)
+            function checkDrawnFeature(
+                description: string,
+                numberOfPoints: number,
+                featureType: string,
+                type: EditableFeatureTypes
+            ): void {
+                cy.window()
+                    .its('drawingLayer')
+                    .then((drawingLayer) => drawingLayer.getSource().getFeatures())
+                    .should((features) => {
+                        const matchingFeature = features.find(
+                            (feature: Feature) => feature.get('description') === description
+                        )
+                        expect(matchingFeature).to.not.be.undefined
+                        expect(matchingFeature.getGeometry().getType()).to.eq(featureType)
+                        expect(matchingFeature.get('editableFeature')?.featureType).to.eq(type)
+                        if (featureType === 'LineString') {
+                            const lineStringCoordinates = matchingFeature
+                                .getGeometry()
+                                .getCoordinates()
+                            expect(lineStringCoordinates).to.be.an('Array').lengthOf(numberOfPoints)
+                        } else if (featureType === 'Polygon') {
+                            const polygonCoordinates = matchingFeature
+                                .getGeometry()
+                                .getCoordinates()
+                            expect(polygonCoordinates).to.be.an('Array').lengthOf(1)
+                            expect(polygonCoordinates[0]).to.be.an('Array').lengthOf(numberOfPoints)
+                        }
+                    })
+            }
+
             cy.viewport(1920, 1080)
+            cy.goToDrawing()
+            cy.getPinia().should((pinia) => {
+                const uiStore = useUIStore(pinia)
+                expect(uiStore.isDesktopMode).to.be.true
+                expect(uiStore.showFeatureInfoInTooltip).to.be.true
+            })
             cy.clickDrawingTool('LINEPOLYGON')
 
             const lineCoordinates: SingleCoordinate[] = [
@@ -715,6 +713,9 @@ describe('Drawing module tests', () => {
             if (lastMeasurementCoordinate) {
                 cy.get('[data-cy="ol-map"]').click(...lastMeasurementCoordinate)
             }
+            cy.wait('@update-kml')
+
+            cy.log('changing the description of the second feature')
             const secondFeatureDescription = 'second feature'
             addDescription(secondFeatureDescription)
 
@@ -729,6 +730,7 @@ describe('Drawing module tests', () => {
             checkDrawnFeature(firstFeatureDescription, 9, 'Polygon', 'LINEPOLYGON')
         })
         it('can create line/polygons and edit them', () => {
+            cy.goToDrawing()
             cy.clickDrawingTool('LINEPOLYGON')
             cy.get('[data-cy="ol-map"]').click(100, 250)
             cy.get('[data-cy="ol-map"]').click(150, 250)
@@ -779,6 +781,7 @@ describe('Drawing module tests', () => {
             cy.log(
                 'Changing the color of the polygon and checking that the KMl was updated accordingly'
             )
+            cy.get('[data-cy="infobox-hide-profile-button"]').click()
             cy.get('[data-cy="drawing-style-line-button"]').click()
             cy.get(
                 `[data-cy="drawing-style-line-popup"] [data-cy="color-selector-${featureStyleUtils.BLACK.name}"]`
@@ -835,6 +838,7 @@ describe('Drawing module tests', () => {
             cy.get('[data-cy="ol-map"]').click(150, 360)
             cy.get('[data-cy="ol-map"]').click(150, 380)
             cy.get('[data-cy="ol-map"]').click(140, 360)
+            cy.get('[data-cy="infobox-hide-profile-button"]').click()
             cy.get('[data-cy="feature-area-information"]')
                 .should('be.visible')
                 .contains('9999.8 m2')
@@ -847,6 +851,7 @@ describe('Drawing module tests', () => {
             cy.get('[data-cy="ol-map"]').click(150, 300)
             cy.get('[data-cy="ol-map"]').click(200, 250)
 
+            cy.get('[data-cy="infobox-hide-profile-button"]').click()
             cy.get('[data-cy="feature-area-information"]')
                 .should('be.visible')
                 .contains('0.125 km2')
@@ -893,7 +898,7 @@ describe('Drawing module tests', () => {
             cy.clickDrawingTool('LINEPOLYGON')
             cy.get('[data-cy="ol-map"]').click(100, 250)
             cy.get('[data-cy="ol-map"]').click(150, 250)
-            cy.get('[data-cy="ol-map"]').click(150, 280)
+            cy.get('[data-cy="ol-map"]').dblclick(150, 280)
 
             let newKmlId: string | undefined
             cy.wait('@post-kml').then((interception) => {
@@ -921,7 +926,7 @@ describe('Drawing module tests', () => {
 
             cy.closeDrawingMode(false)
 
-            cy.log('check if clicking close that it opens the warning again')
+            cy.log('Checking that the warning popup is displayed')
             cy.get('[data-cy="drawing-not-shared-admin-warning"]')
                 .should('be.visible')
                 .contains(warningTitle)
@@ -934,9 +939,9 @@ describe('Drawing module tests', () => {
                 .contains(warningTitle)
 
             cy.log(
-                'check if clicking close that the drawing is still not saved but now the drawing mode is closed'
+                'Checking that the warning popup still shows up if the user did not copy the link after closing through the "close" button'
             )
-            cy.get('[data-cy="drawing-share-admin-close"]').click()
+            cy.get('[data-cy="modal-confirm-button"]').click()
 
             cy.get(
                 '[data-cy="menu-tray-drawing-section"] > [data-cy="menu-section-header"]'
@@ -948,7 +953,7 @@ describe('Drawing module tests', () => {
                 .should('be.visible')
                 .contains(warningTitle)
             cy.get('[data-cy="drawing-share-admin-link"]').click()
-            cy.get('[data-cy="drawing-share-admin-close"]').click()
+            cy.get('[data-cy="modal-confirm-button"]').click()
 
             cy.log(
                 'check that now that the drawing edit link is copied and the warning is not shown anymore'
@@ -973,14 +978,14 @@ describe('Drawing module tests', () => {
                 .should('be.visible')
                 .contains(warningTitle)
             cy.get('[data-cy="drawing-share-admin-link"]').click()
-            cy.get('[data-cy="drawing-share-admin-close"]').click()
+            cy.get('[data-cy="modal-confirm-button"]').click()
 
             cy.getPinia().then((pinia) => {
                 const layersStore = useLayersStore(pinia)
                 const layers = layersStore.activeLayers
                 expect(layers).to.be.an('Array').lengthOf(1)
                 const [drawingLayer] = layers
-                expect(drawingLayer?.type).to.eq(LayerType.KML)
+                expect(drawingLayer?.type).to.eq('KML')
                 expect(drawingLayer?.isVisible).to.be.true
             })
 
@@ -997,6 +1002,10 @@ describe('Drawing module tests', () => {
             cy.window().its('drawingLayer').should('not.exist')
         })
         it('keeps the KML after a page reload, and creates a copy if it is then edited', () => {
+            function getActiveLayerMenuItem(kmlFileId: string) {
+                return `[data-cy^="active-layer-name-KML|${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${kmlFileId}-"]`
+            }
+
             cy.goToDrawing()
             cy.log('Create a simple drawing with a marker')
             cy.clickDrawingTool('MARKER')
@@ -1009,16 +1018,11 @@ describe('Drawing module tests', () => {
                 cy.wait('@update-kml')
 
                 cy.log(`Check that the drawings has been added to the active layers: ${kmlId}`)
-                cy.get(
-                    `[data-cy^="active-layer-name-${getServiceKmlBaseUrl()}api/kml/files/${kmlId}-"]`
-                )
-                    .should('be.visible')
-                    .contains('Drawing')
+                cy.get(getActiveLayerMenuItem(kmlId)).should('be.visible').contains('Drawing')
                 cy.waitUntilState((pinia: Pinia) => {
                     const layersStore = useLayersStore(pinia)
                     return !!layersStore.activeLayers.find(
-                        (layer) =>
-                            layer.type === LayerType.KML && (layer as KMLLayer).fileId === kmlId
+                        (layer) => layer.type === 'KML' && (layer as KMLLayer).fileId === kmlId
                     )
                 })
 
@@ -1029,16 +1033,11 @@ describe('Drawing module tests', () => {
                 cy.openMenuIfMobile()
 
                 cy.log(`Check that the KML file ${kmlId} is present on the active layer list`)
-                cy.get(
-                    `[data-cy^="active-layer-name-${getServiceKmlBaseUrl()}api/kml/files/${kmlId}-"]`
-                )
-                    .should('be.visible')
-                    .contains('Drawing')
+                cy.get(getActiveLayerMenuItem(kmlId)).should('be.visible').contains('Drawing')
                 cy.waitUntilState((pinia: Pinia) => {
                     const layersStore = useLayersStore(pinia)
                     return !!layersStore.activeLayers.find(
-                        (layer) =>
-                            layer.type === LayerType.KML && (layer as KMLLayer).fileId === kmlId
+                        (layer) => layer.type === 'KML' && (layer as KMLLayer).fileId === kmlId
                     )
                 })
 
@@ -1046,18 +1045,15 @@ describe('Drawing module tests', () => {
                 // checking that the KML is correctly loaded in the drawing module, even though it doesn't carry an adminId
                 cy.get('[data-cy="menu-tray-drawing-section"]').should('be.visible').click()
 
-                // if closing the drawing module without changing anything, no copy must be made
                 cy.closeDrawingMode()
-                cy.get(
-                    `[data-cy^="active-layer-name-${getServiceKmlBaseUrl()}api/kml/files/${kmlId}-"]`
+                cy.log(
+                    'Checking that when closing the drawing module without changing anything, no copy must be made'
                 )
-                    .should('be.visible')
-                    .contains('Drawing')
-                cy.getPinia().then((pinia) => {
-                    const layersStore2 = useLayersStore(pinia)
-                    const activeKmlLayer = layersStore2.activeKmlLayer
-                    expect(activeKmlLayer).to.haveOwnProperty('fileId')
-                    expect(activeKmlLayer?.fileId).to.eq(kmlId)
+                cy.get(getActiveLayerMenuItem(kmlId)).should('be.visible').contains('Drawing')
+                cy.getPinia().should((pinia) => {
+                    const layersStore = useLayersStore(pinia)
+                    expect(layersStore.activeKmlLayer).to.not.be.undefined
+                    expect(layersStore.activeKmlLayer.fileId).to.eq(kmlId)
                 })
 
                 cy.log('Open again the drawing mode and edit the kml')
@@ -1082,8 +1078,8 @@ describe('Drawing module tests', () => {
                     // Add another feature and checking that we do not create subsequent copies (we now have the adminId for this KML)
                     cy.clickDrawingTool('ANNOTATION')
                     cy.get('[data-cy="ol-map"]').click('center')
-                    cy.wait('@post-kml').then((interception2) => {
-                        const newNewKmlId = interception2.response?.body?.id
+                    cy.wait('@update-kml').then((interception) => {
+                        const newNewKmlId = interception.response?.body?.id
 
                         cy.log('Check the active layer list making sure that there is only the new')
                         cy.closeDrawingMode()
@@ -1091,19 +1087,15 @@ describe('Drawing module tests', () => {
                         cy.log(
                             `Check that the old kml has been removed from the active layer and that the new one has been added`
                         )
-                        cy.get(
-                            `[data-cy^="active-layer-name-${getServiceKmlBaseUrl()}api/kml/files/${kmlId}-"]`
-                        ).should('not.exist')
-                        cy.get(
-                            `[data-cy^="active-layer-name-${getServiceKmlBaseUrl()}api/kml/files/${newNewKmlId}-"]`
-                        )
+                        cy.get(getActiveLayerMenuItem(kmlId)).should('not.exist')
+                        cy.get(getActiveLayerMenuItem(newNewKmlId))
                             .should('be.visible')
                             .contains('Drawing')
                     })
                 })
             })
         })
-        it('manages the KML layer correctly if it comes attached with an adminId at startup', () => {
+        it.only('manages the KML layer correctly if it comes attached with an adminId at startup', () => {
             // Position of the marker defined in service-kml/lonelyMarker.kml
             const markerLatitude = 46.883715999352546
             const markerLongitude = 7.656108679791837
@@ -1115,7 +1107,7 @@ describe('Drawing module tests', () => {
             // load map with an injected kml layer containing a text
             const kmlFileId = 'test-fileID12345678900'
             const kmlFileAdminId = 'test-fileAdminID12345678900'
-            const kmlFileUrl = `${getServiceKmlBaseUrl()}api/kml/files/${kmlFileId}`
+            const kmlFileUrl = `${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${kmlFileId}`
             const kmlUrlParam = `KML|${kmlFileUrl}@adminId=${kmlFileAdminId}`
 
             cy.log(
@@ -1127,13 +1119,13 @@ describe('Drawing module tests', () => {
             cy.log(
                 'the app must open the drawing module at startup whenever an adminId is found in the URL'
             )
-            cy.getPinia().then((pinia) => {
+            cy.getPinia().should((pinia) => {
                 const drawingStore = useDrawingStore(pinia)
                 expect(drawingStore.overlay.show).to.be.true
             })
 
             cy.log('checking that the KML was correctly loaded')
-            cy.getPinia().then((pinia) => {
+            cy.getPinia().should((pinia) => {
                 const featuresStore = useFeaturesStore(pinia)
                 expect(featuresStore.selectedFeatures.length).to.eq(0)
             })
@@ -1141,11 +1133,12 @@ describe('Drawing module tests', () => {
                 cy
                     .window()
                     .its('drawingLayer')
-                    .then((drawingLayer) => drawingLayer.getSource().getFeatures().length === 1)
+                    .then((drawingLayer) => drawingLayer.getSource().getFeatures())
+                    .should('have.length', 1)
             )
             cy.log('clicking on the single feature of the fixture')
             cy.get('[data-cy="ol-map"]').click('center')
-            cy.getPinia().then((pinia) => {
+            cy.getPinia().should((pinia) => {
                 const featuresStore = useFeaturesStore(pinia)
                 expect(featuresStore.selectedFeatures.length).to.eq(1)
             })
@@ -1161,7 +1154,7 @@ describe('Drawing module tests', () => {
             cy.log('checking that it updates the existing KML, and not creating a new copy of it')
             cy.wait('@update-kml').its('response.body.id').should('eq', kmlFileId)
         })
-        it('manages the KML layer correctly if it comes attached with an adminId at startup from a legacy URL', () => {
+        it.skip('manages the KML layer correctly if it comes attached with an adminId at startup from a legacy URL', () => {
             // Position of the marker defined in service-kml/legacy-mf-geoadmin3.kml
             const markerLatitude = 46.80250110087888
             const markerLongitude = 7.248686789953856
@@ -1173,8 +1166,8 @@ describe('Drawing module tests', () => {
             // load map with an injected kml layer containing a text
             const kmlFileId = 'test-fileID12345678900'
             const kmlFileAdminId = 'test-fileAdminID12345678900'
-            const kmlFileUrl = `${getServiceKmlBaseUrl()}api/kml/files/${kmlFileId}`
-            const kmlAdminUrl = `${getServiceKmlBaseUrl()}api/kml/admin/${kmlFileId}`
+            const kmlFileUrl = `${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${kmlFileId}`
+            const kmlAdminUrl = `${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/admin/${kmlFileId}`
             const kmlMetadata = {
                 admin_id: kmlFileAdminId,
                 author: 'mf-geoadmin3',
@@ -1287,7 +1280,7 @@ describe('Drawing module tests', () => {
             cy.log('checking that it updates the existing KML, and not creating a new copy of it')
             cy.wait('@update-kml').its('response.body.id').should('eq', kmlFileId)
         })
-        it('receives an empty KML and can use drawing mode', () => {
+        it.skip('receives an empty KML and can use drawing mode', () => {
             function verifyActiveKmlLayerEmptyWithError(): void {
                 cy.window()
                     .its('store.getters.activeKmlLayer')
@@ -1365,7 +1358,7 @@ describe('Drawing module tests', () => {
         })
     })
     context('others', () => {
-        it("doesn't save an empty drawing (if not modified)", () => {
+        it.skip("doesn't save an empty drawing (if not modified)", () => {
             cy.intercept('**/api/kml/admin**', (req) => {
                 expect(`Unexpected call to ${req.method} ${req.url}`).to.be.false
             }).as('post-put-kml-not-allowed')
@@ -1373,7 +1366,7 @@ describe('Drawing module tests', () => {
             cy.clickDrawingTool('MARKER')
             cy.closeDrawingMode()
         })
-        it('can export the drawing/profile in multiple formats', () => {
+        it.skip('can export the drawing/profile in multiple formats', () => {
             const downloadsFolder = Cypress.config('downloadsFolder')
             const checkFiles = (extension: string, callback: (_content: string) => void): void => {
                 recurse(
@@ -1492,12 +1485,14 @@ describe('Drawing module tests', () => {
             ).click()
             checkFiles('gpx', (content) => {
                 // 1 <trk> (track), for the single LINEPOLYGON
-                expect(content).to.match(/<gpx.*<trk>.*<trkseg>.*<trkpt.*<\/trkseg>.*<\/trk>.*<\/gpx>/)
+                expect(content).to.match(
+                    /<gpx.*<trk>.*<trkseg>.*<trkpt.*<\/trkseg>.*<\/trk>.*<\/gpx>/
+                )
             })
 
             cy.task('clearFolder', downloadsFolder)
         })
-        it('generates short links when sharing a drawing', () => {
+        it.skip('generates short links when sharing a drawing', () => {
             const publicShortlink = 'https://s.geo.admin.ch/public-shortlink'
             const adminshortlink = 'https://s.geo.admin.ch/admin-shortlink'
 
@@ -1569,7 +1564,7 @@ describe('Drawing module tests', () => {
             )
             cy.readClipboardValue().should((clipboardText) => {
                 expect(clipboardText).to.contain(
-                    `KML%7C${getServiceKmlBaseUrl()}api/kml/files/${kmlId}`
+                    `KML%7C${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${kmlId}`
                 )
                 expect(clipboardText).to.not.contain(`@adminId`)
             })
@@ -1578,12 +1573,12 @@ describe('Drawing module tests', () => {
             cy.get('[data-cy="drawing-share-admin-link"]').realClick()
             cy.readClipboardValue().should((clipboardText) => {
                 expect(clipboardText).to.contain(
-                    `KML%7C${getServiceKmlBaseUrl()}api/kml/files/${kmlId}`
+                    `KML%7C${getServiceKmlBaseUrl(ENVIRONMENT)}api/kml/files/${kmlId}`
                 )
                 expect(clipboardText).to.contain(`@adminId=${adminId}`)
             })
         })
-        it('shows a profile of a line/measure coming from service-alti data', () => {
+        it.skip('shows a profile of a line/measure coming from service-alti data', () => {
             const profileIntercept = '**/rest/services/profile.json**'
 
             // as we want to edit the measure line while having the profile shown up, we need a bit of vertical space
@@ -1691,7 +1686,7 @@ describe('Drawing module tests', () => {
             cy.get('[data-cy="infobox-close"]').click()
             cy.get('[data-cy="infobox"]').should('not.exist')
         })
-        it('can switch from floating edit popup to back at bottom', () => {
+        it.skip('can switch from floating edit popup to back at bottom', () => {
             cy.goToDrawing()
             // to avoid overlaping with the map footer and the floating tooltip, increase the vertical size.
             // if the width of the viewport is less than 400px, we can't switch the edit popup position.
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.ts
index dce64dd792..5056f4dd03 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.ts
@@ -8,7 +8,7 @@ import proj4 from 'proj4'
 import { addFeatureIdentificationIntercepts } from 'support/intercepts'
 import { assertDefined, checkUrlParams } from 'support/utils'
 
-import type { FeatureInfoPositions } from '@/store/modules/ui/types'
+import type { FeatureInfoPosition } from '@/store/modules/ui/types'
 
 import useFeaturesStore from '@/store/modules/features'
 import useLayersStore from '@/store/modules/layers'
@@ -56,7 +56,7 @@ describe('Testing the feature selection', () => {
             cy.get('[data-cy="feature-item"]').should('have.length', 10)
         }
 
-        function checkFeatureInfoPosition(expectedPosition: FeatureInfoPositions): void {
+        function checkFeatureInfoPosition(expectedPosition: FeatureInfoPosition): void {
             cy.getPinia().then((pinia) => {
                 const uiStore = useUIStore(pinia)
                 expect(uiStore.featureInfoPosition).to.equal(expectedPosition)
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/footer.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/footer.cy.ts
index 8cff60a351..8f5c994a31 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/footer.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/footer.cy.ts
@@ -7,7 +7,6 @@ import { WEBMERCATOR } from '@swissgeo/coordinates'
 
 import useLayersStore from '@/store/modules/layers'
 import useUIStore from '@/store/modules/ui'
-import { UIModes } from '@/store/modules/ui/types'
 
 describe('Testing the footer content / tools', () => {
     it('shows/hide the scale line depending on the map resolution, while in Mercator', () => {
@@ -77,7 +76,7 @@ describe('Testing the footer content / tools', () => {
         cy.viewport('macbook-11')
         cy.waitUntilState((pinia: Pinia) => {
             const uiStore = useUIStore(pinia)
-            return uiStore.mode === UIModes.Desktop
+            return uiStore.isDesktopMode
         })
         testBackgroundWheel(true)
     })
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.ts
index a04e4e8947..2bbd6557e9 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.ts
@@ -10,7 +10,6 @@ import type { ShallowRef } from 'vue'
 
 import { fileProxyAPI } from '@swissgeo/api'
 import { registerProj4, WGS84 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import proj4 from 'proj4'
 import { assertDefined } from 'support/utils'
 import { toValue } from 'vue'
@@ -670,7 +669,7 @@ describe('The Import File Tool', () => {
         cy.getPinia().then((pinia) => {
             const layersStore = useLayersStore(pinia)
             const kmlLayerCount = layersStore.activeLayers.filter(
-                (layer) => layer.type === LayerType.KML
+                (layer) => layer.type === 'KML'
             ).length
             cy.window()
                 .its('cesiumViewer')
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/layers.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/layers.cy.ts
index 74ded0b5c2..82fc8bde1b 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/layers.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/layers.cy.ts
@@ -4,7 +4,6 @@ import type { ExternalWMSLayer, ExternalWMTSLayer, GeoAdminWMSLayer, Layer } fro
 import type { Pinia } from 'pinia'
 
 import { WEBMERCATOR, WGS84 } from '@swissgeo/coordinates'
-import { LayerType } from '@swissgeo/layers'
 import { assertDefined } from 'support/utils'
 
 import { SUPPORTED_LANG } from '@/modules/i18n'
@@ -1329,7 +1328,7 @@ describe('Test of layer handling', () => {
                 const layersStore = useLayersStore(pinia)
                 return layersStore.activeLayers.some(
                     (layer) =>
-                        layer.type === LayerType.WMS &&
+                        layer.type === 'WMS' &&
                         !layer.isExternal &&
                         (layer as GeoAdminWMSLayer).lang === langBefore
                 )
@@ -1360,7 +1359,7 @@ describe('Test of layer handling', () => {
                 const layersStore = useLayersStore(pinia)
                 return layersStore.activeLayers.some(
                     (layer) =>
-                        layer.type === LayerType.WMS &&
+                        layer.type === 'WMS' &&
                         !layer.isExternal &&
                         (layer as GeoAdminWMSLayer).lang === langAfter
                 )
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.ts
index 4c15fd0d2e..ef06b37c82 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.ts
@@ -4,7 +4,6 @@ import type { EditableFeature, LayerFeature } from '@swissgeo/api'
 import type { ExternalWMSLayer, ExternalWMTSLayer, KMLLayer } from '@swissgeo/layers'
 
 import { registerProj4, WGS84 } from '@swissgeo/coordinates'
-import { KMLStyle, LayerType } from '@swissgeo/layers'
 import proj4 from 'proj4'
 import { assertDefined } from 'support/utils'
 
@@ -206,11 +205,11 @@ describe('Test on legacy param import', () => {
                 expect(layersStore.activeLayers).to.be.an('Array').length(1)
                 const [kmlLayer] = layersStore.activeLayers
                 assertDefined(kmlLayer)
-                expect(kmlLayer.type).to.eq(LayerType.KML)
+                expect(kmlLayer.type).to.eq('KML')
                 expect(kmlLayer.baseUrl).to.eq(`${kmlServiceBaseUrl}${kmlServiceFilePath}`)
                 expect(kmlLayer.opacity).to.eq(0.6)
                 expect(kmlLayer.isVisible).to.be.true
-                expect((kmlLayer as KMLLayer).style).to.eq(KMLStyle.GEOADMIN)
+                expect((kmlLayer as KMLLayer).style).to.eq('geoadmin')
             })
         })
         it('is able to import an external KML from a legacy adminId query param', () => {
@@ -227,7 +226,7 @@ describe('Test on legacy param import', () => {
                 expect(layersStore.activeLayers).to.be.an('Array').length(1)
                 const [kmlLayer] = layersStore.activeLayers
                 assertDefined(kmlLayer)
-                expect(kmlLayer.type).to.eq(LayerType.KML)
+                expect(kmlLayer.type).to.eq('KML')
                 expect(kmlLayer.baseUrl).to.eq(`${kmlServiceBaseUrl}${kmlServiceFilePath}`)
                 expect(kmlLayer.opacity).to.eq(1)
                 expect(kmlLayer.isVisible).to.be.true
@@ -248,7 +247,7 @@ describe('Test on legacy param import', () => {
                 expect(layersStore.activeLayers).to.be.an('Array').length(1)
                 const [kmlLayer] = layersStore.activeLayers
                 assertDefined(kmlLayer)
-                expect(kmlLayer.type).to.eq(LayerType.KML)
+                expect(kmlLayer.type).to.eq('KML')
                 expect(kmlLayer.baseUrl).to.eq(`${kmlServiceBaseUrl}${kmlServiceFilePath}`)
                 expect(kmlLayer.opacity).to.eq(1)
                 expect(kmlLayer.isVisible).to.be.true
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/print.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/print.cy.ts
index 593e5e0fea..102dc2980a 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/print.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/print.cy.ts
@@ -681,7 +681,6 @@ describe('Testing print', () => {
                                 })
                             })
                             .filter((legend) => legend !== undefined)
-                        console.log('woot', expectedLegend)
 
                         checkPrintRequest(body, {
                             ...defaultSpec,
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.ts b/packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.ts
index f4a211b22e..0b2a188333 100644
--- a/packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.ts
+++ b/packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.ts
@@ -11,7 +11,6 @@ import { DEFAULT_PROJECTION } from '@/config'
 import useLayersStore from '@/store/modules/layers'
 import useMapStore from '@/store/modules/map'
 import usePositionStore from '@/store/modules/position'
-import { CrossHairs } from '@/store/modules/position/types'
 import useSearchStore from '@/store/modules/search'
 
 registerProj4(proj4)
@@ -642,7 +641,7 @@ describe('Test the search bar result handling', () => {
             cy.goToMapView({
                 queryParams: {
                     swisssearch: swissSearchString,
-                    crosshair: CrossHairs.Cross,
+                    crosshair: 'cross',
                 },
                 withHash: false,
             })
@@ -650,7 +649,7 @@ describe('Test the search bar result handling', () => {
                 searchQuery: swissSearchString,
                 expectedCenter: swissSearchXYCoordinates,
                 expectedPinnedLocation: swissSearchXYCoordinates,
-                expectedCrosshair: CrossHairs.Cross,
+                expectedCrosshair: 'cross',
                 expectedCrosshairPosition: swissSearchXYCoordinates,
             })
         })
@@ -679,7 +678,7 @@ describe('Test the search bar result handling', () => {
             cy.goToMapView({
                 queryParams: {
                     swisssearch: swissSearchString,
-                    crosshair: CrossHairs.Cross,
+                    crosshair: 'cross',
                 },
                 withHash: true,
             })
@@ -687,7 +686,7 @@ describe('Test the search bar result handling', () => {
                 searchQuery: swissSearchString,
                 expectedCenter: swissSearchXYCoordinates,
                 expectedPinnedLocation: swissSearchXYCoordinates,
-                expectedCrosshair: CrossHairs.Cross,
+                expectedCrosshair: 'cross',
                 expectedCrosshairPosition: swissSearchXYCoordinates,
             })
         })
@@ -699,7 +698,7 @@ describe('Test the search bar result handling', () => {
             cy.goToMapView({
                 queryParams: {
                     swisssearch: swissSearchString,
-                    crosshair: `${CrossHairs.Cross},${crossHairX},${crossHairY}`,
+                    crosshair: `${'cross'},${crossHairX},${crossHairY}`,
                 },
                 withHash: true,
             })
@@ -707,7 +706,7 @@ describe('Test the search bar result handling', () => {
                 searchQuery: swissSearchString,
                 expectedCenter: swissSearchXYCoordinates,
                 expectedPinnedLocation: swissSearchXYCoordinates,
-                expectedCrosshair: CrossHairs.Cross,
+                expectedCrosshair: 'cross',
                 expectedCrosshairPosition: crossHairXYCoordinates,
             })
         })
diff --git a/packages/theme/vite.config.ts b/packages/theme/vite.config.ts
index 601d1da87f..54124c836d 100644
--- a/packages/theme/vite.config.ts
+++ b/packages/theme/vite.config.ts
@@ -25,6 +25,7 @@ const config: UserConfig = {
                 'ol',
             ],
         },
+        sourcemap: true,
     },
     css: {
         preprocessorOptions: {
@@ -43,6 +44,9 @@ const config: UserConfig = {
     plugins: [
         tsconfigPaths(),
         tailwindcss(),
+        dts({
+            bundleTypes: true,
+        }),
         viteStaticCopy({
             targets: [
                 {
@@ -52,13 +56,10 @@ const config: UserConfig = {
                 {
                     src: normalizePath(`${__dirname}/src/fonts/*`),
                     dest: './fonts/',
-                    overwrite: false,
                 },
             ],
-        }),
-        dts({
-            bundleTypes: true,
-            exclude: ['./dist/fonts'],
+            // can create some race-conditioned error with the fonts folder if left to the default "writeBundle" hook.
+            hook: 'closeBundle',
         }),
     ],
 }