use JsObject instead of JavaScriptObject and use custom @JsFunction i…

…nstead of elemental2.core.Function

src/main/java/com/gwidgets/api/leaflet/CircleMarker.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
 
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
@@ -82,7 +82,7 @@ protected CircleMarker() {
 	 * @return the object
 	 */
 	@JsMethod
-	public native JavaScriptObject toGeoJSON();
+	public native JsObject toGeoJSON();
 
 
 	/* (non-Javadoc)

src/main/java/com/gwidgets/api/leaflet/GeoJSON.java

@@ -1,9 +1,5 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsArray;
-
-import elemental2.core.Function;
 /**
  *  Copyright 2016 G-Widgets
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +14,9 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import com.gwidgets.api.leaflet.options.GeoJSONOptions;
+
+import elemental2.core.JsObject;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
 
@@ -41,7 +40,7 @@ private GeoJSON() {
 	 * @return the L class
 	 */
 	@JsMethod
-	public native L addData(JavaScriptObject data);
+	public native L addData(JsObject data);
 
 	/**
 	 * Changes styles of GeoJSON vector layers with the given style function.
@@ -50,7 +49,7 @@ private GeoJSON() {
 	 * @return the L class
 	 */
 	@JsMethod
-	public native L setStyle(Function style);
+	public native L setStyle(GeoJSONOptions.StyleFunction style);
 
 	/**
 	 * Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events.
@@ -69,8 +68,8 @@ private GeoJSON() {
 	 * @return the layer
 	 */
 	@JsMethod
-	public native static Layer geometryToLayer(JavaScriptObject featureData,
-			Function pointToLayer);
+	public native static Layer geometryToLayer(JsObject featureData,
+			GeoJSONOptions.PointToLayerFunction pointToLayer);
 
 	/**
 	 * Creates a LatLng object from an array of 2 numbers (latitude, longitude) used in GeoJSON for points. If reverse is set to true, the numbers will be interpreted as (longitude, latitude).
@@ -90,8 +89,8 @@ public native static Layer geometryToLayer(JavaScriptObject featureData,
 	 * @return js array of coordinates
 	 */
 	@JsMethod
-	public native static JsArray<JavaScriptObject> coordsToLatlngs(JsArray<JavaScriptObject> coords, double levelsDeep,
-			Function coordsToLatlngs);
+	public native static JsObject[] coordsToLatlngs(JsObject[]  coords, double levelsDeep,
+			GeoJSONOptions.CoordsToLatLngFunction coordsToLatlngs);
 
 
 	/**
@@ -101,7 +100,7 @@ public native static JsArray<JavaScriptObject> coordsToLatlngs(JsArray<JavaScrip
 	 * @return the js array
 	 */
 	@JsMethod
-    public native JsArray<JavaScriptObject> latLngToCoords(LatLng latlng);
+    public native JsObject[]  latLngToCoords(LatLng latlng);
 
 
 /**
@@ -113,7 +112,7 @@ public native static JsArray<JavaScriptObject> coordsToLatlngs(JsArray<JavaScrip
  * @return the js array
  */
 	@JsMethod
-  public native JsArray<JavaScriptObject> latLngsToCoords(JsArray<JavaScriptObject> latlngs, double levelsDeep, Boolean closed); 
+  public native JsObject[] latLngsToCoords(JsObject[] latlngs, double levelsDeep, Boolean closed);
 
 
  /**
@@ -123,7 +122,7 @@ public native static JsArray<JavaScriptObject> coordsToLatlngs(JsArray<JavaScrip
  * @return the java script object
  */
 	@JsMethod
-  public native JavaScriptObject asFeature(JavaScriptObject geojson);
+  public native JsObject asFeature(JsObject geojson);
 
 
 

src/main/java/com/gwidgets/api/leaflet/GridLayer.java

@@ -3,10 +3,13 @@
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
+import com.gwidgets.api.leaflet.utils.JsFn;
 
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
+import jsinterop.base.JsForEachCallbackFn;
 
 @JsType(isNative=true)
 public class GridLayer implements Layer, Evented{
@@ -78,10 +81,9 @@ protected GridLayer() {
 		 */
 	@JsMethod
 	public native Point getTileSize();
-
-
-	//looking for a solution
-	//public  HTMLElement createTile(Object coords, Function done);
+
+	@JsMethod
+	public native HTMLElement createTile(JsObject coords, JsFn doneCallback);
 
 
 	/**

src/main/java/com/gwidgets/api/leaflet/L.java

@@ -1,6 +1,5 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.options.CircleOptions;
 import com.gwidgets.api.leaflet.options.ControlAttributionOptions;
 import com.gwidgets.api.leaflet.options.ControlLayersOptions;
@@ -22,6 +21,7 @@
 import com.gwidgets.api.leaflet.options.TileLayerWMSOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
 
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 import jsinterop.annotations.JsConstructor;
 
@@ -200,7 +200,7 @@ public static native CircleMarker circleMarker(LatLng latlng,
 	 * @param options the GeoJSON options
 	 * @return a new GeoJSON object
 	 */
-	public static native GeoJSON geoJSON(JavaScriptObject geojson, GeoJSONOptions options);
+	public static native GeoJSON geoJSON(JsObject geojson, GeoJSONOptions options);
 
 	/**
 	 * Represents a geographical point with a certain latitude and longitude.
@@ -363,8 +363,8 @@ public static native Attribution attribution(
         	 * @return a new Layers object
         	 */
         	@JsMethod
-	        public static native Layers layers(JavaScriptObject baseLayers,
-	                JavaScriptObject overlays, ControlLayersOptions options);
+	        public static native Layers layers(JsObject baseLayers,
+			        JsObject overlays, ControlLayersOptions options);
 
 	        /**
         	 * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends Control.

src/main/java/com/gwidgets/api/leaflet/LayerGroup.java

@@ -1,11 +1,11 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
 
 import elemental2.core.Function;
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 /**
  *  Copyright 2016 G-Widgets
@@ -102,15 +102,15 @@ public class LayerGroup implements Layer, Evented {
 	 * @return the l
 	 */
 	@JsMethod
-	public native L eachLayer(Function fn, JavaScriptObject context);
+	public native L eachLayer(Function fn, JsObject context);
 
 	/**
 	 * Returns a GeoJSON representation of the layer group (GeoJSON FeatureCollection).
 	 *
 	 * @return the object
 	 */
 	@JsMethod
-	public native JavaScriptObject toGeoJSON();
+	public native JsObject toGeoJSON();
 
 
 	/**

src/main/java/com/gwidgets/api/leaflet/Map.java

@@ -1,6 +1,5 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.events.MouseEvent;
 import com.gwidgets.api.leaflet.options.FitBoundsOptions;
@@ -9,8 +8,9 @@
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.ZoomOptions;
 import com.gwidgets.api.leaflet.options.ZoomPanOptions;
+import com.gwidgets.api.leaflet.utils.JsFn;
 
-import elemental2.core.Function;
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 /**
  *  Copyright 2016 G-Widgets
@@ -26,6 +26,7 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import jsinterop.annotations.JsFunction;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
@@ -357,7 +358,7 @@ public native L setZoomAround(LatLng latlng, double zoom,
 	 * @return true/false
 	 */
 	@JsMethod
-	public native Boolean eachLayer(Function action, JavaScriptObject context);
+	public native Boolean eachLayer(EachLayerFunction action, JsObject context);
 
 	/**
 	 * Opens the specified popup while closing the previously opened (to make sure only one is opened at one time for usability).
@@ -564,7 +565,7 @@ public native L openPopup(HTMLElement el, LatLng latlng,
 	 * @return the L class
 	 */
 	@JsMethod
-	public native L whenReady(Function fn, Object context);
+	public native L whenReady(JsFn fn, Object context);
 
 	// Events 
 		/* (non-Javadoc)
@@ -626,5 +627,12 @@ public native L openPopup(HTMLElement el, LatLng latlng,
 		 */
 		public native L removeEventParent(Evented obj);
 
+	@JsFunction
+	public interface EachLayerFunction {
+
+		void apply(Layer layer);
+
+	}
+
 
 }

src/main/java/com/gwidgets/api/leaflet/Marker.java

@@ -1,10 +1,10 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
 
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 /**
  *  Copyright 2016 G-Widgets
@@ -136,7 +136,7 @@ private Marker() {
 	 * @return the object
 	 */
 	@JsMethod
-	public native JavaScriptObject toGeoJSON();
+	public native JsObject toGeoJSON();
 
 
 	// Events 

src/main/java/com/gwidgets/api/leaflet/Polygon.java

@@ -1,7 +1,5 @@
 package com.gwidgets.api.leaflet;
 
-import com.google.gwt.core.client.JavaScriptObject;
-
 /**
  *  Copyright 2016 G-Widgets
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +14,7 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import elemental2.core.JsObject;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
 
@@ -38,6 +37,6 @@ protected Polygon() {
 	 * @see com.gwidgets.api.leaflet.Polyline#toGeoJSON()
 	 */
 	@JsMethod
-	public native JavaScriptObject toGeoJSON();
+	public native JsObject toGeoJSON();
 
 }

src/main/java/com/gwidgets/api/leaflet/Polyline.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import com.google.gwt.core.client.JavaScriptObject;
 import com.gwidgets.api.leaflet.events.EventCallback;
 import com.gwidgets.api.leaflet.options.PopupOptions;
 import com.gwidgets.api.leaflet.options.TooltipOptions;
 
+import elemental2.core.JsObject;
 import elemental2.dom.HTMLElement;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
@@ -87,7 +87,7 @@ public native LatLng[] spliceLatLngs(double index, double pointsToRemove,
 	 * @return the object
 	 */
 	@JsMethod
-	public native JavaScriptObject toGeoJSON();
+	public native JsObject toGeoJSON();
 
 	/* (non-Javadoc)
 	 * @see com.gwidgets.api.leaflet.Layer#bindPopup(com.gwidgets.api.leaflet.elemental.HTMLElement, com.gwidgets.api.leaflet.options.PopupOptions)