turf 6.5

plotly · archmoj · Aug 19, 2024 · Aug 19, 2024 · Aug 19, 2024 · Aug 19, 2024
commit a6e151a67e6a3b184070d1a281c75ef842e60161
diff --git a/draftlogs/7115_fix.md b/draftlogs/7115_fix.md
@@ -1,2 +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!
+ - Fix centroid calculation in turf [[#7115](https://github.com/plotly/plotly.js/pull/7115)], with thanks to @birkskyum for the contribution!

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/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": "^7.1.0",
-    "@turf/bbox": "^7.1.0",
-    "@turf/centroid": "^7.1.0",
+    "@turf/area": "^6.5.0",
+    "@turf/bbox": "^6.5.0",
+    "@turf/centroid": "^6.5.0",
    "base64-arraybuffer": "^1.0.2",
    "canvas-fit": "^1.5.0",
    "color-alpha": "1.0.4",

diff --git a/src/lib/geo_location_utils.js b/src/lib/geo_location_utils.js
@@ -2,9 +2,9 @@

 var d3 = require('@plotly/d3');
 var countryRegex = require('country-regex');
-var { area: turfArea } = require('@turf/area');
-var { centroid: turfCentroid } = require('@turf/centroid');
-var { bbox: turfBbox } = require('@turf/bbox');
+var turfArea = require('@turf/area');
+var turfCentroid = require('@turf/centroid');
+var turfBbox = require('@turf/bbox');

 var identity = require('./identity');
 var loggers = require('./loggers');
@@ -295,7 +295,7 @@ function findCentroid(feature) {

        for(var i = 0; i < coords.length; i++) {
            var polyi = {type: 'Polygon', coordinates: coords[i]};
-            var area = turfArea(polyi);
+            var area = turfArea.default(polyi);
            if(area > maxArea) {
                maxArea = area;
                poly = polyi;
@@ -305,7 +305,7 @@ function findCentroid(feature) {
        poly = geometry;
    }

-    return turfCentroid(poly).geometry.coordinates;
+    return turfCentroid.default(poly).geometry.coordinates;
 }

 function fetchTraceGeoData(calcData) {
@@ -366,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(d);
+    return turfBbox.default(d);
 }

 module.exports = {
-Original file line number
+Diff line change
@@ -1,2 +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!
+     - Fix centroid calculation in turf [[#7115](https://github.com/plotly/plotly.js/pull/7115)], with thanks to @birkskyum for the contribution!
                   birkskyum marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.