Merge pull request #5 from N1k145/IconFactory

Added Support for external icons

Author: N1k145

README.md

@@ -55,9 +55,13 @@ Both the LeafletMap component and the demo application are written in Kotlin.
 
 #### Changelog
 
+LeafletMap 1.1.4:
+
+* Improved support for customMarkers
+
 LeafletMap 1.1.3:
 
-* Added Wraper Class for Marker
+* Added Wrapper Class for Marker
 
 LeafletMap 1.1.2:
 
@@ -69,7 +73,7 @@ LeafletMap 1.1.2:
 
 LeafletMap 1.1:
 
-* Added support for CustomMarkers
+* Added support for customMarkers
 * Added removeMarker function
 * Added changeIconOfMarker function
 

pom.xml

@@ -8,7 +8,7 @@
     <artifactId>leafletmap</artifactId>
     <name>leafletmap</name>
     <packaging>jar</packaging>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
 
     <organization>
         <name>Saring</name>

src/main/kotlin/de/saring/leafletmap/LeafletMapView.kt

@@ -8,7 +8,12 @@ import javafx.scene.web.WebView
 import java.net.URL
 import javafx.concurrent.Worker
 import netscape.javascript.JSObject
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.IOException
+import java.util.*
 import java.util.concurrent.CompletableFuture
+import javax.imageio.ImageIO
 
 
 /**
@@ -134,14 +139,14 @@ class LeafletMapView : StackPane() {
      * @param zoomLevel zoom level (0 - 19 for OpenStreetMap)
      */
     fun setZoom(zoomLevel: Int) =
-        execScript("myMap.setZoom([$zoomLevel]);")
+            execScript("myMap.setZoom([$zoomLevel]);")
 
     /**
      * Adds a Marker Object to a map
      *
      * @param marker the Marker Object
      */
-    fun addMarker(marker: Marker){
+    fun addMarker(marker: Marker) {
         marker.addToMap(getNextMarkerName(), this)
     }
 
@@ -160,21 +165,40 @@ class LeafletMapView : StackPane() {
      * @param markerName the name of the marker type
      * @param iconUrl the url if the marker icon
      */
-    fun addCustomMarker(markerName: String, iconUrl: String):String{
+    fun addCustomMarker(markerName: String, iconUrl: String): String {
         execScript("var $markerName = L.icon({\n" +
-                "iconUrl: '$iconUrl',\n" +
+                "iconUrl: '${createImage(iconUrl, "png")}',\n" +
                 "iconSize: [24, 24],\n" +
                 "iconAnchor: [12, 12],\n" +
-                "});");
+                "});")
         return markerName
     }
 
+    private fun createImage(path: String, type: String): String {
+        val image = ImageIO.read(File(path))
+        var imageString: String? = null
+        val bos = ByteArrayOutputStream()
+
+        try {
+            ImageIO.write(image, type, bos)
+            val imageBytes = bos.toByteArray()
+
+            val encoder = Base64.getEncoder()
+            imageString = encoder.encodeToString(imageBytes)
+
+            bos.close()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+        return "data:image/$type;base64,$imageString"
+    }
+
     /**
      * Sets the onMarkerClickListener
      *
      * @param listener the onMarerClickEventListener
      */
-    fun onMarkerClick(listener: MarkerClickEventListener){
+    fun onMarkerClick(listener: MarkerClickEventListener) {
         val win = execScript("document") as JSObject
         win.setMember("java", this)
         markerClickEvent.addListener(listener)
@@ -183,7 +207,7 @@ class LeafletMapView : StackPane() {
     /**
      * Handles the callback from the markerClickEvent
      */
-    fun markerClick(title: String){
+    fun markerClick(title: String) {
         markerClickEvent.MarkerClickEvent(title)
     }
 
@@ -192,7 +216,7 @@ class LeafletMapView : StackPane() {
      *
      * @param listener the MapMoveEventListener
      */
-    fun onMapMove(listener: MapMoveEventListener){
+    fun onMapMove(listener: MapMoveEventListener) {
         val win = execScript("document") as JSObject
         win.setMember("java", this)
         execScript("myMap.on('moveend', function(e){ document.java.mapMove(myMap.getCenter().lat, myMap.getCenter().lng);});")
@@ -202,7 +226,7 @@ class LeafletMapView : StackPane() {
     /**
      * Handles the callback from the mapMoveEvent
      */
-    fun mapMove(lat: Double, lng: Double){
+    fun mapMove(lat: Double, lng: Double) {
         val latlng = LatLong(lat, lng)
         mapMoveEvent.MapMoveEvent(latlng)
     }
@@ -212,7 +236,7 @@ class LeafletMapView : StackPane() {
      *
      * @param listener the onMapClickEventListener
      */
-    fun onMapClick(listener: MapClickEventListener){
+    fun onMapClick(listener: MapClickEventListener) {
         val win = execScript("document") as JSObject
         win.setMember("java", this)
         execScript("myMap.on('click', function(e){ document.java.mapClick(e.latlng.lat, e.latlng.lng);});")
@@ -222,7 +246,7 @@ class LeafletMapView : StackPane() {
     /**
      * Handles the callback from the mapClickEvent
      */
-    fun mapClick(lat: Double, lng: Double){
+    fun mapClick(lat: Double, lng: Double) {
         val latlng = LatLong(lat, lng)
         mapClickEvent.MapClickEvent(latlng)
     }
@@ -249,5 +273,5 @@ class LeafletMapView : StackPane() {
 
     internal fun execScript(script: String) = webEngine.executeScript(script)
 
-    private fun getNextMarkerName() : String = "marker${varNameSuffix++}"
+    private fun getNextMarkerName(): String = "marker${varNameSuffix++}"
 }