Merge pull request #501 from xdev-software/develop

Release

Author: AB-xdev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,7 @@
 name: 🐞 Bug
 description: Create a bug report for something that is broken
 labels: [bug]
+type: bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,6 +1,7 @@
 name: ✨ Feature/Enhancement
 description: Suggest a new feature or enhancement
 labels: [enhancement]
+type: feature
 body:
   - type: markdown
     attributes:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.6.0
+* Changed all occurrences of ``Integer`` and ``Double`` to ``Number`` for improved compatibility with Leaflet's API
+* Updated OpenStreetMap's Tile-Server address to ``tile.openstreetmap.org`` [openstreetmap/operations#737](https://github.com/openstreetmap/operations/issues/737)
+
 ## 4.5.0
 * Added support for [WMS](https://leafletjs.com/reference.html#tilelayer-wms) #486
 * Updated dependencies

README.md

@@ -18,7 +18,21 @@ To get started it's recommended to have a look at the [demo](./vaadin-maps-leafl
 > [!NOTE]
 > **The API only supports sending instructions to the client**<br/>
 > Due to data integrity retrieving client-side data (that can be modified by users) is not supported.
-> * Event listeners can still be registered but this needs to be done manually.<br/>[An example is available in the demo](./vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java).
+> 
+> Event listeners can still be registered but this needs to be done manually. An example is available [in the demo](./vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/EventDemo.java).
+> 
+> <details><summary>The following code snippet is a simplification of an even more <a href="./vaadin-maps-leaflet-flow-demo/src/main/java/software/xdev/vaadin/maps/leaflet/flow/demo/ComplexDemo.java#L251">complex example</a> which sends (unvalidated!) client side data back to the server (click to expand)</summary>
+>
+> ```java
+> this.map.on("click", "e => document.getElementById('" + ID + "').$server.mapClicked(e.latlng.lat, e.latng.lng)");
+> ...
+> @ClientCallable
+> public void mapClicked(double lat, double lng)
+> {
+>   LOG.info("Map clicked - lat: {}, lng: {}", lat, lng);
+> }
+> ```
+> </details>
 
 ## Installation
 [Installation guide of the latest release](https://github.com/xdev-software/vaadin-maps-leaflet-flow/releases/latest#Installation)
@@ -33,6 +47,9 @@ You might have to fine tune your security configuration to allow these.
 | --- | --- |
 | Vaadin 24+ (latest) | ``3+`` |
 
+### Spring-Boot
+* You may have to include ``software/xdev`` inside [``vaadin.allowed-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages)
+
 ## Run the Demo
 * Checkout the repo
 * Run ``mvn install && mvn -f vaadin-maps-leaflet-flow-demo spring-boot:run``

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.21.1</version>
+								<version>10.21.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.9.0</version>
+								<version>7.10.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.9.0</version>
+								<version>7.10.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

vaadin-maps-leaflet-flow-demo/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
-		<version>4.5.1-SNAPSHOT</version>
+		<version>4.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -29,7 +29,7 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.6.2</vaadin.version>
+		<vaadin.version>24.6.5</vaadin.version>
 
 		<org.springframework.boot.version>3.4.2</org.springframework.boot.version>
 	</properties>

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

@@ -51,6 +51,10 @@ public EventDemo()
 
 		final HorizontalLayout hlButtons = new HorizontalLayout();
 
+		// !!! NOTE !!!
+		// A more complex demo which also sends data back from the client to the server
+		// can be found in ComplexDemo#addEventDemo
+		
 		// Bind clickFunc to map so that it gets disposed when the map is disposed
 		final String clickFuncReference = map.clientComponentJsAccessor() + ".myCoolClickFunc";
 		reg.execJs(clickFuncReference + "=e => alert('You clicked: ' + e.latlng)");

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

@@ -32,11 +32,12 @@ public InitialResizeDemo()
 			new LLatLng(reg, 50, 11)
 		);
 
-		final MapContainer mapContainer = new MapContainer(reg, map -> {
+		final MapContainer mapContainer = new MapContainer(
+			reg, map ->
 			// This needs to be done after the map was initially resized
 			// otherwise the view is calculated incorrectly
-			map.fitBounds(bounds);
-		});
+			map.fitBounds(bounds)
+		);
 		mapContainer.setSizeFull();
 		this.add(mapContainer);
 

vaadin-maps-leaflet-flow/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>vaadin-maps-leaflet-flow</name>
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.6.2</vaadin.version>
+		<vaadin.version>24.6.5</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -320,7 +320,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.21.1</version>
+								<version>10.21.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -357,12 +357,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.9.0</version>
+								<version>7.10.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.9.0</version>
+								<version>7.10.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/base/has/LHasOpacity.java

@@ -20,7 +20,7 @@
 
 public interface LHasOpacity<S extends LHasOpacity<S>> extends LComponent<S>
 {
-	default S setOpacity(final Double opacity)
+	default S setOpacity(final Number opacity)
 	{
 		this.invokeSelf(".setOpacity($0)", opacity);
 		return this.self();