Merge pull request #3988 from plotly/choroplethmapbox-pr

Introducing choroplethmapbox traces

Author: etpinard

.circleci/test.sh

@@ -55,7 +55,7 @@ case $1 in
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
-            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
+            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped --doNotFailOnEmptyTestSuite
         done
 
         exit $EXIT_STATE

lib/choroplethmapbox.js

@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/traces/choroplethmapbox');

lib/densitymapbox.js

@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/traces/densitymapbox');

lib/index-mapbox.js

@@ -11,7 +11,9 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./scattermapbox')
+    require('./scattermapbox'),
+    require('./choroplethmapbox'),
+    require('./densitymapbox')
 ]);
 
 module.exports = Plotly;

lib/index.js

@@ -44,9 +44,14 @@ Plotly.register([
 
     require('./pointcloud'),
     require('./heatmapgl'),
+
     require('./parcoords'),
+
     require('./parcats'),
+
     require('./scattermapbox'),
+    require('./choroplethmapbox'),
+    require('./densitymapbox'),
 
     require('./sankey'),
 

package-lock.json

@@ -58,6 +58,8 @@
   "dependencies": {
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
+    "@turf/area": "^6.0.1",
+    "@turf/centroid": "^6.0.2",
     "alpha-shape": "^1.0.0",
     "canvas-fit": "^1.5.0",
     "color-normalize": "^1.3.0",

package.json

@@ -897,7 +897,7 @@ function createHoverText(hoverData, opts, gd) {
         if(d.zLabel !== undefined) {
             if(d.xLabel !== undefined) text += 'x: ' + d.xLabel + '<br>';
             if(d.yLabel !== undefined) text += 'y: ' + d.yLabel + '<br>';
-            if(d.trace.type !== 'choropleth') {
+            if(d.trace.type !== 'choropleth' && d.trace.type !== 'choroplethmapbox') {
                 text += (text ? 'z: ' : '') + d.zLabel;
             }
         } else if(showCommonLabel && d[hovermode + 'Label'] === t0) {

src/components/fx/hover.js

@@ -37,14 +37,6 @@ function plotGeo(gd) {
     var calcData = gd.calcdata;
     var geoIds = fullLayout._subplots[GEO];
 
-    /**
-     * If 'plotly-geo-assets.js' is not included,
-     * initialize object to keep reference to every loaded topojson
-     */
-    if(window.PlotlyGeoAssets === undefined) {
-        window.PlotlyGeoAssets = {topojson: {}};
-    }
-
     for(var i = 0; i < geoIds.length; i++) {
         var geoId = geoIds[i];
         var geoCalcData = getSubplotCalcData(calcData, GEO, geoId);