Merge pull request #269 from xdev-software/develop

Release 3.0.2

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -25,7 +25,7 @@ jobs:
         distribution: [temurin]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
   check_code: # Validates the code
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK
       uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure Git
       run: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |
@@ -197,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Init Git and pull
       run: |

.github/workflows/sonar.yml

@@ -26,7 +26,7 @@ jobs:
     # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 

.github/workflows/test-deploy.yml

@@ -10,7 +10,7 @@ jobs:
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up JDK OSSRH
       uses: actions/setup-java@v3

.github/workflows/update-from-template.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.2
+* Added support for Polyline #266 (thanks to @blitzdose)
+
 ## 3.0.1
 * Fixed ``divIcon`` being displayed incorrectly [due to a default ``iconSize`` of ``12px``](https://github.com/Leaflet/Leaflet/issues/4238) #246
 * Updated dependencies

CONTRIBUTING.md

@@ -1,19 +1,18 @@
 ## Contributing
 
-We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our components.
+We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request and anything that you build and share using our components.
 
-### Get in touch with the team
+### Communication channels
+* Communication is primarily done using issues.
+* If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
+* As a last resort measure or on otherwise important matter you may also [contact us directly](https://xdev.software/en/about-us/contact).
 
-Twitter: https://twitter.com/xdevsoftware 
-<br/>
-Mail: [email protected]
+### Ways to help
+* **Report bugs**<br/>Create an issue or send a pull request
+* **Send pull requests**<br/>If you want to contribute code, check out the development instructions below.
+  * However when contributing new features, please first discuss the change you wish to make via issue with the owners of this repository before making a change. Otherwise your work might be rejected and your effort was pointless.
 
-### Some ways to help:
-
-- **Report bugs**: File issues on GitHub.
-- **Send pull requests**: If you want to contribute code, check out the development instructions below.
-
-We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
+We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).
 
 ## Developing
 
@@ -26,7 +25,7 @@ You should have the following things installed:
 ### Recommended setup
 * Install ``IntelliJ`` (Community Edition is sufficient)
   * Install the following plugins:
-    * [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
+    * [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields
     * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
     * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
   * Import the project

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

@@ -26,9 +26,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.1.2</vaadin.version>
+		<vaadin.version>24.1.8</vaadin.version>
 
-		<org.springframework.boot.version>3.1.1</org.springframework.boot.version>
+		<org.springframework.boot.version>3.1.3</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>

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

@@ -22,6 +22,7 @@
 import software.xdev.vaadin.maps.leaflet.flow.data.LMarker;
 import software.xdev.vaadin.maps.leaflet.flow.data.LPoint;
 import software.xdev.vaadin.maps.leaflet.flow.data.LPolygon;
+import software.xdev.vaadin.maps.leaflet.flow.data.LPolyline;
 import software.xdev.vaadin.maps.leaflet.flow.data.LTileLayer;
 
 
@@ -36,16 +37,17 @@ public class LeafletView extends VerticalLayout
 	private final Button btnLunch = new Button("Where do XDEV employees go for lunch?");
 	private LMap map;
 
-	private LMarker markerZob;
-	private LMarker markerRathaus;
+	private final LMarker markerZob = new LMarker(49.673470, 12.160108, "ZoB");
+	private final LMarker markerRathaus = new LMarker(49.675519, 12.163868, "L-22556");
 
-	private LCircle circleRange;
-	private LMarker markerPizza;
-	private LMarker markerKebab;
-	private LMarker markerAsia;
-	private LMarker markerGreek;
-	private LMarker markerBakery;
-	private LMarker markerLeberkaese;
+	private final LCircle circleRange = new LCircle(49.675126, 12.160733, 450);
+	private final LMarker markerPizza = new LMarker(49.674413, 12.160925);
+	private final LMarker markerKebab = new LMarker(49.673026, 12.156278);
+	private final LMarker markerAsia = new LMarker(49.675039, 12.162127);
+	private final LMarker markerGreek = new LMarker(49.675126, 12.161899);
+	private final LMarker markerBakery = new LMarker(49.674806, 12.160249);
+	private final LMarker markerSchnitzel = new LMarker(49.673800, 12.160113);
+	private final LMarker markerBratwurst = new LMarker(49.674907, 12.161937);
 
 	public LeafletView()
 	{
@@ -89,7 +91,8 @@ private void btnLunchClick(final ClickEvent<Button> event)
 			this.markerAsia,
 			this.markerGreek,
 			this.markerBakery,
-			this.markerLeberkaese);
+			this.markerSchnitzel,
+			this.markerBratwurst);
 
 		this.map.setViewPoint(new LCenter(49.675126, 12.160733, this.viewLunch ? 16 : 17));
 		this.map.removeLComponents(this.viewLunch ? normalComponents : lunchComponents);
@@ -100,7 +103,6 @@ private void btnLunchClick(final ClickEvent<Button> event)
 
 	private void initMapComponents()
 	{
-		this.markerZob = new LMarker(49.673470, 12.160108, "ZoB");
 		this.markerZob.setPopup("Central bus station");
 
 		final LMarker markerXDev = new LMarker(49.675806677512824, 12.160990185846394);
@@ -142,32 +144,33 @@ private void initMapComponents()
 				new LPoint(49.675306, 12.158499)));
 		polygonNoc.setFill(true);
 		polygonNoc.setFillColor("#3366ff");
-		polygonNoc.setFillOpacity(0.8);
+		polygonNoc.setFillOpacity(0.5);
 		polygonNoc.setStroke(false);
 		polygonNoc.setPopup("NOC-Nordoberpfalz Center");
 
-		this.markerRathaus = new LMarker(49.675519, 12.163868, "L-22556");
-		this.markerRathaus.setPopup("Old Town Hall");
+		final LPolyline polylineRouteZOB = new LPolyline(List.of(
+			new LPoint(49.673800, 12.160113),
+			new LPoint(49.67391927694611, 12.160769132769188),
+			new LPoint(49.67567078571473, 12.160428926167304)
+		));
+		polylineRouteZOB.setStrokeOpacity(0.5);
+		polylineRouteZOB.setPopup("Route to ZOB");
 
-		this.circleRange = new LCircle(49.675126, 12.160733, 450);
+		this.markerRathaus.setPopup("Old Town Hall");
 
-		this.markerPizza = new LMarker(49.674413, 12.160925);
 		this.markerPizza.setPopup("Pizza!");
 
-		this.markerKebab = new LMarker(49.673026, 12.156278);
 		this.markerKebab.setPopup("Kebab!");
 
-		this.markerAsia = new LMarker(49.675039, 12.162127);
 		this.markerAsia.setPopup("Asian Food");
 
-		this.markerGreek = new LMarker(49.675126, 12.161899);
 		this.markerGreek.setPopup("Greek Food");
 
-		this.markerBakery = new LMarker(49.674806, 12.160249);
 		this.markerBakery.setPopup("Fresh baked stuff");
 
-		this.markerLeberkaese = new LMarker(49.673800, 12.160113);
-		this.markerLeberkaese.setPopup("Fast food like Leberkäsesemmeln");
+		this.markerSchnitzel.setPopup("Fast food like Schnitzel");
+		
+		this.markerBratwurst.setPopup("Bratwurst");
 
 		this.map = new LMap(49.675126, 12.160733, 17);
 		this.map.setTileLayer(LTileLayer.DEFAULT_OPENSTREETMAP_TILE);
@@ -181,6 +184,7 @@ private void initMapComponents()
 			markerInfo,
 			this.markerZob,
 			polygonNoc,
+			polylineRouteZOB,
 			this.markerRathaus);
 	}
 }

vaadin-maps-leaflet-flow/pom.xml

@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.1.2</vaadin.version>
+		<vaadin.version>24.1.8</vaadin.version>
 	</properties>
 
 	<dependencyManagement>