Skip to content

Commit 9767454

Browse files
committed
Revert "handle typed arrays in scattergeo"
This reverts commit 142e353.
1 parent 5dfe2c9 commit 9767454

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/traces/scattergeo/calc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ var BADNUM = require('../../constants/numerical').BADNUM;
66
var calcMarkerColorscale = require('../scatter/colorscale_calc');
77
var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
88
var calcSelection = require('../scatter/calc_selection');
9-
var Lib = require('../../lib');
10-
var _ = Lib._;
9+
10+
var _ = require('../../lib')._;
1111

1212
function isNonBlankString(v) {
1313
return v && typeof v === 'string';
1414
}
1515

1616
module.exports = function calc(gd, trace) {
17-
var hasLocationData = Lib.isArrayOrTypedArray(trace.locations);
17+
var hasLocationData = Array.isArray(trace.locations);
1818
var len = hasLocationData ? trace.locations.length : trace._length;
1919
var calcTrace = new Array(len);
2020

src/traces/scattergeo/hover.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
22

33
var Fx = require('../../components/fx');
4-
var isTypedArraySpec = require('../../lib/array').isTypedArraySpec;
5-
64
var BADNUM = require('../../constants/numerical').BADNUM;
75

86
var getTraceColor = require('../scatter/get_trace_color');
@@ -78,7 +76,7 @@ function getExtraText(trace, pt, pointData, labels) {
7876
attributes.hoverinfo.flags :
7977
hoverinfo.split('+');
8078

81-
var hasLocation = parts.indexOf('location') !== -1 && isTypedArraySpec(trace.locations);
79+
var hasLocation = parts.indexOf('location') !== -1 && Array.isArray(trace.locations);
8280
var hasLon = (parts.indexOf('lon') !== -1);
8381
var hasLat = (parts.indexOf('lat') !== -1);
8482
var hasText = (parts.indexOf('text') !== -1);

src/traces/scattergeo/plot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function calcGeoJSON(calcTrace, fullLayout) {
7272
var len = trace._length;
7373
var i, calcPt;
7474

75-
if(Lib.isArrayOrTypedArray(trace.locations)) {
75+
if(Array.isArray(trace.locations)) {
7676
var locationmode = trace.locationmode;
7777
var features = locationmode === 'geojson-id' ?
7878
geoUtils.extractTraceFeature(calcTrace) :

0 commit comments

Comments
 (0)