allow numbers as *locations* items when using custom *geojson*

Author: etpinard

src/traces/choropleth/calc.js

@@ -19,12 +19,21 @@ module.exports = function calc(gd, trace) {
     var len = trace._length;
     var calcTrace = new Array(len);
 
+    var isNonBlankString = function(v) { return v && typeof v === 'string'; };
+    var isValidLoc;
+
+    if(trace.geojson) {
+        isValidLoc = function(v) { return isNonBlankString(v) || isNumeric(v); };
+    } else {
+        isValidLoc = isNonBlankString;
+    }
+
     for(var i = 0; i < len; i++) {
         var calcPt = calcTrace[i] = {};
         var loc = trace.locations[i];
         var z = trace.z[i];
 
-        if(typeof loc === 'string' && isNumeric(z)) {
+        if(isValidLoc(loc) && isNumeric(z)) {
             calcPt.loc = loc;
             calcPt.z = z;
         } else {

src/traces/choroplethmapbox/defaults.js

@@ -17,14 +17,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
-    // TODO locations should now allow numbers !!
-    // update that for `choropleth` too !!
-
     var locations = coerce('locations');
     var z = coerce('z');
     var geojson = coerce('geojson');
 
-    if(!locations || !locations.length ||
+    if(!Lib.isArrayOrTypedArray(locations) || !locations.length ||
         !Lib.isArrayOrTypedArray(z) || !z.length ||
         !((typeof geojson === 'string' && geojson !== '') || Lib.isPlainObject(geojson))
     ) {

test/jasmine/tests/choroplethmapbox_test.js

@@ -71,10 +71,6 @@ describe('Test choroplethmapbox defaults:', function() {
         ]);
         expectVisibleFalse();
     });
-
-    it('should accept typed arrays', function() {
-
-    });
 });
 
 describe('Test choroplethmapbox convert:', function() {
@@ -219,6 +215,48 @@ describe('Test choroplethmapbox convert:', function() {
         expect(Lib.log).toHaveBeenCalledWith('Location with id d does not have a matching feature');
     });
 
+    describe('should accept numbers as *locations* items', function() {
+        function _assert(act) {
+            expect(act.fill.layout.visibility).toBe('visible', 'fill layer visibility');
+            expect(act.line.layout.visibility).toBe('visible', 'line layer visibility');
+            expect(act.geojson.features.length).toBe(3, '# of visible features');
+            expect(extract(act, 'fc'))
+                .toEqual(['rgb(178, 10, 28)', 'rgb(220, 220, 220)', 'rgb(240, 149, 99)']);
+        }
+
+        it('- regular array case', function() {
+            var trace = {
+                locations: [1, 2, 3],
+                z: [20, 10, 2],
+                geojson: {
+                    type: 'FeatureCollection',
+                    features: [
+                        {type: 'Feature', id: '1', geometry: {type: 'Polygon', coordinates: []}},
+                        {type: 'Feature', id: '3', geometry: {type: 'Polygon', coordinates: []}},
+                        {type: 'Feature', id: '2', geometry: {type: 'Polygon', coordinates: []}}
+                    ]
+                }
+            };
+            _assert(_convert(trace));
+        });
+
+        it('- typed array case', function() {
+            var trace = {
+                locations: new Float32Array([1, 2, 3]),
+                z: new Float32Array([20, 10, 2]),
+                geojson: {
+                    type: 'FeatureCollection',
+                    features: [
+                        {type: 'Feature', id: 1, geometry: {type: 'Polygon', coordinates: []}},
+                        {type: 'Feature', id: 3, geometry: {type: 'Polygon', coordinates: []}},
+                        {type: 'Feature', id: 2, geometry: {type: 'Polygon', coordinates: []}}
+                    ]
+                }
+            };
+            _assert(_convert(trace));
+        });
+    });
+
     it('should handle *Feature* on 1-item *FeatureCollection* the same way', function() {
         var locations = ['a'];
         var z = [1];