package name changed

Author: makbn

pom.xml

@@ -5,8 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.github.makbn</groupId>
-    <artifactId>data-dispersion</artifactId>
+    <artifactId>jlmap</artifactId>
     <version>1.0</version>
+
+    <developers>
+        <developer>
+            <name>Mehdi Akbarian Rastaghi</name>
+            <id>makbn</id>
+            <email>[email protected]</email>
+        </developer>
+    </developers>
+
     <build>
         <plugins>
             <plugin>
@@ -29,9 +38,17 @@
             <version>1.18.12</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.13.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.13.3</version>
+        </dependency>
     </dependencies>
-
-
     <repositories>
         <repository>
             <id>com.teamdev</id>

src/main/java/io/github/makbn/datadispersion/model/JLPath.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion;
+package io.github.makbn.jlmap;
 
 import java.io.Serializable;
 

src/main/java/io/github/makbn/datadispersion/JLMapCallbackHandler.java renamed to src/main/java/io/github/makbn/jlmap/JLMapCallbackHandler.java

@@ -1,10 +1,10 @@
-package io.github.makbn.datadispersion;
+package io.github.makbn.jlmap;
 
-import io.github.makbn.datadispersion.exception.JLMapNotReadyException;
-import io.github.makbn.datadispersion.layer.JLLayer;
-import io.github.makbn.datadispersion.layer.JLUiLayer;
-import io.github.makbn.datadispersion.layer.JLVectorLayer;
-import io.github.makbn.datadispersion.model.JLLatLng;
+import io.github.makbn.jlmap.exception.JLMapNotReadyException;
+import io.github.makbn.jlmap.layer.JLLayer;
+import io.github.makbn.jlmap.layer.JLUiLayer;
+import io.github.makbn.jlmap.layer.JLVectorLayer;
+import io.github.makbn.jlmap.model.JLLatLng;
 import javafx.concurrent.Worker;
 import javafx.scene.Node;
 import javafx.scene.layout.AnchorPane;
@@ -19,11 +19,12 @@ public abstract class JLMapController extends AnchorPane {
     protected abstract HashMap<String, JLLayer> getLayers();
 
     JLMapController() {
-        System.out.println("super");
+        //do nothing
     }
 
     private JLMapController(Node... children) {
         super(children);
+        //do nothing
     }
 
     /**

src/main/java/io/github/makbn/datadispersion/JLMapController.java renamed to src/main/java/io/github/makbn/jlmap/JLMapController.java

@@ -1,10 +1,10 @@
-package io.github.makbn.datadispersion;
+package io.github.makbn.jlmap;
 
 import com.sun.javafx.webkit.WebConsoleListener;
-import io.github.makbn.datadispersion.layer.JLLayer;
-import io.github.makbn.datadispersion.layer.JLUiLayer;
-import io.github.makbn.datadispersion.layer.JLVectorLayer;
-import io.github.makbn.datadispersion.listener.OnJLMapViewListener;
+import io.github.makbn.jlmap.layer.JLLayer;
+import io.github.makbn.jlmap.layer.JLUiLayer;
+import io.github.makbn.jlmap.layer.JLVectorLayer;
+import io.github.makbn.jlmap.listener.OnJLMapViewListener;
 import javafx.animation.Transition;
 import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
@@ -14,18 +14,19 @@
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.util.Duration;
+import lombok.extern.log4j.Log4j2;
 import netscape.javascript.JSObject;
 
 import java.awt.*;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
 
+@Log4j2
 public class JLMapView extends JLMapController {
 
-    private final WebView webView;
+    private WebView webView;
     private OnJLMapViewListener mapListener;
     private HashMap<String, JLLayer> layers;
     private boolean controllerAdded = false;
@@ -34,9 +35,8 @@ public JLMapView(OnJLMapViewListener listener){
         this();
         this.setMapListener(listener);
     }
+
     public JLMapView() {
-        System.out.println("sub");
-        // we define a regular JavaFX WebView that DukeScript can use for rendering
         webView = new WebView();
         webView.getEngine().onStatusChangedProperty().addListener((observable, oldValue, newValue) -> System.out.println(""));
         webView.getEngine().onErrorProperty().addListener((observable, oldValue, newValue) -> System.out.println(""));
@@ -55,12 +55,8 @@ public JLMapView() {
                     }
                 });
 
-        WebConsoleListener.setDefaultListener(new WebConsoleListener() {
-            @Override
-            public void messageAdded(WebView webView, String message, int lineNumber, String sourceId) {
-                System.out.println(message);
-            }
-        });
+        WebConsoleListener.setDefaultListener((webView, message, lineNumber, sourceId)
+                -> log.debug(String.format("sid: %s ln: %d m:%s", sourceId, lineNumber, message)));
 
         webView.getEngine().load(getClass().getResource("/index.html").toString());
 
@@ -70,22 +66,22 @@ public void messageAdded(WebView webView, String message, int lineNumber, String
     }
 
     private void checkForBrowsing(WebEngine engine) {
-        String toBeopen =
+        String address =
                 engine.getLoadWorker().getMessage().trim();
-        System.out.println("tobeopen: " + toBeopen);
-        if (toBeopen.contains("http://") || toBeopen.contains("https://")) {
+        log.debug("link: " + address);
+        if (address.contains("http://") || address.contains("https://")) {
             engine.getLoadWorker().cancel();
             try {
                 String os = System.getProperty("os.name", "generic");
                 if(os.toLowerCase().contains("mac")){
-                    Runtime.getRuntime().exec("open " + toBeopen);
+                    Runtime.getRuntime().exec("open " + address);
                 }else if(Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                    Desktop.getDesktop().browse(new URL(toBeopen).toURI());
+                    Desktop.getDesktop().browse(new URL(address).toURI());
                 }else {
-                    Runtime.getRuntime().exec("xdg-open " + toBeopen);
+                    Runtime.getRuntime().exec("xdg-open " + address);
                 }
             } catch (IOException | URISyntaxException e) {
-                e.printStackTrace();
+                log.debug(e);
             }
         }
     }

src/main/java/io/github/makbn/datadispersion/JLMapView.java renamed to src/main/java/io/github/makbn/jlmap/JLMapView.java

@@ -1,9 +1,9 @@
-package io.github.makbn.datadispersion;
+package io.github.makbn.jlmap;
 
-import io.github.makbn.datadispersion.listener.OnJLMapViewListener;
-import io.github.makbn.datadispersion.model.JLLatLng;
-import io.github.makbn.datadispersion.model.JLMarker;
-import io.github.makbn.datadispersion.model.JLOptions;
+import io.github.makbn.jlmap.listener.OnJLMapViewListener;
+import io.github.makbn.jlmap.model.JLLatLng;
+import io.github.makbn.jlmap.model.JLMarker;
+import io.github.makbn.jlmap.model.JLOptions;
 import javafx.application.Application;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -28,7 +28,7 @@ public void start(Stage stage) {
         final JLMapView map = new JLMapView();
 
        // BorderPane root = createBasePane();
-        ListView<Address> listView = getAddressListView(map);
+        ListView<JLLatLng> listView = getAddressListView(map);
 
         AnchorPane inside = createBasePane();
 
@@ -120,24 +120,23 @@ public void mapFailed() {
                 .removeMarker(jlMarker.getId()));*/
     }
 
-    private ListView<Address> getAddressListView(JLMapView map) {
+    private ListView<JLLatLng> getAddressListView(JLMapView map) {
         // a regular JavaFX ListView
-        ListView<Address> listView = new ListView<>();
-        listView.getItems().addAll(new Address("Toni", 48.1322840, 11.5361690),
-                new Address("Jarda", 50.0284060, 14.4934400),
-                new Address("JUG Münster", 51.94906770000001, 7.613701100000071));
+        ListView<JLLatLng> listView = new ListView<>();
+        listView.getItems().addAll(new JLLatLng("Toni", 48.1322840, 11.5361690),
+                new JLLatLng("Jarda", 50.0284060, 34.4934400),
+                new JLLatLng("JUG Münster", 11.94906770000001, 7.613701100000071));
         // we listen for the selected item and update the map accordingly
         // as a demo of how to interact between JavaFX and DukeScript
-        listView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Address>() {
+        listView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<JLLatLng>() {
             @Override
-            public void changed(ObservableValue<? extends Address> ov, Address old_val, final Address new_val) {
-                String window =  map.getWebView()
-                        .getEngine()
-                        .executeScript("setLatLng("+new_val.getLat()+", "+new_val.getLng()+", 10, true)")
-                        .toString();
-                System.out.println("done: " + window);
+            public void changed(ObservableValue<? extends JLLatLng> observable, JLLatLng oldValue, JLLatLng newValue) {
+                int d = (int) (newValue.distanceTo(oldValue) / 1000000);
+                System.out.println(d);
+                map.setView(newValue, d);
             }
         });
+
         return listView;
     }
 

src/main/java/io/github/makbn/datadispersion/Leaflet.java renamed to src/main/java/io/github/makbn/jlmap/Leaflet.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion;
+package io.github.makbn.jlmap;
 
 public class Properties {
 

src/main/java/io/github/makbn/datadispersion/Properties.java renamed to src/main/java/io/github/makbn/jlmap/Properties.java

@@ -1,6 +1,4 @@
-package io.github.makbn.datadispersion.exception;
-
-import lombok.Builder;
+package io.github.makbn.jlmap.exception;
 
 /**
  * Internal JLMap application's Exception base class.

src/main/java/io/github/makbn/datadispersion/exception/JLException.java renamed to src/main/java/io/github/makbn/jlmap/exception/JLException.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.exception;
+package io.github.makbn.jlmap.exception;
 
 import lombok.Builder;
 

src/main/java/io/github/makbn/datadispersion/exception/JLMapNotReadyException.java renamed to src/main/java/io/github/makbn/jlmap/exception/JLMapNotReadyException.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.layer;
+package io.github.makbn.jlmap.layer;
 
 import javafx.scene.web.WebEngine;
 

src/main/java/io/github/makbn/datadispersion/layer/JLLayer.java renamed to src/main/java/io/github/makbn/jlmap/layer/JLLayer.java

@@ -1,9 +1,9 @@
-package io.github.makbn.datadispersion.layer;
+package io.github.makbn.jlmap.layer;
 
-import io.github.makbn.datadispersion.model.JLLatLng;
-import io.github.makbn.datadispersion.model.JLMarker;
-import io.github.makbn.datadispersion.model.JLOptions;
-import io.github.makbn.datadispersion.model.JLPopup;
+import io.github.makbn.jlmap.model.JLLatLng;
+import io.github.makbn.jlmap.model.JLMarker;
+import io.github.makbn.jlmap.model.JLOptions;
+import io.github.makbn.jlmap.model.JLPopup;
 import javafx.scene.web.WebEngine;
 
 /**

src/main/java/io/github/makbn/datadispersion/layer/JLUiLayer.java renamed to src/main/java/io/github/makbn/jlmap/layer/JLUiLayer.java

@@ -1,6 +1,6 @@
-package io.github.makbn.datadispersion.layer;
+package io.github.makbn.jlmap.layer;
 
-import io.github.makbn.datadispersion.model.*;
+import io.github.makbn.jlmap.model.*;
 import javafx.scene.paint.Color;
 import javafx.scene.web.WebEngine;
 

src/main/java/io/github/makbn/datadispersion/layer/JLVectorLayer.java renamed to src/main/java/io/github/makbn/jlmap/layer/JLVectorLayer.java

@@ -1,6 +1,6 @@
-package io.github.makbn.datadispersion.listener;
+package io.github.makbn.jlmap.listener;
 
-import io.github.makbn.datadispersion.JLMapView;
+import io.github.makbn.jlmap.JLMapView;
 
 public interface OnJLMapViewListener {
 

src/main/java/io/github/makbn/datadispersion/listener/OnJLMapViewListener.java renamed to src/main/java/io/github/makbn/jlmap/listener/OnJLMapViewListener.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.listener;
+package io.github.makbn.jlmap.listener;
 
 public interface OnMapActionListener {
 

src/main/java/io/github/makbn/datadispersion/listener/OnMapActionListener.java renamed to src/main/java/io/github/makbn/jlmap/listener/OnMapActionListener.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import lombok.*;
 

src/main/java/io/github/makbn/datadispersion/model/JLCircle.java renamed to src/main/java/io/github/makbn/jlmap/model/JLCircle.java

@@ -1,6 +1,6 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
-import io.github.makbn.datadispersion.Properties;
+import io.github.makbn.jlmap.Properties;
 import lombok.*;
 
 import java.util.Objects;

src/main/java/io/github/makbn/datadispersion/model/JLLatLng.java renamed to src/main/java/io/github/makbn/jlmap/model/JLLatLng.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 
 import lombok.*;

src/main/java/io/github/makbn/datadispersion/model/JLMarker.java renamed to src/main/java/io/github/makbn/jlmap/model/JLMarker.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import lombok.*;
 
@@ -16,6 +16,6 @@ public class JLMultiPolyline {
     private int id;
     /** theming options for JLMultiPolyline. all options are not available! */
     private JLOptions options;
-    /** The array of {{@link io.github.makbn.datadispersion.model.JLLatLng}} points of JLMultiPolyline*/
+    /** The array of {{@link io.github.makbn.jlmap.model.JLLatLng}} points of JLMultiPolyline*/
     private JLLatLng[][] vertices;
 }

src/main/java/io/github/makbn/datadispersion/model/JLMultiPolyline.java renamed to src/main/java/io/github/makbn/jlmap/model/JLMultiPolyline.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import javafx.scene.paint.Color;
 import lombok.AllArgsConstructor;

src/main/java/io/github/makbn/datadispersion/model/JLOptions.java renamed to src/main/java/io/github/makbn/jlmap/model/JLOptions.java

@@ -0,0 +1,5 @@
+package io.github.makbn.jlmap.model;
+
+public interface JLPath {
+
+}

src/main/java/io/github/makbn/jlmap/model/JLPath.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import lombok.*;
 

src/main/java/io/github/makbn/datadispersion/model/JLPolygon.java renamed to src/main/java/io/github/makbn/jlmap/model/JLPolygon.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import lombok.*;
 
@@ -16,6 +16,6 @@ public class JLPolyline {
     private int id;
     /** theming options for JLPolyline. all options are not available! */
     private JLOptions options;
-    /** The array of {{@link io.github.makbn.datadispersion.model.JLLatLng}} points of JLPolyline*/
+    /** The array of {{@link io.github.makbn.jlmap.model.JLLatLng}} points of JLPolyline*/
     private JLLatLng[] vertices;
 }

src/main/java/io/github/makbn/datadispersion/model/JLPolyline.java renamed to src/main/java/io/github/makbn/jlmap/model/JLPolyline.java

@@ -1,4 +1,4 @@
-package io.github.makbn.datadispersion.model;
+package io.github.makbn.jlmap.model;
 
 import lombok.*;