From 23edc6a8c5c823898fdb130d0b3f4a90613c23fb Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Thu, 4 Jun 2020 10:42:13 -0400
Subject: [PATCH 1/3] Return best distance. Closes #2

---
 polylabel.js | 10 ++++++++--
 test/test.js | 20 +++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/polylabel.js b/polylabel.js
index bca664d..73468f7 100644
--- a/polylabel.js
+++ b/polylabel.js
@@ -25,7 +25,11 @@ function polylabel(polygon, precision, debug) {
     var cellSize = Math.min(width, height);
     var h = cellSize / 2;
 
-    if (cellSize === 0) return [minX, minY];
+    if (cellSize === 0) {
+        var degeneratePoleOfInaccessibility = [minX, minY];
+        degeneratePoleOfInaccessibility.distance = 0;
+        return degeneratePoleOfInaccessibility;
+    }
 
     // a priority queue of cells in order of their "potential" (max distance to polygon)
     var cellQueue = new Queue(undefined, compareMax);
@@ -73,7 +77,9 @@ function polylabel(polygon, precision, debug) {
         console.log('best distance: ' + bestCell.d);
     }
 
-    return [bestCell.x, bestCell.y];
+    var poleOfInaccessibility = [bestCell.x, bestCell.y];
+    poleOfInaccessibility.distance = bestCell.d || 0;
+    return poleOfInaccessibility;
 }
 
 function compareMax(a, b) {
diff --git a/test/test.js b/test/test.js
index bc0419c..373e84b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -8,28 +8,38 @@ var water2 = require('./fixtures/water2.json');
 
 test('finds pole of inaccessibility for water1 and precision 1', function (t) {
     var p = polylabel(water1, 1);
-    t.same(p, [3865.85009765625, 2124.87841796875]);
+    t.same(p, Object.assign([3865.85009765625, 2124.87841796875], {
+        distance: 288.8493574779127
+    }));
     t.end();
 });
 
 test('finds pole of inaccessibility for water1 and precision 50', function (t) {
     var p = polylabel(water1, 50);
-    t.same(p, [3854.296875, 2123.828125]);
+    t.same(p, Object.assign([3854.296875, 2123.828125], {
+        distance: 278.5795872381558
+    }));
     t.end();
 });
 
 test('finds pole of inaccessibility for water2 and default precision 1', function (t) {
     var p = polylabel(water2);
-    t.same(p, [3263.5, 3263.5]);
+    t.same(p, Object.assign([3263.5, 3263.5], {
+        distance: 960.5
+    }));
     t.end();
 });
 
 test('works on degenerate polygons', function (t) {
     var p = polylabel([[[0, 0], [1, 0], [2, 0], [0, 0]]]);
-    t.same(p, [0, 0]);
+    t.same(p, Object.assign([0, 0], {
+        distance: 0
+    }));
 
     p = polylabel([[[0, 0], [1, 0], [1, 1], [1, 0], [0, 0]]]);
-    t.same(p, [0, 0]);
+    t.same(p, Object.assign([0, 0], {
+        distance: 0
+    }));
 
     t.end();
 });

From cfa297ff7c33a142129d19848bf90491a5ae4fb9 Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Thu, 4 Jun 2020 15:05:14 -0400
Subject: [PATCH 2/3] Move where -0 distance is precluded, based on feedback
 from @fil.

---
 polylabel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/polylabel.js b/polylabel.js
index 73468f7..0c3229b 100644
--- a/polylabel.js
+++ b/polylabel.js
@@ -78,7 +78,7 @@ function polylabel(polygon, precision, debug) {
     }
 
     var poleOfInaccessibility = [bestCell.x, bestCell.y];
-    poleOfInaccessibility.distance = bestCell.d || 0;
+    poleOfInaccessibility.distance = bestCell.d;
     return poleOfInaccessibility;
 }
 
@@ -113,7 +113,7 @@ function pointToPolygonDist(x, y, polygon) {
         }
     }
 
-    return (inside ? 1 : -1) * Math.sqrt(minDistSq);
+    return minDistSq === 0 ? 0 : (inside ? 1 : -1) * Math.sqrt(minDistSq);
 }
 
 // get polygon centroid

From 8275b919fc8656ea33c316ca09b9995495f75c48 Mon Sep 17 00:00:00 2001
From: Curran <curran.kelleher@gmail.com>
Date: Fri, 5 Jun 2020 13:29:58 -0400
Subject: [PATCH 3/3] Ready for publish

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7665ab1..19f56fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "polylabel",
-  "version": "1.0.5",
+  "name": "@datavis-tech/polylabel",
+  "version": "1.2.0",
   "description": "A JS library for finding optimal label position inside a polygon",
   "main": "polylabel.js",
   "scripts": {