fix: keep Mol database layers explicit on map

frontend/src/App.tsx

@@ -56,11 +56,11 @@ const workspaceNavGroups: Array<{ label: string; keys: WorkspaceKey[] }> = [
 function App(): JSX.Element {
   const [activeWorkspace, setActiveWorkspace] = useState<WorkspaceKey>('overview')
   const [inspectorOpen, setInspectorOpen] = useState(false)
+  const [mapContentMode, setMapContentMode] = useState<'dataset' | 'analysis'>('dataset')
   useEffect(() => {
     window.scrollTo({ top: 0, left: 0 })
     setInspectorOpen(false)
   }, [activeWorkspace])
-
   const {
     projects,
     selectedProject,
@@ -83,6 +83,10 @@ function App(): JSX.Element {
     setProjectForm,
     setAreaForm,
   } = useProjectWorkspace()
+  const selectProject = (projectId: string) => {
+    setMapContentMode('dataset')
+    setSelectedProjectId(projectId)
+  }
   const {
     selectedDatasetId,
     selectedDataset,
@@ -351,7 +355,8 @@ function App(): JSX.Element {
     featureCount: selectedDatasetSummary?.feature_count ?? selectedDataset?.feature_count ?? null,
     isVectorDatasetType,
   })
-  const analysisMapLayerActive = Boolean(changeDetectionResult?.geojson || segmentationGeoJson || detectionGeoJson)
+  const analysisMapLayerAvailable = Boolean(changeDetectionResult?.geojson || segmentationGeoJson || detectionGeoJson)
+  const analysisMapLayerActive = mapContentMode === 'analysis' && analysisMapLayerAvailable
   const viewportVectorLayerActive = viewportVectorLayer.enabled && !analysisMapLayerActive
   const datasetMapContent = viewportVectorLayer.enabled ? viewportVectorLayer.data : datasetContent
   const useRasterTileManifestForSegmentation = () => {
@@ -410,9 +415,9 @@ function App(): JSX.Element {
     setSelectedMapFeature,
   } = useMapWorkspaceState({
     areas,
-    changeDetectionGeoJson: changeDetectionResult?.geojson ?? null,
-    segmentationGeoJson,
-    detectionGeoJson,
+    changeDetectionGeoJson: analysisMapLayerActive ? changeDetectionResult?.geojson ?? null : null,
+    segmentationGeoJson: analysisMapLayerActive ? segmentationGeoJson : null,
+    detectionGeoJson: analysisMapLayerActive ? detectionGeoJson : null,
     datasetContent: datasetMapContent,
     selectedDataset,
     datasetLayerActive: Boolean(selectedDataset && isVectorDatasetType(selectedDataset.dataset_type)),
@@ -479,7 +484,7 @@ function App(): JSX.Element {
     loadSegmentationRuns,
     loadQualityChecks,
     loadExports,
-    setSelectedProjectId,
+    setSelectedProjectId: selectProject,
     setSelectedDatasetId,
     setSelectedMapAreaId,
     setQaCandidateDatasetId,
@@ -521,28 +526,28 @@ function App(): JSX.Element {
   const selectedArea = areas.find((area) => area.id === selectedMapAreaId) ?? null
   const activeWorkspaceItem = workspaceNavItems.find((item) => item.key === activeWorkspace) ?? workspaceNavItems[0]
   const mapLayerSourceLabel = useMemo(() => {
-    if (changeDetectionResult?.geojson) {
+    if (analysisMapLayerActive && changeDetectionResult?.geojson) {
       return 'Change detection'
     }
-    if (segmentationGeoJson) {
+    if (analysisMapLayerActive && segmentationGeoJson) {
       return 'Segmentation run'
     }
-    if (detectionGeoJson) {
+    if (analysisMapLayerActive && detectionGeoJson) {
       return 'Detection run'
     }
     if ((datasetMapContent || viewportVectorLayer.enabled) && selectedDataset) {
       return `${selectedDataset.dataset_type} dataset`
     }
     return 'No active vector or result layer'
-  }, [changeDetectionResult?.geojson, datasetMapContent, detectionGeoJson, segmentationGeoJson, selectedDataset, viewportVectorLayer.enabled])
+  }, [analysisMapLayerActive, changeDetectionResult?.geojson, datasetMapContent, detectionGeoJson, segmentationGeoJson, selectedDataset, viewportVectorLayer.enabled])
   const mapLayerProvenance = useMemo(() => {
-    if (changeDetectionResult?.geojson) {
+    if (analysisMapLayerActive && changeDetectionResult?.geojson) {
       return `source ${changeSourceDatasetId || 'n/a'} -> target ${changeTargetDatasetId || 'n/a'}`
     }
-    if (segmentationGeoJson) {
+    if (analysisMapLayerActive && segmentationGeoJson) {
       return selectedSegmentationRunId ? `analysis run ${selectedSegmentationRunId}` : 'segmentation results loaded'
     }
-    if (detectionGeoJson) {
+    if (analysisMapLayerActive && detectionGeoJson) {
       return selectedDetectionRunId ? `analysis run ${selectedDetectionRunId}` : 'detection results loaded'
     }
     if ((datasetMapContent || viewportVectorLayer.enabled) && selectedDataset) {
@@ -550,6 +555,7 @@ function App(): JSX.Element {
     }
     return 'Open a dataset, detection run, segmentation run or change result to draw it here.'
   }, [
+    analysisMapLayerActive,
     changeDetectionResult?.geojson,
     changeSourceDatasetId,
     changeTargetDatasetId,
@@ -565,6 +571,7 @@ function App(): JSX.Element {
     if (selectedProjectId) {
       loadDatasetDetails(selectedProjectId, dataset)
     }
+    setMapContentMode('dataset')
     setMapLayerVisible(true)
     setActiveWorkspace('map')
   }
@@ -867,7 +874,7 @@ function App(): JSX.Element {
                 demoWorkflowMessage={demoWorkflowMessage}
                 onCreateProject={createProject}
                 onUpdateProjectForm={setProjectForm}
-                onSelectProject={setSelectedProjectId}
+                onSelectProject={selectProject}
                 onLoadDemoWorkflow={loadDemoWorkflow}
               />
 
@@ -925,6 +932,8 @@ function App(): JSX.Element {
               viewportVectorStatus={viewportVectorLayerActive ? viewportVectorLayer.statusMessage : null}
               viewportVectorTone={viewportVectorLayer.error ? 'error' : viewportVectorLayer.truncated ? 'warning' : viewportVectorLayer.loading || viewportVectorLayer.zoomRequired ? 'pending' : 'ready'}
               fitMapDataOnChange={!viewportVectorLayerActive}
+              mapContentMode={analysisMapLayerActive ? 'analysis' : 'dataset'}
+              analysisLayerAvailable={analysisMapLayerAvailable}
               selectedMapFeature={selectedMapFeature}
               mapSelectionBbox={mapSelectionBbox}
               mapSelectionResult={mapSelectionResult}
@@ -952,6 +961,7 @@ function App(): JSX.Element {
               onSetAreaLayerOpacity={setAreaLayerOpacity}
               onSetMapLayerVisible={setMapLayerVisible}
               onSetMapLayerOpacity={setMapLayerOpacity}
+              onSetMapContentMode={setMapContentMode}
               onSelectMapFeature={setSelectedMapFeature}
               onMapViewportChange={viewportVectorLayer.setViewport}
               onSetMapSelectionBbox={setMapSelectionBbox}