PB-2064: fix feature selection tests

Author: sommerfe

packages/viewer/src/store/modules/features/actions/clearSelectedFeaturesByLayerId.ts

@@ -0,0 +1,22 @@
+import type { FeaturesStore } from '@/store/modules/features/types/features'
+import type { ActionDispatcher } from '@/store/types'
+
+import useProfileStore from '@/store/modules/profile'
+
+/** Removes all selected features from the map */
+export default function clearSelectedFeaturesByLayerId(
+    this: FeaturesStore,
+    layerId: string,
+    dispatcher: ActionDispatcher
+) {
+    this.selectedFeaturesByLayerId = this.selectedFeaturesByLayerId.filter(
+        (featuresForLayer) => featuresForLayer.layerId !== layerId
+    )
+    if (this.highlightedFeatureId) {
+        this.highlightedFeatureId = undefined
+    }
+    const profileStore = useProfileStore()
+    if (profileStore.feature) {
+        profileStore.setProfileFeature(undefined, dispatcher)
+    }
+}

packages/viewer/src/store/modules/features/index.ts

@@ -6,6 +6,7 @@ import type {
 } from '@/store/modules/features/types/features'
 
 import clearAllSelectedFeatures from '@/store/modules/features/actions/clearAllSelectedFeatures'
+import clearSelectedFeaturesByLayerId from '@/store/modules/features/actions/clearSelectedFeaturesByLayerId'
 import identifyFeatureAt from '@/store/modules/features/actions/identifyFeatureAt'
 import loadMoreFeaturesForLayer from '@/store/modules/features/actions/loadMoreFeaturesForLayer'
 import setHighlightedFeatureId from '@/store/modules/features/actions/setHighlightedFeatureId'
@@ -26,6 +27,7 @@ const getters: FeaturesStoreGetters = {
 }
 
 const actions = {
+    clearSelectedFeaturesByLayerId,
     clearAllSelectedFeatures,
     identifyFeatureAt,
     loadMoreFeaturesForLayer,

packages/viewer/src/store/modules/layers/actions/identifyFeatures.ts

@@ -53,8 +53,7 @@ export function identifyFeatures(
     const mapStore = useMapStore()
     const selectedFeatures = featuresStore.selectedFeatures
     const clickInfo = mapStore.clickInfo
-
-    if (!clickInfo || !clickInfo.features || !this.isFeatureSelected(clickInfo)) {
+    if (!clickInfo || !clickInfo.features) {
         return
     }
 
@@ -64,11 +63,19 @@ export function identifyFeatures(
     let updateFeatures = shouldUpdateFeatures
 
     if (layerId) {
+        // Check if there are selected features from this layer
         updateFeatures = selectedFeatures.some(
             (feature) => 'layer' in feature && feature.layer.id === layerId
         )
-    }
 
+        // If the layer is now invisible, we should clear features but not re-identify
+        const layers = this.getLayersById(layerId)
+        const layer = layers.length > 0 ? layers[0] : undefined
+        if (layer && !layer.isVisible && updateFeatures) {
+            featuresStore.clearSelectedFeaturesByLayerId(layerId, dispatcher)
+            return
+        }
+    }
     if (updateFeatures) {
         featuresStore
             .identifyFeatureAt(

packages/viewer/tests/cypress/tests-e2e/featureSelection.cy.ts

@@ -89,7 +89,6 @@ describe('Testing the feature selection', () => {
             if (featureInfoPosition) {
                 queryParams.featureInfo = featureInfoPosition
             }
-            console.log('goToMapViewWithFeatureSelection queryParams', queryParams)
             cy.goToMapView({ queryParams })
         }
 
@@ -371,8 +370,9 @@ describe('Testing the feature selection', () => {
         }
         it('can select an area to identify features inside it', () => {
             const fileName = 'external-kml-file.kml'
+            const fileNameWithKMLExtension = `KML|${fileName}`
             const localKmlFile = `import-tool/${fileName}`
-            cy.goToMapView({ queryParams: { layers: 'test.wms.layer' } })
+            cy.goToMapView({ queryParams: { layers: 'test.wms.layer', bgLayer: 'test.background.layer2' } })
             cy.wait(['@routeChange', '@layerConfig', '@topics', '@topic-ech'])
 
             const featureCountWithKml = DEFAULT_FEATURE_COUNT_RECTANGLE_SELECTION + 1
@@ -404,7 +404,7 @@ describe('Testing the feature selection', () => {
             cy.checkOlLayer([
                 'test.background.layer2',
                 { id: 'test.wms.layer', opacity: 0.75 },
-                fileName,
+                fileNameWithKMLExtension,
             ])
 
             cy.get('[data-cy="ol-map"]').as('olMap').should('be.visible')
@@ -515,7 +515,7 @@ describe('Testing the feature selection', () => {
             cy.wait('@emptyIdentify')
             cy.get('@highlightedFeatures').should('not.exist')
 
-            cy.get('@routeChange.all').should('have.length', 6)
+            cy.get('@routeChange.all').should('have.length', 10)
             cy.get('@layerConfig.all').should('have.length', 1)
             cy.get('@topics.all').should('have.length', 1)
             cy.get('@topic-ech.all').should('have.length', 1)
@@ -527,6 +527,7 @@ describe('Testing the feature selection', () => {
         })
         it('can select feature by click, add more feature, and deselect feature', () => {
             const fileName = '4-points.kml'
+            const fileNameWithKMLExtension = `KML|${fileName}`
             const localKmlFile = `import-tool/${fileName}`
             cy.goToMapView()
             cy.wait(['@routeChange', '@layerConfig', '@topics', '@topic-ech'])
@@ -556,7 +557,7 @@ describe('Testing the feature selection', () => {
 
             cy.closeMenuIfMobile()
 
-            cy.checkOlLayer(['test.background.layer2', fileName])
+            cy.checkOlLayer(['test.background.layer2', fileNameWithKMLExtension])
 
             cy.get('[data-cy="ol-map"]').as('olMap').should('be.visible')
             cy.getPinia().then((pinia) => {
@@ -580,16 +581,21 @@ describe('Testing the feature selection', () => {
                     )
 
                     clickOnMap(pixel3, false)
+                    cy.wait('@routeChange')
+                    cy.wait('@routeChange')
                     cy.getPinia().then((pinia) => {
                         const featuresStore3 = useFeaturesStore(pinia)
                         expect(featuresStore3.selectedFeatures.length).to.eq(1)
                     })
                     clickOnMap(pixel1, true)
+                    cy.wait('@routeChange')
+                    cy.wait('@routeChange')
                     cy.getPinia().then((pinia) => {
                         const featuresStore4 = useFeaturesStore(pinia)
                         expect(featuresStore4.selectedFeatures.length).to.eq(2)
                     })
                     clickOnMap(pixel1, true)
+                    cy.wait('@routeChange')
                     cy.getPinia().then((pinia) => {
                         const featuresStore5 = useFeaturesStore(pinia)
                         expect(featuresStore5.selectedFeatures.length).to.eq(1)
@@ -598,8 +604,9 @@ describe('Testing the feature selection', () => {
         })
         it('can print feature information', () => {
             const fileName = 'external-kml-file.kml'
+            const fileNameWithKMLExtension = `KML|${fileName}`
             const localKmlFile = `import-tool/${fileName}`
-            cy.goToMapView({ queryParams: { layers: 'test.wms.layer' } })
+            cy.goToMapView({ queryParams: { layers: 'test.wms.layer', bgLayer: 'test.background.layer2' } })
             cy.wait(['@routeChange', '@layerConfig', '@topics', '@topic-ech'])
 
             cy.openMenuIfMobile()
@@ -630,7 +637,7 @@ describe('Testing the feature selection', () => {
             cy.checkOlLayer([
                 'test.background.layer2',
                 { id: 'test.wms.layer', opacity: 0.75 },
-                fileName,
+                fileNameWithKMLExtension,
             ])
 
             cy.get('[data-cy="ol-map"]').as('olMap').should('be.visible')