refactor: simplify accessing features from cluster click event (#8137)

Author: sissbruecker

vaadin-map-flow-parent/vaadin-map-flow-integration-tests/src/main/java/com/vaadin/flow/component/map/ClusterPage.java

@@ -13,6 +13,7 @@
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.NativeButton;
 import com.vaadin.flow.component.map.configuration.Coordinate;
+import com.vaadin.flow.component.map.configuration.Feature;
 import com.vaadin.flow.component.map.configuration.feature.MarkerFeature;
 import com.vaadin.flow.component.map.configuration.layer.FeatureLayer;
 import com.vaadin.flow.component.map.configuration.style.Icon;
@@ -46,10 +47,14 @@ public ClusterPage() {
         eventLog.getElement().getStyle().set("white-space", "pre");
 
         map.addClusterClickListener(event -> {
-            String features = event.getFeatures().stream()
-                    .map(info -> info.getFeature().getId()).sorted()
-                    .collect(Collectors.joining(", "));
-            eventLog.add(new Div("cluster-click: " + features));
+            String featureIds = event.getFeatures().stream().map(Feature::getId)
+                    .sorted().collect(Collectors.joining(", "));
+            String layerId = event.getLayer().getId();
+            String sourceId = event.getVectorSource().getId();
+            String eventText = String.format(
+                    "cluster-click: features=[%s], layer=%s, source=%s",
+                    featureIds, layerId, sourceId);
+            eventLog.add(new Div(eventText));
         });
 
         map.addFeatureClickListener(event -> {
@@ -67,6 +72,8 @@ private void configureClustering(Map map) {
         layer.setClusterDistance(50);
         layer.setClusterMinDistance(50);
 
+        layer.getSource().setId("cluster-source");
+
         // Cluster feature in some region
         MarkerFeature marker = new MarkerFeature(new Coordinate(0, 0));
         marker.setId("m1");

vaadin-map-flow-parent/vaadin-map-flow-integration-tests/src/main/java/com/vaadin/flow/component/map/demo/ClusterDemo.java

@@ -35,6 +35,10 @@ public ClusterDemo() {
             layer.addFeature(marker);
         }
 
+        map.addClusterClickListener(event -> {
+            map.zoomToFit(event.getFeatures());
+        });
+
         add(map);
     }
 }

vaadin-map-flow-parent/vaadin-map-flow-integration-tests/src/test/java/com/vaadin/flow/components/map/ClusterIT.java

@@ -181,7 +181,9 @@ public void clickCluster_triggersClusterClickEvent() {
         // Click events are delayed by around 250ms, wait for event
         waitSeconds(1);
 
-        Assert.assertEquals("cluster-click: m1, m2, m3", eventLog.getText());
+        Assert.assertEquals(
+                "cluster-click: features=[m1, m2, m3], layer=feature-layer, source=cluster-source",
+                eventLog.getText());
     }
 
     @Test

vaadin-map-flow-parent/vaadin-map-flow/src/main/java/com/vaadin/flow/component/map/events/MapClusterClickEvent.java

@@ -8,16 +8,19 @@
  */
 package com.vaadin.flow.component.map.events;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import com.vaadin.flow.component.ComponentEvent;
 import com.vaadin.flow.component.DomEvent;
 import com.vaadin.flow.component.EventData;
 import com.vaadin.flow.component.map.Map;
 import com.vaadin.flow.component.map.MapBase;
+import com.vaadin.flow.component.map.configuration.Feature;
+import com.vaadin.flow.component.map.configuration.layer.VectorLayer;
+import com.vaadin.flow.component.map.configuration.source.VectorSource;
+import com.vaadin.flow.internal.JacksonUtils;
 
+import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.node.ArrayNode;
 
 /**
@@ -26,7 +29,9 @@
 @DomEvent("map-cluster-click")
 public class MapClusterClickEvent extends ComponentEvent<MapBase> {
 
-    private final List<FeatureEventDetails> features;
+    private final List<Feature> features;
+    private final VectorLayer layer;
+    private final VectorSource vectorSource;
     private final MouseEventDetails details;
 
     public MapClusterClickEvent(Map source, boolean fromClient,
@@ -41,15 +46,19 @@ public MapClusterClickEvent(Map source, boolean fromClient,
             @EventData("event.detail.originalEvent.button") int button) {
         super(source, fromClient);
 
-        List<FeatureEventDetails> features = new ArrayList<>();
-        for (int i = 0; i < featureIds.size(); i++) {
-            String featureId = featureIds.get(i).asString();
-            FeatureEventDetails featureEventDetails = MapEventUtil
-                    .getFeatureEventDetails(source.getRawConfiguration(),
-                            layerId, featureId);
-            features.add(featureEventDetails);
-        }
-        this.features = Collections.unmodifiableList(features);
+        layer = source.getRawConfiguration().getLayers().stream()
+                .filter(l -> l instanceof VectorLayer && l.getId() != null
+                        && l.getId().equals(layerId))
+                .map(l -> (VectorLayer) l).findFirst()
+                .orElseThrow(() -> new IllegalStateException(
+                        "No vector layer with id " + layerId));
+        vectorSource = (VectorSource) layer.getSource();
+
+        List<String> featureIdList = JacksonUtils.stream(featureIds)
+                .map(JsonNode::asString).toList();
+        features = vectorSource.getFeatures().stream()
+                .filter(feature -> featureIdList.contains(feature.getId()))
+                .toList();
 
         details = new MouseEventDetails();
         details.setAbsoluteX(pageX);
@@ -66,10 +75,28 @@ public MapClusterClickEvent(Map source, boolean fromClient,
      *
      * @return the list of features in the cluster
      */
-    public List<FeatureEventDetails> getFeatures() {
+    public List<Feature> getFeatures() {
         return features;
     }
 
+    /**
+     * Gets the layer that contains the cluster's features.
+     *
+     * @return the layer
+     */
+    public VectorLayer getLayer() {
+        return layer;
+    }
+
+    /**
+     * Gets the source that contains the cluster's features.
+     *
+     * @return the source
+     */
+    public VectorSource getVectorSource() {
+        return vectorSource;
+    }
+
     /**
      * Gets the click's mouse event details.
      *