From a3a15a470ed6118a42d75ab71b4ee99c66eaeb3a Mon Sep 17 00:00:00 2001
From: w8r <info@w8r.name>
Date: Wed, 12 Nov 2014 14:04:34 +0100
Subject: [PATCH] input/output formats

---
 dist/greiner-hormann.es5.js         | 35 ++++++++++++++++-------------
 dist/greiner-hormann.es5.min.js     | 12 +++++-----
 dist/greiner-hormann.js             | 35 ++++++++++++++++-------------
 dist/greiner-hormann.leaflet.js     | 35 ++++++++++++++++-------------
 dist/greiner-hormann.leaflet.min.js | 14 ++++++------
 dist/greiner-hormann.min.js         | 13 ++++++-----
 src/driver.js                       |  4 ++--
 src/driver.leaflet.js               |  4 ++--
 src/end.js                          | 22 +++++++++---------
 src/polygon.js                      |  9 +++++---
 test/suite.js                       |  4 ++--
 11 files changed, 104 insertions(+), 83 deletions(-)

diff --git a/dist/greiner-hormann.es5.js b/dist/greiner-hormann.es5.js
index 7d11b58..48d60b7 100644
--- a/dist/greiner-hormann.es5.js
+++ b/dist/greiner-hormann.es5.js
@@ -473,15 +473,18 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
             current = current._corresponding;
         } while (!current._visited);
 
-        list.push(clipped);
+        list.push(clipped.getPoints());
     }
 
     if (list.length === 0) {
         if (sourceInClip) {
-            list.push(this);
+            list.push(this.getPoints());
         }
         if (clipInSource) {
-            list.push(clip);
+            list.push(clip.getPoints());
+        }
+        if (list.length === 0) {
+            list = null;
         }
     }
 
@@ -494,8 +497,8 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
  * @api
  * @param  {Array.<Array.<Number>>} polygonA
  * @param  {Array.<Array.<Number>>} polygonB
- * @param  {Boolean} sourceForwards
- * @param  {Boolean} clipForwards
+ * @param  {Boolean}                sourceForwards
+ * @param  {Boolean}                clipForwards
  * @return {Array.<Array.<Number>>}
  */
 function clip(polygonA, polygonB, eA, eB) {
@@ -508,9 +511,9 @@ function clip(polygonA, polygonB, eA, eB) {
 return {
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>|Null}
      */
     union: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, false);
@@ -518,9 +521,9 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     intersection: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, true, true);
@@ -528,13 +531,15 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     diff: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, true);
-    }
+    },
+
+    clip: clip
 };
 
 }));
diff --git a/dist/greiner-hormann.es5.min.js b/dist/greiner-hormann.es5.min.js
index 8de227e..6622b16 100644
--- a/dist/greiner-hormann.es5.min.js
+++ b/dist/greiner-hormann.es5.min.js
@@ -1,9 +1,9 @@
 /*
  Licensed under MIT License
 */
-function l(){function k(a,c){this.k=this.first=null;this.p="undefined"===typeof c?Array.isArray(a[0]):c;for(var b=0,d=a.length;b<d;b++)this.g(new h(a[b]))}function n(a,c,b,d){this.i=this.toSource=this.y=this.x=0;var e=(d.y-b.y)*(c.x-a.x)-(d.x-b.x)*(c.y-a.y);0!==e&&(this.toSource=((d.x-b.x)*(a.y-b.y)-(d.y-b.y)*(a.x-b.x))/e,this.i=((c.x-a.x)*(a.y-b.y)-(c.y-a.y)*(a.x-b.x))/e,this.valid()&&(this.x=a.x+this.toSource*(c.x-a.x),this.y=a.y+this.toSource*(c.y-a.y)))}function h(a,c){1===arguments.length&&(Array.isArray(a)?
-(c=a[1],a=a[0]):(c=a.y,a=a.x));this.x=a;this.y=c;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function m(a,c,b,d){a=new k(a);c=new k(c);return a.clip(c,b,d)}h.l=function(a,c,b){a=new h(a,c);a.j=b;a.a=!0;a.f=!1;return a};h.prototype.o=function(){this.e=!0;null===this.d||this.d.e||this.d.o()};h.prototype.b=function(a){return this.x===a.x&&this.y===a.y};h.prototype.n=function(a){var c=!1,b=a.first,d=b.next,e=this.x,g=this.y;do(b.y<g&&d.y>=g||d.y<g&&b.y>=g)&&(b.x<=e||d.x<=e)&&(c^=
-b.x+(g-b.y)/(d.y-b.y)*(d.x-b.x)<e),b=b.next,d=b.next||a.first;while(!b.b(a.first));return c};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var c=this.first,b=c.c;c.c=a;a.next=c;a.c=b;b.next=a}};k.prototype.m=function(a,c,b){for(;!c.b(b)&&c.j<a.j;)c=c.next;a.next=c;b=c.c;a.c=b;b.next=a;c.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;return a};k.prototype.r=
-function(){var a=this.q||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.q=a};k.prototype.s=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.clip=function(a,c,b){var d=this.first,e=a.first,g,f;do{if(!d.a){do e.a||(f=new n(d,this.h(d.next),e,a.h(e.next)),f.valid()&&(g=h.l(f.x,f.y,f.toSource),f=h.l(f.x,f.y,f.i),g.d=f,f.d=g,this.m(g,d,this.h(d.next)),a.m(f,e,a.h(e.next)))),e=e.next;
-while(!e.b(a.first))}d=d.next}while(!d.b(this.first));d=this.first;e=a.first;g=d.n(a);f=e.n(this);c^=g;b^=f;do d.a&&(d.f=c,c=!c),d=d.next;while(!d.b(this.first));do e.a&&(e.f=b,b=!b),e=e.next;while(!e.b(a.first));for(c=[];this.s();){b=this.r();d=new k([],this.p);d.g(new h(b.x,b.y));do{b.o();if(b.f){do b=b.next,d.g(new h(b.x,b.y));while(!b.a)}else{do b=b.c,d.g(new h(b.x,b.y));while(!b.a)}b=b.d}while(!b.e);c.push(d)}0===c.length&&(g&&c.push(this),f&&c.push(a));return c};return{union:function(a,c){return m(a,
-c,!1,!1)},intersection:function(a,c){return m(a,c,!0,!0)},diff:function(a,c){return m(a,c,!1,!0)}}}"function"===typeof define&&define.t?define([],l):"object"===typeof exports?module.exports=l():window.greinerHormann=l();
+function m(){function k(a,b){this.k=this.first=null;this.m="undefined"===typeof b?Array.isArray(a[0]):b;for(var c=0,d=a.length;c<d;c++)this.g(new h(a[c]))}function n(a,b,c,d){this.i=this.toSource=this.y=this.x=0;var e=(d.y-c.y)*(b.x-a.x)-(d.x-c.x)*(b.y-a.y);0!==e&&(this.toSource=((d.x-c.x)*(a.y-c.y)-(d.y-c.y)*(a.x-c.x))/e,this.i=((b.x-a.x)*(a.y-c.y)-(b.y-a.y)*(a.x-c.x))/e,this.valid()&&(this.x=a.x+this.toSource*(b.x-a.x),this.y=a.y+this.toSource*(b.y-a.y)))}function h(a,b){1===arguments.length&&(Array.isArray(a)?
+(b=a[1],a=a[0]):(b=a.y,a=a.x));this.x=a;this.y=b;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function l(a,b,c,d){a=new k(a);b=new k(b);return a.clip(b,c,d)}h.n=function(a,b,c){a=new h(a,b);a.j=c;a.a=!0;a.f=!1;return a};h.prototype.q=function(){this.e=!0;null===this.d||this.d.e||this.d.q()};h.prototype.b=function(a){return this.x===a.x&&this.y===a.y};h.prototype.p=function(a){var b=!1,c=a.first,d=c.next,e=this.x,g=this.y;do(c.y<g&&d.y>=g||d.y<g&&c.y>=g)&&(c.x<=e||d.x<=e)&&(b^=
+c.x+(g-c.y)/(d.y-c.y)*(d.x-c.x)<e),c=c.next,d=c.next||a.first;while(!c.b(a.first));return b};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var b=this.first,c=b.c;b.c=a;a.next=b;a.c=c;c.next=a}};k.prototype.o=function(a,b,c){for(;!b.b(c)&&b.j<a.j;)b=b.next;a.next=b;c=b.c;a.c=c;c.next=a;b.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;return a};k.prototype.s=
+function(){var a=this.r||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.r=a};k.prototype.t=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.l=function(){var a=[],b=this.first;if(this.m){do a.push([b.x,b.y]),b=b.next;while(b!==this.first)}else{do a.push({x:b.x,y:b.y}),b=b.next;while(b!==this.first)}return a};k.prototype.clip=function(a,b,c){var d=this.first,e=a.first,g,f;do{if(!d.a){do e.a||
+(f=new n(d,this.h(d.next),e,a.h(e.next)),f.valid()&&(g=h.n(f.x,f.y,f.toSource),f=h.n(f.x,f.y,f.i),g.d=f,f.d=g,this.o(g,d,this.h(d.next)),a.o(f,e,a.h(e.next)))),e=e.next;while(!e.b(a.first))}d=d.next}while(!d.b(this.first));d=this.first;e=a.first;g=d.p(a);f=e.p(this);b^=g;c^=f;do d.a&&(d.f=b,b=!b),d=d.next;while(!d.b(this.first));do e.a&&(e.f=c,c=!c),e=e.next;while(!e.b(a.first));for(b=[];this.t();){c=this.s();d=new k([],this.m);d.g(new h(c.x,c.y));do{c.q();if(c.f){do c=c.next,d.g(new h(c.x,c.y));
+while(!c.a)}else{do c=c.c,d.g(new h(c.x,c.y));while(!c.a)}c=c.d}while(!c.e);b.push(d.l())}0===b.length&&(g&&b.push(this.l()),f&&b.push(a.l()),0===b.length&&(b=null));return b};return{union:function(a,b){return l(a,b,!1,!1)},intersection:function(a,b){return l(a,b,!0,!0)},diff:function(a,b){return l(a,b,!1,!0)},clip:l}}"function"===typeof define&&define.u?define([],m):"object"===typeof exports?module.exports=m():window.greinerHormann=m();
diff --git a/dist/greiner-hormann.js b/dist/greiner-hormann.js
index ed38d48..fc289f3 100644
--- a/dist/greiner-hormann.js
+++ b/dist/greiner-hormann.js
@@ -478,15 +478,18 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
             current = current._corresponding;
         } while (!current._visited);
 
-        list.push(clipped);
+        list.push(clipped.getPoints());
     }
 
     if (list.length === 0) {
         if (sourceInClip) {
-            list.push(this);
+            list.push(this.getPoints());
         }
         if (clipInSource) {
-            list.push(clip);
+            list.push(clip.getPoints());
+        }
+        if (list.length === 0) {
+            list = null;
         }
     }
 
@@ -499,8 +502,8 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
  * @api
  * @param  {Array.<Array.<Number>>} polygonA
  * @param  {Array.<Array.<Number>>} polygonB
- * @param  {Boolean} sourceForwards
- * @param  {Boolean} clipForwards
+ * @param  {Boolean}                sourceForwards
+ * @param  {Boolean}                clipForwards
  * @return {Array.<Array.<Number>>}
  */
 function clip(polygonA, polygonB, eA, eB) {
@@ -513,9 +516,9 @@ function clip(polygonA, polygonB, eA, eB) {
 return {
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>|Null}
      */
     union: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, false);
@@ -523,9 +526,9 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     intersection: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, true, true);
@@ -533,13 +536,15 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     diff: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, true);
-    }
+    },
+
+    clip: clip
 };
 
 }));
diff --git a/dist/greiner-hormann.leaflet.js b/dist/greiner-hormann.leaflet.js
index 4dca465..0fedd11 100644
--- a/dist/greiner-hormann.leaflet.js
+++ b/dist/greiner-hormann.leaflet.js
@@ -478,15 +478,18 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
             current = current._corresponding;
         } while (!current._visited);
 
-        list.push(clipped);
+        list.push(clipped.getPoints());
     }
 
     if (list.length === 0) {
         if (sourceInClip) {
-            list.push(this);
+            list.push(this.getPoints());
         }
         if (clipInSource) {
-            list.push(clip);
+            list.push(clip.getPoints());
+        }
+        if (list.length === 0) {
+            list = null;
         }
     }
 
@@ -518,7 +521,7 @@ function clip(polygonA, polygonB, sourceForwards, clipForwards) {
     }
 
     source = new Polygon(source),
-    clip = new Polygon(clip);
+        clip = new Polygon(clip);
 
     result = source.clip(clip, sourceForwards, clipForwards);
     if (result.length > 0) {
@@ -541,7 +544,7 @@ function clip(polygonA, polygonB, sourceForwards, clipForwards) {
 }
 
 function toLatLngs(poly) {
-    var result = poly.getPoints();
+    var result = poly;
 
     if (result) {
         if (result[0][0] === result[result.length - 1][0] &&
@@ -560,9 +563,9 @@ function toLatLngs(poly) {
 return {
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>|Null}
      */
     union: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, false);
@@ -570,9 +573,9 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     intersection: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, true, true);
@@ -580,13 +583,15 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     diff: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, true);
-    }
+    },
+
+    clip: clip
 };
 
 }));
diff --git a/dist/greiner-hormann.leaflet.min.js b/dist/greiner-hormann.leaflet.min.js
index 57be634..b191dbc 100644
--- a/dist/greiner-hormann.leaflet.min.js
+++ b/dist/greiner-hormann.leaflet.min.js
@@ -1,10 +1,10 @@
 /*
  Licensed under MIT License
 */
-function l(){function k(a,b){this.k=this.first=null;this.l="undefined"===typeof b?Array.isArray(a[0]):b;for(var c=0,e=a.length;c<e;c++)this.g(new g(a[c]))}function n(a,b,c,e){this.i=this.toSource=this.y=this.x=0;var d=(e.y-c.y)*(b.x-a.x)-(e.x-c.x)*(b.y-a.y);0!==d&&(this.toSource=((e.x-c.x)*(a.y-c.y)-(e.y-c.y)*(a.x-c.x))/d,this.i=((b.x-a.x)*(a.y-c.y)-(b.y-a.y)*(a.x-c.x))/d,this.valid()&&(this.x=a.x+this.toSource*(b.x-a.x),this.y=a.y+this.toSource*(b.y-a.y)))}function g(a,b){1===arguments.length&&(Array.isArray(a)?
-(b=a[1],a=a[0]):(b=a.y,a=a.x));this.x=a;this.y=b;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function m(a,b,c,e){var d=[],f=[],h,g;g=a._latlngs;a=0;for(h=g.length;a<h;a++)d.push([g[a].lng,g[a].lat]);g=b._latlngs;a=0;for(h=g.length;a<h;a++)f.push([g[a].lng,g[a].lat]);d=new k(d);f=new k(f);b=d.clip(f,c,e);if(0<b.length){a=0;for(h=b.length;a<h;a++){c=b;e=a;if(d=b[a].s())for(d[0][0]===d[d.length-1][0]&&d[0][1]===d[d.length-1][1]&&(d=d.slice(0,d.length-1)),f=0,g=d.length;f<g;f++)d[f]=
-[d[f][1],d[f][0]];else d=null;c[e]=d}return b?1===b.length?b[0]:b:null}return null}Array.isArray=Array.isArray||function(a){return Boolean(a&&"[object Array]"===Object.prototype.toString.call(Object(a)))};g.m=function(a,b,c){a=new g(a,b);a.j=c;a.a=!0;a.f=!1;return a};g.prototype.p=function(){this.e=!0;null===this.d||this.d.e||this.d.p()};g.prototype.b=function(a){return this.x===a.x&&this.y===a.y};g.prototype.o=function(a){var b=!1,c=a.first,e=c.next,d=this.x,f=this.y;do(c.y<f&&e.y>=f||e.y<f&&c.y>=
-f)&&(c.x<=d||e.x<=d)&&(b^=c.x+(f-c.y)/(e.y-c.y)*(e.x-c.x)<d),c=c.next,e=c.next||a.first;while(!c.b(a.first));return b};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var b=this.first,c=b.c;b.c=a;a.next=b;a.c=c;c.next=a}};k.prototype.n=function(a,b,c){for(;!b.b(c)&&b.j<a.j;)b=b.next;a.next=b;c=b.c;a.c=c;c.next=a;b.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;
-return a};k.prototype.r=function(){var a=this.q||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.q=a};k.prototype.t=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.s=function(){var a=[],b=this.first;if(this.l){do a.push([b.x,b.y]),b=b.next;while(b!==this.first)}else{do a.push({x:b.x,y:b.y}),b=b.next;while(b!==this.first)}return a};k.prototype.clip=function(a,b,c){var e=this.first,
-d=a.first,f,h;do{if(!e.a){do d.a||(h=new n(e,this.h(e.next),d,a.h(d.next)),h.valid()&&(f=g.m(h.x,h.y,h.toSource),h=g.m(h.x,h.y,h.i),f.d=h,h.d=f,this.n(f,e,this.h(e.next)),a.n(h,d,a.h(d.next)))),d=d.next;while(!d.b(a.first))}e=e.next}while(!e.b(this.first));e=this.first;d=a.first;f=e.o(a);h=d.o(this);b^=f;c^=h;do e.a&&(e.f=b,b=!b),e=e.next;while(!e.b(this.first));do d.a&&(d.f=c,c=!c),d=d.next;while(!d.b(a.first));for(b=[];this.t();){c=this.r();e=new k([],this.l);e.g(new g(c.x,c.y));do{c.p();if(c.f){do c=
-c.next,e.g(new g(c.x,c.y));while(!c.a)}else{do c=c.c,e.g(new g(c.x,c.y));while(!c.a)}c=c.d}while(!c.e);b.push(e)}0===b.length&&(f&&b.push(this),h&&b.push(a));return b};return{union:function(a,b){return m(a,b,!1,!1)},intersection:function(a,b){return m(a,b,!0,!0)},diff:function(a,b){return m(a,b,!1,!0)}}}"function"===typeof define&&define.u?define([],l):"object"===typeof exports?module.exports=l():window.greinerHormann=l();
+function m(){function k(a,b){this.k=this.first=null;this.m="undefined"===typeof b?Array.isArray(a[0]):b;for(var c=0,e=a.length;c<e;c++)this.g(new g(a[c]))}function n(a,b,c,e){this.i=this.toSource=this.y=this.x=0;var d=(e.y-c.y)*(b.x-a.x)-(e.x-c.x)*(b.y-a.y);0!==d&&(this.toSource=((e.x-c.x)*(a.y-c.y)-(e.y-c.y)*(a.x-c.x))/d,this.i=((b.x-a.x)*(a.y-c.y)-(b.y-a.y)*(a.x-c.x))/d,this.valid()&&(this.x=a.x+this.toSource*(b.x-a.x),this.y=a.y+this.toSource*(b.y-a.y)))}function g(a,b){1===arguments.length&&(Array.isArray(a)?
+(b=a[1],a=a[0]):(b=a.y,a=a.x));this.x=a;this.y=b;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function l(a,b,c,e){var d=[],f=[],h,g;g=a._latlngs;a=0;for(h=g.length;a<h;a++)d.push([g[a].lng,g[a].lat]);g=b._latlngs;a=0;for(h=g.length;a<h;a++)f.push([g[a].lng,g[a].lat]);d=new k(d);f=new k(f);b=d.clip(f,c,e);if(0<b.length){a=0;for(h=b.length;a<h;a++){c=b;e=a;if(d=b[a])for(d[0][0]===d[d.length-1][0]&&d[0][1]===d[d.length-1][1]&&(d=d.slice(0,d.length-1)),f=0,g=d.length;f<g;f++)d[f]=
+[d[f][1],d[f][0]];else d=null;c[e]=d}return b?1===b.length?b[0]:b:null}return null}Array.isArray=Array.isArray||function(a){return Boolean(a&&"[object Array]"===Object.prototype.toString.call(Object(a)))};g.n=function(a,b,c){a=new g(a,b);a.j=c;a.a=!0;a.f=!1;return a};g.prototype.q=function(){this.e=!0;null===this.d||this.d.e||this.d.q()};g.prototype.b=function(a){return this.x===a.x&&this.y===a.y};g.prototype.p=function(a){var b=!1,c=a.first,e=c.next,d=this.x,f=this.y;do(c.y<f&&e.y>=f||e.y<f&&c.y>=
+f)&&(c.x<=d||e.x<=d)&&(b^=c.x+(f-c.y)/(e.y-c.y)*(e.x-c.x)<d),c=c.next,e=c.next||a.first;while(!c.b(a.first));return b};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var b=this.first,c=b.c;b.c=a;a.next=b;a.c=c;c.next=a}};k.prototype.o=function(a,b,c){for(;!b.b(c)&&b.j<a.j;)b=b.next;a.next=b;c=b.c;a.c=c;c.next=a;b.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;
+return a};k.prototype.s=function(){var a=this.r||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.r=a};k.prototype.t=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.l=function(){var a=[],b=this.first;if(this.m){do a.push([b.x,b.y]),b=b.next;while(b!==this.first)}else{do a.push({x:b.x,y:b.y}),b=b.next;while(b!==this.first)}return a};k.prototype.clip=function(a,b,c){var e=this.first,
+d=a.first,f,h;do{if(!e.a){do d.a||(h=new n(e,this.h(e.next),d,a.h(d.next)),h.valid()&&(f=g.n(h.x,h.y,h.toSource),h=g.n(h.x,h.y,h.i),f.d=h,h.d=f,this.o(f,e,this.h(e.next)),a.o(h,d,a.h(d.next)))),d=d.next;while(!d.b(a.first))}e=e.next}while(!e.b(this.first));e=this.first;d=a.first;f=e.p(a);h=d.p(this);b^=f;c^=h;do e.a&&(e.f=b,b=!b),e=e.next;while(!e.b(this.first));do d.a&&(d.f=c,c=!c),d=d.next;while(!d.b(a.first));for(b=[];this.t();){c=this.s();e=new k([],this.m);e.g(new g(c.x,c.y));do{c.q();if(c.f){do c=
+c.next,e.g(new g(c.x,c.y));while(!c.a)}else{do c=c.c,e.g(new g(c.x,c.y));while(!c.a)}c=c.d}while(!c.e);b.push(e.l())}0===b.length&&(f&&b.push(this.l()),h&&b.push(a.l()),0===b.length&&(b=null));return b};return{union:function(a,b){return l(a,b,!1,!1)},intersection:function(a,b){return l(a,b,!0,!0)},diff:function(a,b){return l(a,b,!1,!0)},clip:l}}"function"===typeof define&&define.u?define([],m):"object"===typeof exports?module.exports=m():window.greinerHormann=m();
diff --git a/dist/greiner-hormann.min.js b/dist/greiner-hormann.min.js
index 95a43c7..cdfd0d1 100644
--- a/dist/greiner-hormann.min.js
+++ b/dist/greiner-hormann.min.js
@@ -1,9 +1,10 @@
 /*
  Licensed under MIT License
 */
-function l(){function k(a,c){this.k=this.first=null;this.p="undefined"===typeof c?Array.isArray(a[0]):c;for(var b=0,d=a.length;b<d;b++)this.g(new h(a[b]))}function n(a,c,b,d){this.i=this.toSource=this.y=this.x=0;var e=(d.y-b.y)*(c.x-a.x)-(d.x-b.x)*(c.y-a.y);0!==e&&(this.toSource=((d.x-b.x)*(a.y-b.y)-(d.y-b.y)*(a.x-b.x))/e,this.i=((c.x-a.x)*(a.y-b.y)-(c.y-a.y)*(a.x-b.x))/e,this.valid()&&(this.x=a.x+this.toSource*(c.x-a.x),this.y=a.y+this.toSource*(c.y-a.y)))}function h(a,c){1===arguments.length&&(Array.isArray(a)?
-(c=a[1],a=a[0]):(c=a.y,a=a.x));this.x=a;this.y=c;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function m(a,c,b,d){a=new k(a);c=new k(c);return a.clip(c,b,d)}Array.isArray=Array.isArray||function(a){return Boolean(a&&"[object Array]"===Object.prototype.toString.call(Object(a)))};h.l=function(a,c,b){a=new h(a,c);a.j=b;a.a=!0;a.f=!1;return a};h.prototype.o=function(){this.e=!0;null===this.d||this.d.e||this.d.o()};h.prototype.b=function(a){return this.x===a.x&&this.y===a.y};h.prototype.n=
-function(a){var c=!1,b=a.first,d=b.next,e=this.x,g=this.y;do(b.y<g&&d.y>=g||d.y<g&&b.y>=g)&&(b.x<=e||d.x<=e)&&(c^=b.x+(g-b.y)/(d.y-b.y)*(d.x-b.x)<e),b=b.next,d=b.next||a.first;while(!b.b(a.first));return c};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var c=this.first,b=c.c;c.c=a;a.next=c;a.c=b;b.next=a}};k.prototype.m=function(a,c,b){for(;!c.b(b)&&c.j<a.j;)c=
-c.next;a.next=c;b=c.c;a.c=b;b.next=a;c.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;return a};k.prototype.r=function(){var a=this.q||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.q=a};k.prototype.s=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.clip=function(a,c,b){var d=this.first,e=a.first,g,f;do{if(!d.a){do e.a||(f=new n(d,this.h(d.next),e,a.h(e.next)),f.valid()&&(g=h.l(f.x,
-f.y,f.toSource),f=h.l(f.x,f.y,f.i),g.d=f,f.d=g,this.m(g,d,this.h(d.next)),a.m(f,e,a.h(e.next)))),e=e.next;while(!e.b(a.first))}d=d.next}while(!d.b(this.first));d=this.first;e=a.first;g=d.n(a);f=e.n(this);c^=g;b^=f;do d.a&&(d.f=c,c=!c),d=d.next;while(!d.b(this.first));do e.a&&(e.f=b,b=!b),e=e.next;while(!e.b(a.first));for(c=[];this.s();){b=this.r();d=new k([],this.p);d.g(new h(b.x,b.y));do{b.o();if(b.f){do b=b.next,d.g(new h(b.x,b.y));while(!b.a)}else{do b=b.c,d.g(new h(b.x,b.y));while(!b.a)}b=b.d}while(!b.e);
-c.push(d)}0===c.length&&(g&&c.push(this),f&&c.push(a));return c};return{union:function(a,c){return m(a,c,!1,!1)},intersection:function(a,c){return m(a,c,!0,!0)},diff:function(a,c){return m(a,c,!1,!0)}}}"function"===typeof define&&define.t?define([],l):"object"===typeof exports?module.exports=l():window.greinerHormann=l();
+function m(){function k(a,b){this.k=this.first=null;this.m="undefined"===typeof b?Array.isArray(a[0]):b;for(var c=0,d=a.length;c<d;c++)this.g(new h(a[c]))}function n(a,b,c,d){this.i=this.toSource=this.y=this.x=0;var e=(d.y-c.y)*(b.x-a.x)-(d.x-c.x)*(b.y-a.y);0!==e&&(this.toSource=((d.x-c.x)*(a.y-c.y)-(d.y-c.y)*(a.x-c.x))/e,this.i=((b.x-a.x)*(a.y-c.y)-(b.y-a.y)*(a.x-c.x))/e,this.valid()&&(this.x=a.x+this.toSource*(b.x-a.x),this.y=a.y+this.toSource*(b.y-a.y)))}function h(a,b){1===arguments.length&&(Array.isArray(a)?
+(b=a[1],a=a[0]):(b=a.y,a=a.x));this.x=a;this.y=b;this.d=this.c=this.next=null;this.j=0;this.f=!0;this.e=this.a=!1}function l(a,b,c,d){a=new k(a);b=new k(b);return a.clip(b,c,d)}Array.isArray=Array.isArray||function(a){return Boolean(a&&"[object Array]"===Object.prototype.toString.call(Object(a)))};h.n=function(a,b,c){a=new h(a,b);a.j=c;a.a=!0;a.f=!1;return a};h.prototype.q=function(){this.e=!0;null===this.d||this.d.e||this.d.q()};h.prototype.b=function(a){return this.x===a.x&&this.y===a.y};h.prototype.p=
+function(a){var b=!1,c=a.first,d=c.next,e=this.x,g=this.y;do(c.y<g&&d.y>=g||d.y<g&&c.y>=g)&&(c.x<=e||d.x<=e)&&(b^=c.x+(g-c.y)/(d.y-c.y)*(d.x-c.x)<e),c=c.next,d=c.next||a.first;while(!c.b(a.first));return b};n.prototype.valid=function(){return 0<this.toSource&&1>this.toSource&&0<this.i&&1>this.i};k.prototype.g=function(a){if(null==this.first)this.first=a,this.first.next=a,this.first.c=a;else{var b=this.first,c=b.c;b.c=a;a.next=b;a.c=c;c.next=a}};k.prototype.o=function(a,b,c){for(;!b.b(c)&&b.j<a.j;)b=
+b.next;a.next=b;c=b.c;a.c=c;c.next=a;b.c=a};k.prototype.h=function(a){for(;a.a;)a=a.next;return a};k.prototype.s=function(){var a=this.r||this.first;do{if(a.a&&!a.e)break;a=a.next}while(!a.b(this.first));return this.r=a};k.prototype.t=function(){var a=this.k||this.first;do{if(a.a&&!a.e)return this.k=a,!0;a=a.next}while(!a.b(this.first));this.k=null;return!1};k.prototype.l=function(){var a=[],b=this.first;if(this.m){do a.push([b.x,b.y]),b=b.next;while(b!==this.first)}else{do a.push({x:b.x,y:b.y}),
+b=b.next;while(b!==this.first)}return a};k.prototype.clip=function(a,b,c){var d=this.first,e=a.first,g,f;do{if(!d.a){do e.a||(f=new n(d,this.h(d.next),e,a.h(e.next)),f.valid()&&(g=h.n(f.x,f.y,f.toSource),f=h.n(f.x,f.y,f.i),g.d=f,f.d=g,this.o(g,d,this.h(d.next)),a.o(f,e,a.h(e.next)))),e=e.next;while(!e.b(a.first))}d=d.next}while(!d.b(this.first));d=this.first;e=a.first;g=d.p(a);f=e.p(this);b^=g;c^=f;do d.a&&(d.f=b,b=!b),d=d.next;while(!d.b(this.first));do e.a&&(e.f=c,c=!c),e=e.next;while(!e.b(a.first));
+for(b=[];this.t();){c=this.s();d=new k([],this.m);d.g(new h(c.x,c.y));do{c.q();if(c.f){do c=c.next,d.g(new h(c.x,c.y));while(!c.a)}else{do c=c.c,d.g(new h(c.x,c.y));while(!c.a)}c=c.d}while(!c.e);b.push(d.l())}0===b.length&&(g&&b.push(this.l()),f&&b.push(a.l()),0===b.length&&(b=null));return b};return{union:function(a,b){return l(a,b,!1,!1)},intersection:function(a,b){return l(a,b,!0,!0)},diff:function(a,b){return l(a,b,!1,!0)},clip:l}}
+"function"===typeof define&&define.u?define([],m):"object"===typeof exports?module.exports=m():window.greinerHormann=m();
diff --git a/src/driver.js b/src/driver.js
index d03b704..e781d4d 100644
--- a/src/driver.js
+++ b/src/driver.js
@@ -5,8 +5,8 @@
  * @api
  * @param  {Array.<Array.<Number>>} polygonA
  * @param  {Array.<Array.<Number>>} polygonB
- * @param  {Boolean} sourceForwards
- * @param  {Boolean} clipForwards
+ * @param  {Boolean}                sourceForwards
+ * @param  {Boolean}                clipForwards
  * @return {Array.<Array.<Number>>}
  */
 function clip(polygonA, polygonB, eA, eB) {
diff --git a/src/driver.leaflet.js b/src/driver.leaflet.js
index c73ea35..0827efd 100644
--- a/src/driver.leaflet.js
+++ b/src/driver.leaflet.js
@@ -24,7 +24,7 @@ function clip(polygonA, polygonB, sourceForwards, clipForwards) {
     }
 
     source = new Polygon(source),
-    clip = new Polygon(clip);
+        clip = new Polygon(clip);
 
     result = source.clip(clip, sourceForwards, clipForwards);
     if (result.length > 0) {
@@ -47,7 +47,7 @@ function clip(polygonA, polygonB, sourceForwards, clipForwards) {
 }
 
 function toLatLngs(poly) {
-    var result = poly.getPoints();
+    var result = poly;
 
     if (result) {
         if (result[0][0] === result[result.length - 1][0] &&
diff --git a/src/end.js b/src/end.js
index 45a0f7b..ef3ba98 100644
--- a/src/end.js
+++ b/src/end.js
@@ -1,9 +1,9 @@
 return {
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>|Null}
      */
     union: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, false);
@@ -11,9 +11,9 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     intersection: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, true, true);
@@ -21,13 +21,15 @@ return {
 
     /**
      * @api
-     * @param  {Array.<Array.<Number>} polygonA
-     * @param  {Array.<Array.<Number>} polygonB
-     * @return {Array.<Array.<Number>>|Null}
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonA
+     * @param  {Array.<Array.<Number>|Array.<Object>} polygonB
+     * @return {Array.<Array.<Number>>|Array.<Array.<Object>>|Null}
      */
     diff: function(polygonA, polygonB) {
         return clip(polygonA, polygonB, false, true);
-    }
+    },
+
+    clip: clip
 };
 
 }));
diff --git a/src/polygon.js b/src/polygon.js
index 689f3ba..31a1e31 100644
--- a/src/polygon.js
+++ b/src/polygon.js
@@ -264,15 +264,18 @@ Polygon.prototype.clip = function(clip, sourceForwards, clipForwards) {
             current = current._corresponding;
         } while (!current._visited);
 
-        list.push(clipped);
+        list.push(clipped.getPoints());
     }
 
     if (list.length === 0) {
         if (sourceInClip) {
-            list.push(this);
+            list.push(this.getPoints());
         }
         if (clipInSource) {
-            list.push(clip);
+            list.push(clip.getPoints());
+        }
+        if (list.length === 0) {
+            list = null;
         }
     }
 
diff --git a/test/suite.js b/test/suite.js
index f220a11..49d1a39 100644
--- a/test/suite.js
+++ b/test/suite.js
@@ -31,7 +31,7 @@ console.log(
     }, {
         x: 10,
         y: 40
-    }])[0].getPoints()
+    }])
 );
 
 console.log(
@@ -47,5 +47,5 @@ console.log(
         [110, 140],
         [10, 140],
         [10, 40]
-    ])[0].getPoints()
+    ])
 );