Refactored code

Author: AB-xdev

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

@@ -92,7 +92,7 @@ public void mapTest()
 		this.map.setHeight("700px");
 		this.map.setWidth("1000px");
 		this.add(this.map);
-		this.map.setListener(e -> { System.out.println(e);}); // add some logic here for called Markers (token)
+		this.map.addMarkerClickListener(ev -> { System.out.println(ev.getTag());}); // add some logic here for called Markers (token)
 
 		this.markerZob = new LMarker(49.673470, 12.160108,"ZoB");
 		this.markerZob.setPopup("Central bus station");

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

@@ -26,16 +26,19 @@
 
 import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEvent;
+import com.vaadin.flow.component.ComponentEventListener;
+import com.vaadin.flow.component.ComponentUtil;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
+import com.vaadin.flow.shared.Registration;
 
 import software.xdev.vaadin.maps.leaflet.flow.data.LCenter;
 import software.xdev.vaadin.maps.leaflet.flow.data.LCircle;
 import software.xdev.vaadin.maps.leaflet.flow.data.LComponent;
 import software.xdev.vaadin.maps.leaflet.flow.data.LMarker;
-import software.xdev.vaadin.maps.leaflet.flow.data.LMarkerEventListener;
 import software.xdev.vaadin.maps.leaflet.flow.data.LPolygon;
 import software.xdev.vaadin.maps.leaflet.flow.data.LTileLayer;
 
@@ -56,7 +59,6 @@ public class LMap extends Component implements HasSize
 
 	private LCenter center;
 	private final List<LComponent> items = new ArrayList<>();
-	private LMarkerEventListener listener;
 
 	public LMap(final double lat, final double lon, final int zoom)
 	{
@@ -155,16 +157,29 @@ public void removeItem(final LComponent... items)
 	}
 
 	@ClientCallable
-	private void markerCall(final String id)
+	protected void onMarkerClick(final String tag)
 	{
-		if(this.listener != null)
-		{
-			this.listener.onMarkerClickEvent(id);
-		}
+		ComponentUtil.fireEvent(this, new MarkerClickEvent(this, true, tag));
+	}
+	
+	public Registration addMarkerClickListener(final ComponentEventListener<MarkerClickEvent> listener)
+	{
+		return ComponentUtil.addListener(this, MarkerClickEvent.class, listener);
 	}
 
-	public void setListener(final LMarkerEventListener listener)
+	public class MarkerClickEvent extends ComponentEvent<LMap>
 	{
-		this.listener = listener;
+		private final String tag;
+
+		public MarkerClickEvent(final LMap source, final boolean fromClient, final String tag)
+		{
+			super(source, fromClient);
+			this.tag = tag;
+		}
+
+		public String getTag()
+		{
+			return this.tag;
+		}
 	}
 }

vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/flow/data/LMarker.java

@@ -34,7 +34,10 @@ public class LMarker implements LComponent
 	private static final String MARKER_TYPE = "Point";
 	private LMarkerGeometry geometry;
 	private LMarkerOptions properties;
-	private String token;
+	/**
+	 * Tag for custom meta-data
+	 */
+	private String tag;
 
 
 	/**
@@ -49,11 +52,11 @@ public LMarker(final double lat, final double lon)
 		this(lat, lon, "empty");
 	}
 
-	public LMarker(final double lat, final double lon, final String token)
+	public LMarker(final double lat, final double lon, final String tag)
 	{
 		this.geometry = new LMarkerGeometry(MARKER_TYPE, lat, lon);
 		this.properties = new LMarkerOptions();
-		this.token = token;
+		this.tag = tag;
 	}
 
 
@@ -134,14 +137,14 @@ public void setPopup(final String popup)
 		this.properties.setPopup(popup);
 	}
 
-	public String getToken()
+	public String getTag()
 	{
-		return this.token;
+		return this.tag;
 	}
 
-	public void setToken(final String token)
+	public void setTag(final String tag)
 	{
-		this.token = token;
+		this.tag = tag;
 	}
 
 	public JsonObject toJson()
@@ -153,7 +156,7 @@ public JsonObject toJson()
 			jsonObject.put("type", Json.create("Feature"));
 			jsonObject.put("geometry", Json.parse(mapper.writeValueAsString(this.geometry)));
 			jsonObject.put("properties", Json.parse(mapper.writeValueAsString(this.properties)));
-			jsonObject.put("token", Json.create(this.token));
+			jsonObject.put("tag", Json.create(this.tag));
 
 		}
 		catch(final JsonProcessingException e)

vaadin-maps-leaflet-flow/src/main/resources/META-INF/resources/frontend/leaflet/leafletCon.js

@@ -94,17 +94,14 @@ export class LeafletMap extends PolymerElement {
 
         if (obj.properties.popup != null) {
             item.bindPopup(obj.properties.popup);
-            
-        if (obj.token != "empty")
-        	{
-        	 var vaadinServer = this.$server;             
-             item.on('click', markerOnClick);
-             function markerOnClick(e)
-             	{
-                 	vaadinServer.markerCall(obj.token);
-                }
-        	}
-       
+        }
+		
+        if (obj.tag != "empty") {
+        	var vaadinServer = this.$server;  
+			
+            item.on('click', function (e) {
+                vaadinServer.onMarkerClick(obj.tag);
+            });
         }
 
         this.items.push(item);