Merge branch 'dev/v2.0.1' into dependabot/npm_and_yarn/jlmap-vaadin-demo/vite-6.4.2

Author: makbn

Dockerfile

@@ -0,0 +1,18 @@
+# --- Stage 1: Build the application ---
+FROM maven:3.9.6-eclipse-temurin-17 AS build
+
+WORKDIR /app
+COPY pom.xml ./
+COPY jlmap-api ./jlmap-api
+COPY jlmap-vaadin ./jlmap-vaadin
+COPY jlmap-vaadin-demo ./jlmap-vaadin-demo
+
+RUN mvn -f jlmap-vaadin-demo/pom.xml clean package -Pproduction
+
+# --- Stage 2: Create the final image ---
+FROM eclipse-temurin:17-jre
+
+WORKDIR /app
+COPY --from=build /app/jlmap-vaadin-demo/target/jlmap-vaadin-demo-*.jar app.jar
+EXPOSE 80
+ENTRYPOINT ["java", "-Dserver.port=80", "-jar", "app.jar"]

README.md

@@ -1,21 +1,16 @@
-# Java Leaflet (JLeaflet)
+# Java Leaflet (JLMAP): A Java Interactive Map For Vaadin and JavaFx
 
-A Java library for integrating Leaflet maps into Java applications with full Java Platform Module System (JPMS) support.
-Now supporting both **JavaFX** and **Vaadin** implementations with a unified API.
+A Java library for integrating [Leaflet](https://github.com/Leaflet/Leaflet) maps into Java applications with full Java Platform Module System (JPMS) support.
+Now supporting both [**JavaFX**](https://openjfx.io/) and [**Vaadin**](https://vaadin.com/) implementations with a unified API.
 
 * Current version: **v2.0.0**
 
 Project Source Code: https://github.com/makbn/java_leaflet
+
 Project Wiki: https://github.com/makbn/java_leaflet/wiki
 
 ![Java-Leaflet Test](https://github.com/makbn/java_leaflet/blob/master/.github/doc/app.png?raw=true)
 
-> Leaflet is the leading open-source JavaScript library for mobile-friendly interactive maps. Weighing just about 38 KB
-> of JS, it has all the mapping features most developers ever need.
-> Leaflet is designed with simplicity, performance and usability in mind. It works efficiently across all major desktop
-> and mobile platforms, can be extended with lots of plugins, has a beautiful, easy to use and well-documented API and a
-> simple, readable source code that is a joy to contribute to.
-
 ## 🏗️ Project Structure
 
 This project is now organized as a multi-module Maven project:
@@ -77,6 +72,7 @@ Add the JavaFX dependency to your `pom.xml`:
     <version>2.0.0</version>
 </dependency>
 ```
+- https://central.sonatype.com/artifact/io.github.makbn/jlmap-fx
 
 ### Vaadin Implementation
 
@@ -90,6 +86,7 @@ Add the Vaadin dependency to your `pom.xml`:
     <version>2.0.0</version>
 </dependency>
 ```
+- https://central.sonatype.com/artifact/io.github.makbn/jlmap-vaadin
 
 Also rememebr to allow the module in your properties file:
 
@@ -353,14 +350,6 @@ jar --describe-module --file target/jlmap-vaadin-2.0.0.jar
 4. Ensure all tests pass
 5. Submit a pull request
 
-## License
-
-Since v2.0.0 This project is licensed under the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - see
-the [LICENSE](LICENSE) file for details.
-
-## Author
-
-**Matt Akbarian** (@makbn)
 
 ## Roadmap
 
@@ -378,9 +367,12 @@ the [LICENSE](LICENSE) file for details.
 - [ ] implement object specific `JLOptions`
 - [ ] Performance optimizations
 
-## Additional Resources
 
-- **API Documentation**: See the `jlmap-api` module for core interfaces
-- **JavaFX Examples**: See the `jlmap-fx` module for JavaFX usage
-- **Vaadin Examples**: See the `jlmap-vaadin-demo` for Vaadin usage
-- **Leaflet Documentation**: [https://leafletjs.com/](https://leafletjs.com/)
+## License
+
+Since v2.0.0 This project is licensed under the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - see
+the [LICENSE](LICENSE) file for details.
+
+## Author
+
+**Matt Akbarian** (@makbn)

jlmap-api/pom.xml

@@ -51,6 +51,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.1.2</version>
+                <configuration>
+                    <useModulePath>false</useModulePath>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -108,7 +111,19 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.4</version>
+            <version>3.27.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.7.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/DragEvent.java

@@ -37,5 +37,5 @@
  * @author Matt Akbarian  (@makbn)
  */
 public record DragEvent(JLAction action, JLLatLng center,
-                        JLBounds bounds, int zoomLevel) implements Event {
+                        JLBounds bounds, double zoomLevel) implements Event {
 }

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/JLDragEventHandler.java

@@ -78,14 +78,14 @@ public void handle(@NonNull JLMap<?> map, @NonNull JLObject<?> source, @NonNull
         return new MoveEvent(action,
                 gson.fromJson(String.valueOf(param4), JLLatLng.class),
                 gson.fromJson(String.valueOf(param5), JLBounds.class),
-                Integer.parseInt(String.valueOf(param3)));
+                Double.parseDouble(String.valueOf(param3)));
     }
 
     private @NotNull DragEvent getDragEvent(JLAction action, Object param4, Object param5, Object param3) {
         return new DragEvent(action,
                 gson.fromJson(String.valueOf(param4), JLLatLng.class),
                 gson.fromJson(String.valueOf(param5), JLBounds.class),
-                Integer.parseInt(String.valueOf(param3)));
+                Double.parseDouble(String.valueOf(param3)));
     }
 
     @Override

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/JLStatusChangeEventHandler.java

@@ -16,10 +16,10 @@
  * Handles status change events for the map, such as zoom and resize actions.
  * <p>
  * This event handler listens for map status changes and dispatches corresponding events:
- * @see ZoomEvent
- * @see ResizeEvent
  *
  * @author Matt Akbarian  (@makbn)
+ * @see ZoomEvent
+ * @see ResizeEvent
  */
 @Slf4j
 public class JLStatusChangeEventHandler implements JLEventHandler<Object> {
@@ -36,18 +36,18 @@ public class JLStatusChangeEventHandler implements JLEventHandler<Object> {
     public void handle(@NonNull JLMap<?> map, @NonNull Object source, @NonNull String functionName, OnJLActionListener<Object> listener, Object param1, Object param2, Object param3, Object param4, Object param5) {
         switch (functionName) {
             case FUNCTION_ZOOM -> listener
-                    .onAction(source, new ZoomEvent(JLAction.ZOOM, gson.fromJson(String.valueOf(param3), Integer.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
+                    .onAction(source, new ZoomEvent(JLAction.ZOOM, gson.fromJson(String.valueOf(param3), Double.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
             case FUNCTION_ZOOM_START -> listener
-                    .onAction(source, new ZoomEvent(JLAction.ZOOM_START, gson.fromJson(String.valueOf(param3), Integer.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
+                    .onAction(source, new ZoomEvent(JLAction.ZOOM_START, gson.fromJson(String.valueOf(param3), Double.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
             case FUNCTION_ZOOM_END -> listener
-                    .onAction(source, new ZoomEvent(JLAction.ZOOM_END, gson.fromJson(String.valueOf(param3), Integer.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
+                    .onAction(source, new ZoomEvent(JLAction.ZOOM_END, gson.fromJson(String.valueOf(param3), Double.class), gson.fromJson(String.valueOf(param5), JLBounds.class)));
             case FUNCTION_RESIZE -> listener
                     .onAction(source, new ResizeEvent(JLAction.RESIZE,
                             getDimension(param4, false, "Width"),
                             getDimension(param4, false, "Height"),
                             getDimension(param4, true, "Width"),
                             getDimension(param4, true, "Height"),
-                            gson.fromJson(String.valueOf(param3), Integer.class)));
+                            gson.fromJson(String.valueOf(param3), Double.class)));
             default -> log.error("{} not implemented!", functionName);
         }
     }

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/MoveEvent.java

@@ -31,5 +31,5 @@
  * @author Matt Akbarian  (@makbn)
  */
 public record MoveEvent(JLAction action, JLLatLng center,
-                        JLBounds bounds, int zoomLevel) implements Event {
+                        JLBounds bounds, double zoomLevel) implements Event {
 }

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/ResizeEvent.java

@@ -23,6 +23,6 @@
  * @author Matt Akbarian  (@makbn)
  * @see <a href="https://leafletjs.com/reference.html#resizeevent">Leaflet ResizeEvent Documentation</a>
  */
-public record ResizeEvent(JLAction action, int newWidth, int newHeight, int oldWidth, int oldHeight, int zoom)
+public record ResizeEvent(JLAction action, int newWidth, int newHeight, int oldWidth, int oldHeight, double zoom)
         implements Event {
 }

jlmap-api/src/main/java/io/github/makbn/jlmap/listener/event/ZoomEvent.java

@@ -22,6 +22,6 @@
  *
  * @author Matt Akbarian  (@makbn)
  * */
-public record ZoomEvent(JLAction action, int zoomLevel, JLBounds bounds) implements Event {
+public record ZoomEvent(JLAction action, double zoomLevel, JLBounds bounds) implements Event {
 
 }

jlmap-api/src/main/java/io/github/makbn/jlmap/model/builder/JLCallbackBuilder.java

@@ -27,7 +27,11 @@ public JLCallbackBuilder(String elementType, String varName) {
         return switch (event) {
             case ADD, REMOVE -> """
                     this.%3$s.on('%1$s', e => {
-                        e.sourceTarget.getElement().setAttribute('id', e.target.uuid);
+                        if (typeof e.sourceTarget.getElement === 'function' 
+                        && e.sourceTarget.getElement()
+                        && typeof  e.sourceTarget.getElement().setAttribute === 'function') {
+                            e.sourceTarget.getElement().setAttribute('id', e.target.uuid);
+                        }
                         this.jlMapElement.$server.eventHandler('%1$s', '%2$s', e.target.uuid, this.map.getZoom(),
                          JSON.stringify((typeof e.target.getLatLng === "function") ? 
                          e.target.getLatLng() :