PB-2064: refactor load topic

Author: sommerfe

packages/viewer/src/store/modules/topics/actions/loadTopic.ts

@@ -1,5 +1,3 @@
-import type { Layer } from '@swissgeo/layers'
-
 import log, { LogPreDefinedColor } from '@swissgeo/log'
 
 import type { LoadTopicOptions, TopicsStore } from '@/store/modules/topics/types/topics'
@@ -36,7 +34,28 @@ export default function loadTopic(
                 }
             }
             if (this.currentTopic.layersToActivate) {
-                const layersToKeep = updateActiveLayersFromTopics.call(this)
+                const layersStore = useLayersStore()
+                // Get IDs of currently active layers
+                const activeLayerIds = new Set(layersStore.activeLayers.map(layer => layer.id))
+
+                // Create a map of active layers by ID for quick lookup with their time configs
+                const activeLayersMap = new Map(
+                    layersStore.activeLayers.map(layer => [layer.id, layer])
+                )
+
+                // Filter layersToActivate to only include layers that are currently active
+                const layersToKeep = this.currentTopic.layersToActivate.filter(layer =>
+                    activeLayerIds.has(layer.id)
+                ).map(layer => {
+                    const activeLayer = activeLayersMap.get(layer.id)
+                    layer.isVisible = activeLayer?.isVisible || false
+                    // If the active layer has a time config and current time entry, update the new layer's time config
+                    if (activeLayer?.timeConfig?.currentTimeEntry && layer.timeConfig) {
+                        layer.timeConfig.currentTimeEntry = activeLayer.timeConfig.currentTimeEntry
+                    }
+
+                    return layer
+                })
                 // Only set layers if there are any to keep
                 if (layersToKeep.length > 0) {
                     layersStore.setLayers(layersToKeep, dispatcher)
@@ -53,30 +72,3 @@ export default function loadTopic(
             })
         })
 }
-
-
-function updateActiveLayersFromTopics(this: TopicsStore): Layer[] {
-    const layersStore = useLayersStore()
-    // Get IDs of currently active layers
-    const activeLayerIds = new Set(layersStore.activeLayers.map(layer => layer.id))
-
-    // Create a map of active layers by ID for quick lookup with their time configs
-    const activeLayersMap = new Map(
-        layersStore.activeLayers.map(layer => [layer.id, layer])
-    )
-
-    // Filter layersToActivate to only include layers that are currently active
-    const layersToKeep = this.currentTopic!.layersToActivate.filter(layer =>
-        activeLayerIds.has(layer.id)
-    ).map(layer => {
-        const activeLayer = activeLayersMap.get(layer.id)
-        layer.isVisible = activeLayer?.isVisible || false
-        // If the active layer has a time config and current time entry, update the new layer's time config
-        if (activeLayer?.timeConfig?.currentTimeEntry && layer.timeConfig) {
-            layer.timeConfig.currentTimeEntry = activeLayer.timeConfig.currentTimeEntry
-        }
-
-        return layer
-    })
-    return layersToKeep
-}