Fix centroid calculation. Bump turf to v6.5

draftlogs/7115_fix.md

@@ -0,0 +1,2 @@
+ - Fix centroid calculation and update turf.js to v7 [[#7115](https://github.com/plotly/plotly.js/pull/7115)], with thanks to @birkskyum for the contribution!
+

package.json

@@ -71,9 +71,9 @@
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
     "@plotly/mapbox-gl": "1.13.4",
-    "@turf/area": "^6.4.0",
-    "@turf/bbox": "^6.4.0",
-    "@turf/centroid": "^6.0.2",
+    "@turf/area": "^7.1.0",
+    "@turf/bbox": "^7.1.0",
+    "@turf/centroid": "^7.1.0",
     "base64-arraybuffer": "^1.0.2",
     "canvas-fit": "^1.5.0",
     "color-alpha": "1.0.4",

src/lib/geo_location_utils.js

@@ -2,9 +2,9 @@
 
 var d3 = require('@plotly/d3');
 var countryRegex = require('country-regex');
-var turfArea = require('@turf/area');
-var turfCentroid = require('@turf/centroid');
-var turfBbox = require('@turf/bbox');
+var { area: turfArea } = require('@turf/area');
+var { centroid: turfCentroid } = require('@turf/centroid');
+var { bbox: turfBbox } = require('@turf/bbox');
 
 var identity = require('./identity');
 var loggers = require('./loggers');
@@ -226,7 +226,11 @@ function extractTraceFeature(calcTrace) {
                 };
 
                 // Compute centroid, add it to the properties
-                fOut.properties.ct = findCentroid(fOut);
+                if (fOut.geometry.coordinates.length > 0) {
+                    fOut.properties.ct = findCentroid(fOut);
+                } else {
+                    fOut.properties.ct = [NaN, NaN];
+                }
 
                 // Mutate in in/out features into calcdata
                 cdi.fIn = fIn;
@@ -291,7 +295,7 @@ function findCentroid(feature) {
 
         for(var i = 0; i < coords.length; i++) {
             var polyi = {type: 'Polygon', coordinates: coords[i]};
-            var area = turfArea.default(polyi);
+            var area = turfArea(polyi);
             if(area > maxArea) {
                 maxArea = area;
                 poly = polyi;
@@ -301,7 +305,7 @@ function findCentroid(feature) {
         poly = geometry;
     }
 
-    return turfCentroid.default(poly).geometry.coordinates;
+    return turfCentroid(poly).geometry.coordinates;
 }
 
 function fetchTraceGeoData(calcData) {
@@ -362,7 +366,7 @@ function fetchTraceGeoData(calcData) {
 // TODO `turf/bbox` gives wrong result when the input feature/geometry
 // crosses the anti-meridian. We should try to implement our own bbox logic.
 function computeBbox(d) {
-    return turfBbox.default(d);
+    return turfBbox(d);
 }
 
 module.exports = {

test/jasmine/tests/choropleth_test.js

@@ -353,7 +353,7 @@ describe('Test choropleth hover:', function() {
             fig.data[0].hovertemplate = '%{properties.name}<extra>%{ct[0]:.1f} | %{ct[1]:.1f}</extra>';
             fig.layout.geo.projection = {scale: 20};
 
-            run(hasCssTransform, [300, 200], fig, ['New York', '-75.1 | 42.6'])
+            run(hasCssTransform, [300, 200], fig, ['New York', '-75.2 | 42.6'])
             .then(done, done.fail);
         });
     });

test/jasmine/tests/choroplethmap_test.js

@@ -489,7 +489,7 @@ describe('Test choroplethmap convert:', function() {
         var opts = convertModule.convert(calcTrace);
 
         expect(opts.geojson.features[0].geometry.coordinates).toBe(coordsIn);
-        expect(calcTrace[0].ct).toEqual([100.4, 0.4]);
+        expect(calcTrace[0].ct).toEqual([100.5, 0.5]);
     });
 
     it('should find correct centroid (multi-polygon case)', function() {
@@ -498,7 +498,7 @@ describe('Test choroplethmap convert:', function() {
         var coordsIn = [
             [
                 // this one has the bigger area
-                [[30, 20], [45, 40], [10, 40], [30, 20]]
+                [[30, 20], [47, 40], [10, 33], [30, 20]]
             ],
             [
                 [[15, 5], [40, 10], [10, 20], [5, 10], [15, 5]]
@@ -511,7 +511,7 @@ describe('Test choroplethmap convert:', function() {
         var opts = convertModule.convert(calcTrace);
 
         expect(opts.geojson.features[0].geometry.coordinates).toBe(coordsIn);
-        expect(calcTrace[0].ct).toEqual([28.75, 30]);
+        expect(calcTrace[0].ct).toEqual([29, 31]);
     });
 });
 
@@ -639,7 +639,7 @@ describe('Test choroplethmap hover:', function() {
             return fig;
         },
         nums: '### 100',
-        name: '-86.7 | 32.0 ###',
+        name: '-86.7 | 31.9 ###',
         evtPts: [{location: 100, z: 10, pointNumber: 0, curveNumber: 0}]
     }];
 

test/jasmine/tests/choroplethmapbox_test.js

@@ -490,7 +490,7 @@ describe('Test choroplethmapbox convert:', function() {
         var opts = convertModule.convert(calcTrace);
 
         expect(opts.geojson.features[0].geometry.coordinates).toBe(coordsIn);
-        expect(calcTrace[0].ct).toEqual([100.4, 0.4]);
+        expect(calcTrace[0].ct).toEqual([100.5, 0.5]);
     });
 
     it('should find correct centroid (multi-polygon case)', function() {
@@ -499,7 +499,7 @@ describe('Test choroplethmapbox convert:', function() {
         var coordsIn = [
             [
                 // this one has the bigger area
-                [[30, 20], [45, 40], [10, 40], [30, 20]]
+                [[30, 20], [47, 40], [10, 33], [30, 20]]
             ],
             [
                 [[15, 5], [40, 10], [10, 20], [5, 10], [15, 5]]
@@ -512,7 +512,7 @@ describe('Test choroplethmapbox convert:', function() {
         var opts = convertModule.convert(calcTrace);
 
         expect(opts.geojson.features[0].geometry.coordinates).toBe(coordsIn);
-        expect(calcTrace[0].ct).toEqual([28.75, 30]);
+        expect(calcTrace[0].ct).toEqual([29, 31]);
     });
 });
 
@@ -640,7 +640,7 @@ describe('Test choroplethmapbox hover:', function() {
             return fig;
         },
         nums: '### 100',
-        name: '-86.7 | 32.0 ###',
+        name: '-86.7 | 31.9 ###',
         evtPts: [{location: 100, z: 10, pointNumber: 0, curveNumber: 0}]
     }];