From 4d06d10db96510af4f6bd8ff1b68e60ff951ebd3 Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Sat, 9 Dec 2017 16:07:46 -0800 Subject: [PATCH] should not set layerIds when querying unknown mapStyle (#423) --- src/utils/style-utils.js | 2 +- test/utils/style-utils.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/style-utils.js b/src/utils/style-utils.js index 9f08065f..5b8ef177 100644 --- a/src/utils/style-utils.js +++ b/src/utils/style-utils.js @@ -2,7 +2,7 @@ import {Map} from 'immutable'; import diffStyles from './diff-styles'; export function getInteractiveLayerIds(mapStyle) { - let interactiveLayerIds = []; + let interactiveLayerIds = null; if (Map.isMap(mapStyle) && mapStyle.has('layers')) { interactiveLayerIds = mapStyle.get('layers') diff --git a/test/utils/style-utils.spec.js b/test/utils/style-utils.spec.js index 6c2203cb..ac65365e 100644 --- a/test/utils/style-utils.spec.js +++ b/test/utils/style-utils.spec.js @@ -19,7 +19,7 @@ const TEST_STYLE_IMMUTABLE = Immutable.fromJS(TEST_STYLE_JS); test('getInteractiveLayerIds#String style', t => { const layers = getInteractiveLayerIds(TEST_STYLE_STRING); - t.equal(deepEqual(layers, []), true, 'got expected layer ids'); + t.notOk(layers, 'should not return layer ids'); t.end(); });