Skip to content

Commit fcca3af

Browse files
committed
update fix
1 parent 59d9679 commit fcca3af

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/layers/src/arc-layer/arc-layer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ export default class ArcLayer extends Layer {
314314
lat1: fieldPairs[1].pair.lat,
315315
lng1: fieldPairs[1].pair.lng
316316
},
317-
label: `${fieldPairs[0].defaultName || 'point'} -> ${fieldPairs[1].defaultName || 'point'} arc`
317+
label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} arc`
318318
};
319319

320320
return {props: [props]};

src/layers/src/line-layer/line-layer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export default class LineLayer extends ArcLayer {
260260
geoarrow0: {...defaultAltColumn},
261261
geoarrow1: {...defaultAltColumn}
262262
},
263-
label: `${fieldPairs[0].defaultName || 'point'} -> ${fieldPairs[1].defaultName || 'point'} line`,
263+
label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`,
264264
isVisible: false
265265
};
266266

src/layers/src/point-layer/point-layer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ export default class PointLayer extends Layer {
347347
columns?: PointLayerColumnsConfig;
348348
} = {
349349
label:
350-
pair.defaultName ||
351-
(typeof label === 'string' && label.replace(/\.[^/.]+$/, '')) ||
352-
'Point'
350+
pair.defaultName && pair.defaultName !== 'Point'
351+
? pair.defaultName
352+
: (typeof label === 'string' && label.replace(/\.[^/.]+$/, '')) || 'Point'
353353
};
354354

355355
// default layer color for begintrip and dropoff point

src/table/src/kepler-table.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ export function findPointFieldPairs(fields: Field[]): FieldPair[] {
580580
const trimName = fieldName.replace(re, '').trim();
581581

582582
carry.push({
583-
defaultName: trimName,
583+
defaultName: trimName || 'point',
584584
pair: {
585585
lat: {
586586
fieldIdx: idx,

test/node/utils/kepler-table-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ test('KeplerTable -> findPointFieldPairs', t => {
278278
suffix: ['lat', 'lng']
279279
},
280280
{
281-
defaultName: '',
281+
defaultName: 'point',
282282
pair: {
283283
lat: {
284284
fieldIdx: 3,
@@ -343,7 +343,7 @@ test('KeplerTable -> findPointFieldPairs', t => {
343343
suffix: ['lat', 'long']
344344
},
345345
{
346-
defaultName: '',
346+
defaultName: 'point',
347347
pair: {
348348
lat: {
349349
fieldIdx: 3,

0 commit comments

Comments
 (0)