Add leaflet-markercluster

Currently conflicts with maplibre-gl-leaflet

Author: AB-xdev

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Introduced support for Leaflet plugins #307
   * Plugins can be installed from ``software.xdev.vaadin.maps-leaflet.plugins:<artifactId>``
   * The following [plugins](./plugins/) are available:
+    * leaflet-markercluster
     * maplibre-gl-leaflet
   * You can also use the [``bom``](./bom/) for easier dependency management
 

bom/pom.xml

@@ -53,6 +53,11 @@
 				<artifactId>flow</artifactId>
 				<version>5.0.0-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>software.xdev.vaadin.maps-leaflet.plugins</groupId>
+				<artifactId>leaflet-markercluster</artifactId>
+				<version>5.0.0-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>software.xdev.vaadin.maps-leaflet.plugins</groupId>
 				<artifactId>maplibre-gl-leaflet</artifactId>

flow-demo/pom.xml

@@ -98,6 +98,11 @@
 			<artifactId>flow</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>software.xdev.vaadin.maps-leaflet.plugins</groupId>
+			<artifactId>leaflet-markercluster</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>software.xdev.vaadin.maps-leaflet.plugins</groupId>
 			<artifactId>maplibre-gl-leaflet</artifactId>

flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/DemoView.java

@@ -12,6 +12,7 @@
 import com.vaadin.flow.data.renderer.ComponentRenderer;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
+import com.vaadin.flow.theme.lumo.LumoUtility;
 
 import software.xdev.vaadin.maps.leaflet.flow.demo.ComplexDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.EventDemo;
@@ -22,6 +23,7 @@
 import software.xdev.vaadin.maps.leaflet.flow.demo.MultiLayerWithPyramidDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.NotOfThisEarthDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.WatermarkControlDemo;
+import software.xdev.vaadin.maps.leaflet.flow.demo.plugins.LeafletMarkerClusterDemo;
 import software.xdev.vaadin.maps.leaflet.flow.demo.plugins.MaplibreGLDemo;
 
 
@@ -42,6 +44,8 @@ public DemoView()
 				spDesc.getStyle().set("white-space", "pre");
 
 				final VerticalLayout vl = new VerticalLayout(anchor, spDesc);
+				vl.addClassName(LumoUtility.Padding.SMALL);
+				vl.setPadding(false);
 				vl.setSpacing(false);
 				return vl;
 			}))
@@ -105,6 +109,11 @@ protected void onAttach(final AttachEvent attachEvent)
 				"Freeing up resources Benchmark",
 				"Benchmark for showcasing how resources a freed up when handling huge amounts of components"
 			),
+			new Example(
+				LeafletMarkerClusterDemo.NAV,
+				"Plugin: Leaflet.markercluster",
+				"Showcases markers can be clustered using Leaflet.markercluster"
+			),
 			new Example(
 				MaplibreGLDemo.NAV,
 				"Plugin: MapLibre GL Leaflet",

flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/plugins/LeafletMarkerClusterDemo.java

@@ -0,0 +1,65 @@
+package software.xdev.vaadin.maps.leaflet.flow.demo.plugins;
+
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.router.Route;
+
+import software.xdev.vaadin.maps.leaflet.MapContainer;
+import software.xdev.vaadin.maps.leaflet.basictypes.LLatLng;
+import software.xdev.vaadin.maps.leaflet.layer.other.LMarkerClusterGroup;
+import software.xdev.vaadin.maps.leaflet.layer.raster.LTileLayer;
+import software.xdev.vaadin.maps.leaflet.layer.ui.LMarker;
+import software.xdev.vaadin.maps.leaflet.map.LMap;
+import software.xdev.vaadin.maps.leaflet.registry.LComponentManagementRegistry;
+import software.xdev.vaadin.maps.leaflet.registry.LDefaultComponentManagementRegistry;
+
+
+@Route(LeafletMarkerClusterDemo.NAV)
+@SuppressWarnings("checkstyle:MagicNumber")
+public class LeafletMarkerClusterDemo extends VerticalLayout
+{
+	public static final String NAV = "/leaflet-markercluster";
+	
+	public LeafletMarkerClusterDemo()
+	{
+		// Let the view use 100% of the site
+		this.setSizeFull();
+		
+		// Create the registry which is needed so that components can be reused and their methods invoked
+		// Note: You normally don't need to invoke any methods of the registry and just hand it over to the components
+		final LComponentManagementRegistry reg = new LDefaultComponentManagementRegistry(this);
+		
+		// Create and add the MapContainer (which contains the map) to the UI
+		final MapContainer mapContainer = new MapContainer(reg);
+		mapContainer.setSizeFull();
+		this.add(mapContainer);
+		
+		final LMap map = mapContainer.getlMap();
+		
+		// Add a (default) TileLayer so that we can see something on the map
+		map.addLayer(LTileLayer.createDefaultForOpenStreetMapTileServer(reg));
+		
+		// Set what part of the world should be shown
+		map.setView(new LLatLng(reg, 49.1, 12), 8);
+		
+		final LMarkerClusterGroup markerClusterGroup = new LMarkerClusterGroup(reg);
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.6756, 12.1610))
+			.bindPopup("XDEV Software"));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.673800, 12.160113))
+			.bindPopup("Schnitzel"));
+		
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.67, 12.16))
+			.bindPopup("Weiden i.d.OPf."));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.44, 11.86))
+			.bindPopup("Amberg"));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.33, 12.11))
+			.bindPopup("Schwandorf"));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.45, 11.08))
+			.bindPopup("Nürnberg"));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 49.02, 12.1))
+			.bindPopup("Regensburg"));
+		markerClusterGroup.addLayer(new LMarker(reg, new LLatLng(reg, 48.14, 11.57))
+			.bindPopup("München"));
+		
+		map.addLayer(markerClusterGroup);
+	}
+}

plugins/leaflet-markercluster/README.md

@@ -0,0 +1 @@
+# Plugin for [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster)