From 366810884076e10085c961bda3bf10ff9fb42097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kenneth=20Gulbrands=C3=B8y?= <kenneth.gulbrandsoy@gmail.com>
Date: Mon, 19 Nov 2012 03:33:59 +0100
Subject: [PATCH 1/8] Fixed gwtl-core integration-test discarded error output

---
 src/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pom.xml b/src/pom.xml
index 635e281..906b619 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -216,7 +216,6 @@
 						<!-- Copy deps into projects before packaging -->
 						<execution>
 							<id>prepare-package</id>
-							<phase>prepare-package</phase>
 							<goals>
 								<goal>resources</goal>
 							</goals>

From 62c4178f955833847f51639bcc111ba61482b0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kenneth=20Gulbrands=C3=B8y?= <kenneth@discofoundation.org>
Date: Mon, 19 Nov 2012 10:06:12 +0100
Subject: [PATCH 2/8] Added missing phase in parent POM

---
 src/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pom.xml b/src/pom.xml
index 906b619..635e281 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -216,6 +216,7 @@
 						<!-- Copy deps into projects before packaging -->
 						<execution>
 							<id>prepare-package</id>
+							<phase>prepare-package</phase>
 							<goals>
 								<goal>resources</goal>
 							</goals>

From a2b365234c7330b7bc60ea1889210d548693451f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kenneth=20Gulbrands=C3=B8y?= <kenneth@discofoundation.org>
Date: Mon, 19 Nov 2012 10:07:12 +0100
Subject: [PATCH 3/8] Fixed missing organization name in license

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 7767823..bd43b69 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
+    * Neither the name of DISCO Open Source Foundation nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 

From 6bf4d02d9355ad61282e01e00081286a3fcfb88d Mon Sep 17 00:00:00 2001
From: David Ignjic <ignjic@gmail.com>
Date: Mon, 19 Nov 2012 20:15:02 +0100
Subject: [PATCH 4/8] Change fixed Leaflet.label js

---
 README.md                                      |  2 +-
 src/gwtl-label/leaflet-label.version           |  4 ++--
 .../org/discotools/gwt/leaflet/Label.gwt.xml   |  4 ++--
 .../leaflet.label-src.js                       | 18 ++++++++++++++++++
 .../leaflet.label.css                          |  0
 .../leaflet.label.js                           |  6 ++++++
 .../leaflet.label.js                           |  6 ------
 7 files changed, 29 insertions(+), 11 deletions(-)
 rename src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/{f41dabbd6af7b1c156f055d3c6ee974fb683b918 => 3c13acff459c36a222e9fdefd718af95396a0a9f}/leaflet.label-src.js (93%)
 rename src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/{f41dabbd6af7b1c156f055d3c6ee974fb683b918 => 3c13acff459c36a222e9fdefd718af95396a0a9f}/leaflet.label.css (100%)
 create mode 100644 src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.js
 delete mode 100644 src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.js

diff --git a/README.md b/README.md
index 2eaa0d4..bf5a77b 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Following parts of Leaflet API are implemented:
 
 ###<a href="gwt-leaflet/tree/master/src/gwtl-label">Label Module (GWT)</a>###
 
-**Dependency**: Leaflet.label [master/f41dabbd6af7b1c156f055d3c6ee974fb683b918d](https://github.com/igieon/Leaflet.label/commit/f41dabbd6af7b1c156f055d3c6ee974fb683b918d) (git)
+**Dependency**: Leaflet.label [master/3c13acff459c36a222e9fdefd718af95396a0a9f](https://github.com/igieon/Leaflet.label/commit/3c13acff459c36a222e9fdefd718af95396a0a9f) (git)
                                     
 + Leaflet label - Simple label plugin for Leaflet ([Leaflet.label](https://github.com/igieon/Leaflet.label))
 
diff --git a/src/gwtl-label/leaflet-label.version b/src/gwtl-label/leaflet-label.version
index 96b980b..5a3adba 100644
--- a/src/gwtl-label/leaflet-label.version
+++ b/src/gwtl-label/leaflet-label.version
@@ -1,6 +1,6 @@
 # ------------------------------------------------------------
-# From: https://github.com/igieon/Leaflet.label/commit/f41dabbd6af7b1c156f055d3c6ee974fb683b918
+# From: https://github.com/igieon/Leaflet.label/commit/3c13acff459c36a222e9fdefd718af95396a0a9f
 # ------------------------------------------------------------
-version=f41dabbd6af7b1c156f055d3c6ee974fb683b918
+version=3c13acff459c36a222e9fdefd718af95396a0a9f
 	
 	
\ No newline at end of file
diff --git a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/Label.gwt.xml b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/Label.gwt.xml
index e7952d5..cd9f038 100644
--- a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/Label.gwt.xml
+++ b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/Label.gwt.xml
@@ -10,8 +10,8 @@
 	<inherits name="org.discotools.gwt.leaflet.Core"/>
 	
 	<!-- Ensure Leaflet search script and styles are pre-loaded -->
-	<script     src="libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label-src.js" />
-	<stylesheet src="libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.css" />
+	<script     src="libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label-src.js" />
+	<stylesheet src="libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.css" />
 	
 	<!-- GWT Leaflet source paths -->
 	<source path="client"></source>
diff --git a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label-src.js b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label-src.js
similarity index 93%
rename from src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label-src.js
rename to src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label-src.js
index 00604ec..c21e909 100644
--- a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label-src.js
+++ b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label-src.js
@@ -44,6 +44,24 @@ L.Label = L.Popup.extend({
 		}
 	},
 
+	onRemove: function (map) {
+		map._panes[this.options.pane].removeChild(this._container);
+
+		L.Util.falseFn(this._container.offsetWidth); // force reflow
+
+		map.off({
+			viewreset: this._updatePosition,
+			preclick: this._close,
+			zoomanim: this._zoomAnimation
+		}, this);
+
+		if (map.options.fadeAnimation) {
+			L.DomUtil.setOpacity(this._container, 0);
+		}
+
+		this._map = null;
+	},
+
 	close: function () {
 		var map = this._map;
 
diff --git a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.css b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.css
similarity index 100%
rename from src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.css
rename to src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.css
diff --git a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.js b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.js
new file mode 100644
index 0000000..2bf55a2
--- /dev/null
+++ b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/3c13acff459c36a222e9fdefd718af95396a0a9f/leaflet.label.js
@@ -0,0 +1,6 @@
+/*
+ Copyright (c) 2012, Smartrak, Jacob Toye
+ Leaflet.label is an open-source JavaScript library for adding labels to markers and paths on leaflet powered maps.
+ https://github.com/jacobtoye/Leaflet.label
+*/
+(function(e,t){L.Label=L.Popup.extend({options:{autoPan:!1,className:"",withoutDefaultStyle:!1,closePopupOnClick:!1,noHide:!1,pane:"popupPane",offset:new L.Point(12,-15)},onAdd:function(e){this._map=e,this._container||this._initLayout(),this._updateContent();var t=e.options.fadeAnimation;t&&L.DomUtil.setOpacity(this._container,0),e._panes[this.options.pane].appendChild(this._container),e.on("viewreset",this._updatePosition,this),L.Browser.any3d&&e.on("zoomanim",this._zoomAnimation,this),this._update(),t&&L.DomUtil.setOpacity(this._container,1)},onRemove:function(e){e._panes[this.options.pane].removeChild(this._container),L.Util.falseFn(this._container.offsetWidth),e.off({viewreset:this._updatePosition,preclick:this._close,zoomanim:this._zoomAnimation},this),e.options.fadeAnimation&&L.DomUtil.setOpacity(this._container,0),this._map=null},close:function(){var e=this._map;e&&(e._label=null,e.removeLayer(this))},_initLayout:function(){this._container=L.DomUtil.create("div",(this.options.withoutDefaultStyle?"leaflet-label-clear ":"leaflet-label ")+this.options.className+" leaflet-zoom-animated")},_updateContent:function(){if(!this._content)return;typeof this._content=="string"&&(this._container.innerHTML=this._content)},_updateLayout:function(){},_updatePosition:function(){var e=this._map.latLngToLayerPoint(this._latlng);this._setPosition(e)},_setPosition:function(e){e=e.add(this.options.offset),L.DomUtil.setPosition(this._container,e)},_zoomAnimation:function(e){var t=this._map._latLngToNewLayerPoint(this._latlng,e.zoom,e.center);this._setPosition(t)}}),L.Icon.Default.mergeOptions({labelAnchor:new L.Point(9,-20)}),L.Marker.mergeOptions({icon:new L.Icon.Default}),L.Marker.include({showLabel:function(){return this._label&&this._map&&(this._label.setLatLng(this._latlng),this._map.showLabel(this._label)),this},hideLabel:function(){return this._label&&this._label.close(),this},bindLabel:function(e,t){var n=L.point(this.options.icon.options.labelAnchor)||new L.Point(0,0);return n=n.add(L.Label.prototype.options.offset),t&&t.offset&&(n=n.add(t.offset)),t=L.Util.extend({offset:n},t),this._label||(t.noHide||(this.on("mouseover",this.showLabel,this).on("mouseout",this.hideLabel,this),L.Browser.touch&&this.on("click",this.showLabel,this)),this.on("remove",this.hideLabel,this).on("move",this._moveLabel,this),this._haslabelHandlers=!0),this._label=(new L.Label(t,this)).setContent(e),this},unbindLabel:function(){return this._label&&(this._label=null,this._haslabelHandlers&&(this.off("mouseover",this.showLabel).off("mouseout",this.hideLabel).off("remove",this.hideLabel).off("move",this._moveLabel),L.Browser.touch&&this.off("click",this.showLabel)),this._haslabelHandlers=!1),this},updateLabelContent:function(e){this._label&&this._label.setContent(e)},_moveLabel:function(e){this._label.setLatLng(e.latlng)}}),L.Path.include({bindLabel:function(e,t){if(!this._label||this._label.options!==t)this._label=new L.Label(t,this);return this._label.setContent(e),this._showLabelAdded||(this.on("mouseover",this._showLabel,this).on("mousemove",this._moveLabel,this).on("mouseout remove",this._hideLabel,this),L.Browser.touch&&this.on("click",this._showLabel,this),this._showLabelAdded=!0),this},unbindLabel:function(){return this._label&&(this._label=null,this._showLabelAdded=!1,this.off("mouseover",this._showLabel).off("mousemove",this._moveLabel).off("mouseout remove",this._hideLabel)),this},updateLabelContent:function(e){this._label&&this._label.setContent(e)},_showLabel:function(e){this._label.setLatLng(e.latlng),this._map.showLabel(this._label)},_moveLabel:function(e){this._label.setLatLng(e.latlng)},_hideLabel:function(){this._label.close()}}),L.Map.include({showLabel:function(e){return this._label=e,this.addLayer(e)}}),L.FeatureGroup.include({bindLabel:function(e,t){return this.invoke("bindLabel",e,t)},unbindLabel:function(){return this.invoke("unbindLabel")},updateLabelContent:function(e){this.invoke("updateLabelContent",e)}})})(this);
\ No newline at end of file
diff --git a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.js b/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.js
deleted file mode 100644
index 1a7f5c1..0000000
--- a/src/gwtl-label/src/main/resources/org/discotools/gwt/leaflet/public/libs/leaflet-label/f41dabbd6af7b1c156f055d3c6ee974fb683b918/leaflet.label.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- Copyright (c) 2012, Smartrak, Jacob Toye
- Leaflet.label is an open-source JavaScript library for adding labels to markers and paths on leaflet powered maps.
- https://github.com/jacobtoye/Leaflet.label
-*/
-(function(e,t){L.Label=L.Popup.extend({options:{autoPan:!1,className:"",withoutDefaultStyle:!1,closePopupOnClick:!1,noHide:!1,pane:"popupPane",offset:new L.Point(12,-15)},onAdd:function(e){this._map=e,this._container||this._initLayout(),this._updateContent();var t=e.options.fadeAnimation;t&&L.DomUtil.setOpacity(this._container,0),e._panes[this.options.pane].appendChild(this._container),e.on("viewreset",this._updatePosition,this),L.Browser.any3d&&e.on("zoomanim",this._zoomAnimation,this),this._update(),t&&L.DomUtil.setOpacity(this._container,1)},close:function(){var e=this._map;e&&(e._label=null,e.removeLayer(this))},_initLayout:function(){this._container=L.DomUtil.create("div",(this.options.withoutDefaultStyle?"leaflet-label-clear ":"leaflet-label ")+this.options.className+" leaflet-zoom-animated")},_updateContent:function(){if(!this._content)return;typeof this._content=="string"&&(this._container.innerHTML=this._content)},_updateLayout:function(){},_updatePosition:function(){var e=this._map.latLngToLayerPoint(this._latlng);this._setPosition(e)},_setPosition:function(e){e=e.add(this.options.offset),L.DomUtil.setPosition(this._container,e)},_zoomAnimation:function(e){var t=this._map._latLngToNewLayerPoint(this._latlng,e.zoom,e.center);this._setPosition(t)}}),L.Icon.Default.mergeOptions({labelAnchor:new L.Point(9,-20)}),L.Marker.mergeOptions({icon:new L.Icon.Default}),L.Marker.include({showLabel:function(){return this._label&&this._map&&(this._label.setLatLng(this._latlng),this._map.showLabel(this._label)),this},hideLabel:function(){return this._label&&this._label.close(),this},bindLabel:function(e,t){var n=L.point(this.options.icon.options.labelAnchor)||new L.Point(0,0);return n=n.add(L.Label.prototype.options.offset),t&&t.offset&&(n=n.add(t.offset)),t=L.Util.extend({offset:n},t),this._label||(t.noHide||(this.on("mouseover",this.showLabel,this).on("mouseout",this.hideLabel,this),L.Browser.touch&&this.on("click",this.showLabel,this)),this.on("remove",this.hideLabel,this).on("move",this._moveLabel,this),this._haslabelHandlers=!0),this._label=(new L.Label(t,this)).setContent(e),this},unbindLabel:function(){return this._label&&(this._label=null,this._haslabelHandlers&&(this.off("mouseover",this.showLabel).off("mouseout",this.hideLabel).off("remove",this.hideLabel).off("move",this._moveLabel),L.Browser.touch&&this.off("click",this.showLabel)),this._haslabelHandlers=!1),this},updateLabelContent:function(e){this._label&&this._label.setContent(e)},_moveLabel:function(e){this._label.setLatLng(e.latlng)}}),L.Path.include({bindLabel:function(e,t){if(!this._label||this._label.options!==t)this._label=new L.Label(t,this);return this._label.setContent(e),this._showLabelAdded||(this.on("mouseover",this._showLabel,this).on("mousemove",this._moveLabel,this).on("mouseout remove",this._hideLabel,this),L.Browser.touch&&this.on("click",this._showLabel,this),this._showLabelAdded=!0),this},unbindLabel:function(){return this._label&&(this._label=null,this._showLabelAdded=!1,this.off("mouseover",this._showLabel).off("mousemove",this._moveLabel).off("mouseout remove",this._hideLabel)),this},updateLabelContent:function(e){this._label&&this._label.setContent(e)},_showLabel:function(e){this._label.setLatLng(e.latlng),this._map.showLabel(this._label)},_moveLabel:function(e){this._label.setLatLng(e.latlng)},_hideLabel:function(){this._label.close()}}),L.Map.include({showLabel:function(e){return this._label=e,this.addLayer(e)}}),L.FeatureGroup.include({bindLabel:function(e,t){return this.invoke("bindLabel",e,t)},unbindLabel:function(){return this.invoke("unbindLabel")},updateLabelContent:function(e){this.invoke("updateLabelContent",e)}})})(this);
\ No newline at end of file

From 38eaa34ac47026285e6d70124e150b7a9fb3d338 Mon Sep 17 00:00:00 2001
From: David Ignjic <ignjic@gmail.com>
Date: Tue, 20 Nov 2012 15:37:41 +0100
Subject: [PATCH 5/8] Add getContainer method to Map

---
 .../org/discotools/gwt/leaflet/client/map/Map.java     | 10 ++++++++++
 .../org/discotools/gwt/leaflet/client/map/MapImpl.java |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
index b2e25b6..27f2ae1 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
@@ -10,6 +10,8 @@
 import org.discotools.gwt.leaflet.client.types.LatLngBounds;
 import org.discotools.gwt.leaflet.client.types.Point;
 
+import com.google.gwt.dom.client.Element;
+
 /**
  * The central class of the API — it is used to create a map on a page and manipulate it.
  * 
@@ -146,4 +148,12 @@ public Map invalidateSize(boolean animate){
         MapImpl.invalidateSize(getJSObject(),animate);
         return this;
     }
+
+    /**
+     * 
+     * @return Returns the container element of the map.
+     */
+    public Element getContainer() {
+        return MapImpl.getContainer(getJSObject());
+    }
 }
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
index b0274db..3e2e02e 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
@@ -3,6 +3,8 @@
 import org.discotools.gwt.leaflet.client.jsobject.JSObject;
 import org.discotools.gwt.leaflet.client.types.Point;
 
+import com.google.gwt.dom.client.Element;
+
 /**
  * Map implementation
  * @author Lionel Leiva-Marcon
@@ -117,6 +119,12 @@ public static native void invalidateSize(JSObject self, boolean animate) /*-{
     }-*/;
 
 
+    public static native Element getContainer(JSObject self) /*-{
+        return self.getContainer();
+    }-*/;
+
+
+
 
 
 

From 955ad012913bb41db5c649fe847272193430dfc7 Mon Sep 17 00:00:00 2001
From: David Ignjic <david.ignjic@plaut.sk>
Date: Wed, 21 Nov 2012 11:18:10 +0100
Subject: [PATCH 6/8] Added method panInsideBounds to Map

---
 .../org/discotools/gwt/leaflet/client/map/Map.java     | 10 ++++++++++
 .../org/discotools/gwt/leaflet/client/map/MapImpl.java |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
index 27f2ae1..53fc40b 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
@@ -156,4 +156,14 @@ public Map invalidateSize(boolean animate){
     public Element getContainer() {
         return MapImpl.getContainer(getJSObject());
     }
+
+    /**
+     * Pans the map to the closest view that would lie inside the given bounds (if it's not already).
+     * @param bounds
+     * @return
+     */
+    public Map panInsideBounds(LatLngBounds bounds) {
+        MapImpl.panInsideBounds(getJSObject(),bounds.getJSObject());
+        return this;
+    }
 }
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
index 3e2e02e..05d9548 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
@@ -124,6 +124,12 @@ public static native Element getContainer(JSObject self) /*-{
     }-*/;
 
 
+    public static native void panInsideBounds(JSObject self, JSObject bound) /*-{
+        self.panInsideBounds(bound);
+    }-*/;
+
+
+
 
 
 

From 97f438663c747a19912ea387e59d98c0a2b4ac7d Mon Sep 17 00:00:00 2001
From: David Ignjic <david.ignjic@plaut.sk>
Date: Wed, 21 Nov 2012 17:50:33 +0100
Subject: [PATCH 7/8] Add DivIcon Fix in IconImpl, LayerGroup

---
 .../client/layers/others/LayerGroup.java      |  2 +-
 .../gwt/leaflet/client/types/DivIcon.java     | 21 +++++++
 .../gwt/leaflet/client/types/DivIconImpl.java | 19 +++++++
 .../leaflet/client/types/DivIconOptions.java  | 55 +++++++++++++++++++
 .../gwt/leaflet/client/types/IconImpl.java    |  2 +-
 5 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIcon.java
 create mode 100644 src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconImpl.java
 create mode 100644 src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconOptions.java

diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/layers/others/LayerGroup.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/layers/others/LayerGroup.java
index 0ba0ff0..4f476b4 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/layers/others/LayerGroup.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/layers/others/LayerGroup.java
@@ -39,7 +39,7 @@ public LayerGroup(String alias, ILayer[] layers) {
 	 * 
 	 */
 	public LayerGroup addLayer(ILayer layer) {
-		LayerGroupImpl.addTo(getJSObject(), layer.getJSObject());
+		LayerGroupImpl.addLayer(getJSObject(), layer.getJSObject());
 		return this;
 	}
 
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIcon.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIcon.java
new file mode 100644
index 0000000..13542b4
--- /dev/null
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIcon.java
@@ -0,0 +1,21 @@
+package org.discotools.gwt.leaflet.client.types;
+
+import org.discotools.gwt.leaflet.client.jsobject.JSObject;
+
+/**
+ * Represents a lightweight icon for markers that uses a simple div element instead of an image.
+ * 
+ * @author David Ignjic
+ *
+ */
+public class DivIcon extends Icon {
+
+    public DivIcon(JSObject element) {
+        super(element);
+    }
+
+    public DivIcon(DivIconOptions options) {
+        super(DivIconImpl.create(options.getJSObject()));
+    }
+
+}
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconImpl.java
new file mode 100644
index 0000000..d7fc8aa
--- /dev/null
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconImpl.java
@@ -0,0 +1,19 @@
+package org.discotools.gwt.leaflet.client.types;
+
+import org.discotools.gwt.leaflet.client.jsobject.JSObject;
+
+/**
+ * {@link Icon} implementation.
+ *
+ * @author Lionel Leiva-Marcon
+ */
+public class DivIconImpl {
+
+	/**
+	 * IconImpl overlay type constructor. 
+	 */
+	public static native JSObject create(JSObject options)/*-{
+		return new $wnd.L.DivIcon(options);
+	}-*/;
+
+}
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconOptions.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconOptions.java
new file mode 100644
index 0000000..bebe5b8
--- /dev/null
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/DivIconOptions.java
@@ -0,0 +1,55 @@
+package org.discotools.gwt.leaflet.client.types;
+
+import org.discotools.gwt.leaflet.client.Options;
+
+
+/**
+ * IconControlOptions class
+ * @author Lionel Leiva-Marcon
+ *
+ */
+public class DivIconOptions extends Options  {
+
+	public DivIconOptions() {
+		 super();
+	}
+
+    /**
+     *The coordinates of the "tip" of the icon (relative to its top left corner). 
+     *The icon will be aligned so that this point is at the marker's geographical location. 
+     *Centered by default if size is specified, also can be set in CSS with negative margins.
+     * @param iconSize
+     */
+    public DivIconOptions setIconAnchor(Point iconAnchor) {
+        return (DivIconOptions)setProperty("iconAnchor", iconAnchor);
+    }
+
+    
+	/**
+	 * Size of the icon in pixels. Can be also set through CSS.
+	 * @param iconSize
+	 */
+	public DivIconOptions setIconSize(Point iconSize) {
+		return (DivIconOptions)setProperty("iconSize", iconSize);
+	}
+	
+
+    /**
+     * A custom class name to assign to the icon. 'leaflet-div-icon' by default.
+     * @param className
+     */
+    public DivIconOptions setClassName(String className) {
+        return (DivIconOptions)setProperty("className", className);
+    }
+
+    /**
+     * A custom HTML code to put inside the div element, empty by default.
+     * @param html
+     */
+    public DivIconOptions setHtml(String html) {
+        return (DivIconOptions)setProperty("html", html);
+    }
+    
+
+	
+}
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/IconImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/IconImpl.java
index c148f8e..8aa9fc3 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/IconImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/types/IconImpl.java
@@ -13,7 +13,7 @@ public class IconImpl {
 	 * IconImpl overlay type constructor. 
 	 */
 	public static native JSObject create(JSObject options)/*-{
-		return new $wnd.L.icon(options);
+		return new $wnd.L.Icon(options);
 	}-*/;
 
 }

From 6816a7499343e230e4496a958d86d33ecdc4e7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kenneth=20Gulbrands=C3=B8y?= <kenneth.gulbrandsoy@gmail.com>
Date: Wed, 21 Nov 2012 23:20:24 +0100
Subject: [PATCH 8/8] Added control unit tests (partial). Minor changes to API
 and documentation

---
 .../gwt/leaflet/client/controls/Control.java  |  7 +-
 .../leaflet/client/controls/ControlImpl.java  | 10 +--
 .../client/controls/ControlOptions.java       |  7 +-
 .../gwt/leaflet/client/controls/IControl.java | 34 +++++++--
 .../controls/attribution/Attribution.java     | 20 ++++--
 .../controls/attribution/AttributionImpl.java | 12 ++--
 .../attribution/AttributionOptions.java       |  7 ++
 .../gwt/leaflet/client/map/Map.java           | 31 ++++++++
 .../gwt/leaflet/client/map/MapImpl.java       | 26 ++++---
 .../gwt/leaflet/client/GwtlTestCase.java      | 38 ++++++++++
 .../gwt/leaflet/client/OptionsGwtlTest.java   |  1 -
 .../client/controls/ControlGwtlTest.java      | 17 ++---
 .../client/controls/ControlImplGwtlTest.java  | 71 +++++++++++++++++++
 .../controls/ControlOptionsGwtlTest.java      | 20 ++++++
 .../attribution/AttributionGwtlTest.java      | 25 +++++++
 15 files changed, 283 insertions(+), 43 deletions(-)
 create mode 100644 src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlImplGwtlTest.java
 create mode 100644 src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlOptionsGwtlTest.java
 create mode 100644 src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionGwtlTest.java

diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/Control.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/Control.java
index 240a670..6208d34 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/Control.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/Control.java
@@ -24,12 +24,17 @@
  */
 public class Control extends IControl {
 
+	/**
+	 * The position of the control (one of the map corners).
+	 */
+	public static final String POSITION = "position";
+
 	protected Control(JSObject element) {
 		super(element);
 	}
 
 	/**
-	 * Default constructor
+	 * Custom constructor
 	 * @param options
 	 */
 	public Control(Options options) {
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlImpl.java
index 0ec8985..7c88feb 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlImpl.java
@@ -19,16 +19,16 @@ public static native String getPosition(JSObject self) /*-{
     }-*/;
 
 
-	public static native JSObject setPosition(JSObject self,String position) /*-{		
+	public static native void setPosition(JSObject self,String position) /*-{		
 		self.setPosition(position);
 	}-*/;
 
-	public static native JSObject addTo(JSObject self, JSObject map)/*-{
-		return self.addTo(map);
+	public static native void addTo(JSObject self, JSObject map)/*-{
+		self.addTo(map);
 	}-*/;
 
-	public static native JSObject removeFrom(JSObject self,JSObject map) /*-{		
-		self.removeFrom(map);
+	public static native void removeFrom(JSObject self, JSObject map) /*-{
+		self.removeFrom(map);		
 	}-*/;
 
 }
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlOptions.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlOptions.java
index e7c9c99..4deca71 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlOptions.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/ControlOptions.java
@@ -11,8 +11,13 @@
 public class ControlOptions extends Options  {
 
 	public ControlOptions() {
-		 super();
+		super();
 	}
+	
+	public ControlOptions(String position) {
+		super();
+		setPosition(position);
+	}	
 
 	public ControlOptions setPosition(String position) {
 		 return (ControlOptions)setProperty("position", position);
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/IControl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/IControl.java
index b784737..777f763 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/IControl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/IControl.java
@@ -48,18 +48,29 @@ protected IControl(JSObject jsObject) {
 	/**
 	 * <b>Add control to given {@link Map} instance</b>.
 	 * <p>
-	 * Should contain code that creates all the necessary {@link DOM} elements for the control, 
-	 * adds listeners on relevant map events, and returns the element containing the control.
-	 * <p>
 	 * Called on {@link Map#addControl(ILControl)} or control.addTo(map).
 	 * </p>
 	 * @param map - {@link Map} instance
 	 * @return {@link Element}
+	 * @see #onAdd(JavaScriptObject)
 	 */
 	public final Element onAdd(Map map) {
 		return onAdd(map.getJSObject());
 	}
 
+	/**
+	 * JSNI Callback invoked when this is added to given map.
+	 * <p>
+	 * This callback is activated by {@link IControlImpl#onAdd(Control, JSObject)}
+	 * <p>
+	 * Should contain code that creates all the necessary {@link DOM} elements for the control, 
+	 * adds listeners on relevant map events, and returns the element containing the control.
+	 * <p>
+	 * <b>Note</b>: Default implementation forwards to JSNI implementation, 
+	 * making this a wrapper around a third-party implementation.
+	 * <p>  
+	 * @return {@link Element}
+	 */
 	protected Element onAdd(JavaScriptObject map) {
 		return IControlImpl.onAdd(getJSObject(), map);
 	}
@@ -67,10 +78,7 @@ protected Element onAdd(JavaScriptObject map) {
 	/**
 	 * <b>Remove control from given {@link Map} instance (optional)</b>
 	 * <p>
-	 * Should contain all clean up code (removes control's event listeners etc). 
-	 * 
 	 * Called on map.removeControl(control) or control.removeFrom(map). 
-	 * The control's DOM container is removed automatically.
 	 * 
 	 * @param map -
 	 */
@@ -78,6 +86,20 @@ public final IControl onRemove(Map map) {
 		return onRemove(map.getJSObject());
 	}
 	
+	/**
+	 * JSNI callback invoked when this is removed to given map.
+	 * <p>
+	 * This callback is activated by {@link IControlImpl#onRemove(Control, JSObject)}
+	 * <p>
+	 * Should contain all clean up code (removes control's event listeners etc).
+	 * The control's DOM container is removed automatically.
+	 * <p> 
+	 * <b>Note</b>: Default implementation forwards to JSNI implementation, 
+	 * making this a wrapper around a third-party implementation.
+	 * 
+	 * @param map
+	 * @return
+	 */
 	protected IControl onRemove(JavaScriptObject map) {
 		IControlImpl.onRemove(getJSObject(), map);
 		return this;
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/Attribution.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/Attribution.java
index 0f16e78..1195b79 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/Attribution.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/Attribution.java
@@ -44,31 +44,41 @@ public Attribution(AttributionOptions options) {
 	}
 	
 	public Attribution(String text, AttributionOptions options) {
-		super(AttributionImpl.create(text, options.getJSObject()));
+		super(AttributionImpl.create(text, options.getJSObject()));		
 	}
-		
+
+	/**
+	 * Get the string before the attributions ("Powered by Leaflet" by default).
+	 */
+	public String getPrefix() {
+		return AttributionImpl.getPrefix(getJSObject());
+	}
+	
 	/**
 	 * Sets the string before the attributions ("Powered by Leaflet" by default).
 	 * @param text - {@link Attribution} prefix.
 	 */
-	void setPrefix(String text) {
+	public Attribution setPrefix(String text) {
 		AttributionImpl.setPrefix(getJSObject(), text);
+		return this;
 	}
 
 	/**
 	 * Adds an attribution text (e.g. "Vector data &copy; CloudMade").
 	 * @param text - {@link Attribution} text.
 	 */
-	void addAttribution(String text) {
+	public Attribution addAttribution(String text) {
 		AttributionImpl.addAttribution(getJSObject(), text);
+		return this;
 	}
 
 	/**
 	 * Removes an attribution text.
 	 * @param text - {@link Attribution} text.
 	 */
-	void removeAttribution(String text) {
+	public Attribution removeAttribution(String text) {
 		AttributionImpl.removeAttribution(getJSObject(), text);
+		return this;
 	}
 	
 }
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionImpl.java
index e14cb50..7bc8c06 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionImpl.java
@@ -21,15 +21,19 @@ public static native JSObject create(String text, JSObject options) /*-{
 		return a;	
 	}-*/;
 	
-	public static native void setPrefix(JSObject self, String text) /*-{	
-		return self.setPrefix(text);
+	public static native String getPrefix(JSObject self) /*-{	
+		return self.options.prefix;
 	}-*/;	
 	
+	public static native void setPrefix(JSObject self, String text) /*-{	
+		self.setPrefix(text);
+	}-*/;
+	
 	public static native void addAttribution(JSObject self, String text) /*-{	
-		return self.addAttribution(text);
+		self.addAttribution(text);
 	}-*/;	
 
 	public static native void removeAttribution(JSObject self, String text) /*-{	
-		return self.addAttribution(text);
+		self.removeAttribution(text);
 	}-*/;	
 }
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionOptions.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionOptions.java
index 552a7f1..a61020f 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionOptions.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionOptions.java
@@ -13,6 +13,13 @@ public class AttributionOptions extends ControlOptions  {
 	public AttributionOptions() {
 		 super();
 	}
+	
+	public AttributionOptions(String prefix, String position) {
+		 super();
+		 setPrefix(prefix);
+		 setPosition(position);
+	}
+	
 
 	/**
 	 * The position of the control (one of the map corners). 
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
index 53fc40b..484bc02 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/Map.java
@@ -28,10 +28,25 @@ protected Map(JSObject e) {
         super(e);
     }
 
+    public Map(String name) {
+        this(name, new MapOptions());
+    } 
+    
     public Map(String name, MapOptions options) {
         this(MapImpl.create(name, options.getJSObject()));
     } 
     
+    /**
+     * Sets the view of the map (geographical center and zoom).
+     * <p> 
+     * If 'reset' is set to <code>true</code>, the map is reloaded 
+     * even if it's eligible for pan or zoom animation (false by default).
+     * 
+     * @param center - {@link LatLng} instance
+     * @param zoom - Map zoom 
+     * @param reset - Force reset of map
+     * @return {@link Map}
+     */
     public Map setView(LatLng center, double zoom, boolean reset) {
     	MapImpl.setView(getJSObject(), center.getJSObject(), zoom, reset);
     	return this;
@@ -62,11 +77,27 @@ public Map addLayer(ILayer layer) {
     	return this;
     }
     
+    /**
+     * Adds the given control to the map.
+     * @param control - {@link IControl} instance
+     * @return {@link Map}
+     */
     public Map addControl(IControl control) {
     	MapImpl.addControl(getJSObject(), control.getJSObject());
     	return this;
     }
     
+    /**
+     * Removes the given control from the map.
+     * @param control
+     * @return {@link Map}
+     */
+    public Map removeControl(IControl control) {
+    	MapImpl.removeControl(getJSObject(), control.getJSObject());
+    	return this;
+    }
+    
+    
     public Map fitBounds(LatLngBounds bounds) {
     	MapImpl.fitBounds(getJSObject(), bounds.getJSObject());		
     	return this;
diff --git a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
index 05d9548..126ea7f 100644
--- a/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
+++ b/src/gwtl-core/src/main/java/org/discotools/gwt/leaflet/client/map/MapImpl.java
@@ -13,17 +13,23 @@ class MapImpl {
  
 	public static native JSObject create(String name, JSObject options) /*-{
 	
+		// Verify map place holder element exists
+		var div = $doc.getElementById(name);		
+		if(typeof(div) === 'undefined' || div === null) {
+			throw "Element '"+name+"' does not exist";
+		}
+		
 		// Initialize maps array?
-		if($wnd.gwtl==undefined) {
+		if($wnd.gwtl === undefined) {
 			$wnd.gwtl = [];
 			$wnd.gwtl.maps = [];
 		}
 	
-		// 'name' is also by third-party javascript, rename to prevent mangling.
+		// 'name' is also used by third-party javascript, rename to prevent mangling.
 		var _name = name;
-	
+		
 		// Initialize the map on the "name" div with a given center and zoom
-		var map = $wnd.L.map(_name, options);	
+		var map = $wnd.L.map(name, options);
 			
 		// Set gwt attributes
 		map.gwt = [];
@@ -57,21 +63,25 @@ public static JSObject addLayer(JSObject self,JSObject layer) {
 		return addLayer(self, layer, false);
 	}
 
-	public static native JSObject addLayer(JSObject self,JSObject layer, boolean bottom) /*-{	
+	public static native JSObject addLayer(JSObject self, JSObject layer, boolean bottom) /*-{	
 		self.addLayer(layer,bottom); 
 		return self;
 	}-*/;
 	
-    public static native JSObject removeLayer(JSObject self,JSObject layer) /*-{  
+    public static native JSObject removeLayer(JSObject self, JSObject layer) /*-{  
         self.removeLayer(layer); 
         return self;
     }-*/;
     
-	public static native JSObject addControl(JSObject self,JSObject control) /*-{	
-		self.addControl(control); 		
+	public static native JSObject addControl(JSObject self, JSObject control) /*-{	
+		self.addControl(control);
 		return self;
 	}-*/;
 
+	public static native JSObject removeControl(JSObject self,JSObject control) /*-{	
+		self.removeControl(control); 		
+		return self;
+	}-*/;
 	
 	public static native JSObject fitBounds(JSObject self,JSObject bounds) /*-{	
 		self.fitBounds(bounds); 		
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/GwtlTestCase.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/GwtlTestCase.java
index 6545b56..9c9a3b5 100644
--- a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/GwtlTestCase.java
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/GwtlTestCase.java
@@ -1,6 +1,12 @@
 package org.discotools.gwt.leaflet.client;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.gwt.junit.client.GWTTestCase;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.ui.RootPanel;
 
 public class GwtlTestCase extends GWTTestCase {
 
@@ -12,7 +18,39 @@ public class GwtlTestCase extends GWTTestCase {
 	public String getModuleName() {
 		return NAME;
 	}
+	
+	/**
+	 * This method defensively cleanup the {@link DOM} after each test run
+	 */
+	@Override
+	protected void gwtTearDown() throws Exception {
+		cleanup();
+	}
+	
+	/**
+	 * This method defensively cleanup the {@link DOM} after each test run
+	 */
+	protected void cleanup() {
+		Element bodyElem = RootPanel.getBodyElement();
 
+	    List<Element> toRemove = new ArrayList<Element>();
+	    for (int i = 0, n = DOM.getChildCount(bodyElem); i < n; ++i) {
+	      Element elem = DOM.getChild(bodyElem, i);
+	      String nodeName = getNodeName(elem);
+	      if (!"script".equals(nodeName) && !"iframe".equals(nodeName)) {
+	        toRemove.add(elem);
+	      }
+	    }
+
+	    for (int i = 0, n = toRemove.size(); i < n; ++i) {
+	      DOM.removeChild(bodyElem, toRemove.get(i));
+	    }		
+	}
+	
+	protected static native String getNodeName(Element elem) /*-{
+	    return (elem.nodeName || "").toLowerCase();
+	 }-*/;	
+	
 	protected static void logTest(String test, String... args) {
 		StringBuffer b = new StringBuffer(test);
 		b.append("(");
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/OptionsGwtlTest.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/OptionsGwtlTest.java
index 4ccc598..139261f 100644
--- a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/OptionsGwtlTest.java
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/OptionsGwtlTest.java
@@ -3,7 +3,6 @@
 import org.discotools.gwt.leaflet.client.GwtlTestCase;
 import org.discotools.gwt.leaflet.client.jsobject.JSObject;
 import org.discotools.gwt.leaflet.client.jsobject.JSObjectArray;
-import org.discotools.gwt.leaflet.client.jsobject.JSObjectHelper;
 
 /**
  * {@link Control} tests
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlGwtlTest.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlGwtlTest.java
index 974434c..2d89907 100644
--- a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlGwtlTest.java
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlGwtlTest.java
@@ -9,18 +9,11 @@
  */
 public class ControlGwtlTest extends GwtlTestCase {
 	
-	public void testControlOptions() {
-		logTest("testControlOptions","{ position: \"left\" }");
-		ControlOptions o = new ControlOptions();
-		o.setPosition("left");
-		Control c = new Control(o);
-		assertEquals(c.getPosition(),"left");
-	}
-
-	public void testNewControl() {
-		logTest("testNewControl","{}");
-		Control c = new Control(new ControlOptions());
-		assertNotNull(c);
+	public void testControl() {
+		logTest("testControl","\""+Position.BOTTOM_LEFT+"\" }");
+		Control c = new Control(new ControlOptions(Position.BOTTOM_LEFT));
+		c.setPosition(Position.BOTTOM_RIGHT);
+		assertEquals(Position.BOTTOM_RIGHT,c.getPosition());
 	}
 	
 }
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlImplGwtlTest.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlImplGwtlTest.java
new file mode 100644
index 0000000..05e7495
--- /dev/null
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlImplGwtlTest.java
@@ -0,0 +1,71 @@
+package org.discotools.gwt.leaflet.client.controls;
+
+import org.discotools.gwt.leaflet.client.GwtlTestCase;
+import org.discotools.gwt.leaflet.client.Options;
+import org.discotools.gwt.leaflet.client.map.Map;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.ui.RootPanel;
+
+/**
+ * {@link Control} tests
+ * @author kengu
+ *
+ */
+public class ControlImplGwtlTest extends GwtlTestCase {
+	
+	private static final String NAME  = "name";
+	
+	public void testControlImpl() {
+		
+		logTest("testControlImpl","{}");
+		
+		// Add map placeholder div
+		cleanup();
+		Element div = DOM.createDiv();
+		div.setId(NAME);
+		RootPanel.getBodyElement().appendChild(div);
+		// Create map and control
+		Map map = new Map(NAME);
+		ControlImpl c = new ControlImpl();
+		// Ensure map not set  
+		assertFalse(c.isAdded());
+		// Assert 'onAdd'
+		map.addControl(c);
+		assertTrue("'IControl::onAdd' callback is broken",c.isAdded());
+		// Assert 'onRemove'  
+		map.removeControl(c);
+		assertFalse("'IControl::onRemove' callback is broken",c.isAdded());
+	}
+	
+	private static class ControlImpl extends Control {
+		
+		boolean isAdded;
+
+		public ControlImpl() {
+			super(new Options(), true, true);
+		}
+		
+		public boolean isAdded() {
+			return isAdded;
+		}
+
+		@Override
+		protected Element onAdd(JavaScriptObject map) {
+			isAdded = true;
+			return DOM.createDiv();
+		}
+
+		@Override
+		protected IControl onRemove(JavaScriptObject map) {
+			isAdded = false;
+			return this;
+		}
+		
+	}
+	
+	
+	
+}
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlOptionsGwtlTest.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlOptionsGwtlTest.java
new file mode 100644
index 0000000..3adaa44
--- /dev/null
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/ControlOptionsGwtlTest.java
@@ -0,0 +1,20 @@
+package org.discotools.gwt.leaflet.client.controls;
+
+import org.discotools.gwt.leaflet.client.GwtlTestCase;
+
+/**
+ * {@link Control} tests
+ * @author kengu
+ *
+ */
+public class ControlOptionsGwtlTest extends GwtlTestCase {
+	
+	public void testControlOptions() {
+		logTest("testControlOptions","{ position: \""+Position.BOTTOM_LEFT+"\" }");
+		ControlOptions o = new ControlOptions();
+		o.setPosition(Position.BOTTOM_LEFT);
+		Control c = new Control(o);
+		assertEquals(Position.BOTTOM_LEFT, c.getPosition());
+	}
+
+}
diff --git a/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionGwtlTest.java b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionGwtlTest.java
new file mode 100644
index 0000000..06860b7
--- /dev/null
+++ b/src/gwtl-core/src/test/java/org/discotools/gwt/leaflet/client/controls/attribution/AttributionGwtlTest.java
@@ -0,0 +1,25 @@
+package org.discotools.gwt.leaflet.client.controls.attribution;
+
+import org.discotools.gwt.leaflet.client.GwtlTestCase;
+import org.discotools.gwt.leaflet.client.controls.Control;
+import org.discotools.gwt.leaflet.client.controls.Position;
+
+/**
+ * {@link Control} tests
+ * @author kengu
+ *
+ */
+public class AttributionGwtlTest extends GwtlTestCase {
+	
+	private static final String PREFIX = "prefix";
+	private static final String TEXT = "text";
+
+	public void testAttribution() {
+		logTest("testAttribution","{}");
+		AttributionOptions options = new AttributionOptions(PREFIX,Position.BOTTOM_RIGHT);
+		Attribution c = new Attribution(TEXT, options);
+		assertEquals(Position.BOTTOM_RIGHT,c.getPosition());		
+		assertEquals(PREFIX,c.getPrefix());		
+	}
+	
+}