Skip to content

Commit

Permalink
issue an error when queryRenderedFeatures parameters.layers isn't an …
Browse files Browse the repository at this point in the history
…Array (#4331)
  • Loading branch information
andrewharvey authored and jfirebaugh committed Feb 27, 2017
1 parent 78fc9c4 commit 28bde4d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/style/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,10 @@ class Style extends Evented {

const includedSources = {};
if (params && params.layers) {
if (!Array.isArray(params.layers)) {
this.fire('error', {error: 'parameters.layers must be an Array.'});
return;
}
for (const layerId of params.layers) {
const layer = this._layers[layerId];
if (!layer) {
Expand Down
10 changes: 10 additions & 0 deletions test/unit/style/style.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,16 @@ test('Style#queryRenderedFeatures', (t) => {
t.end();
});

t.test('checks type of `layers` option', (t) => {
let errors = 0;
t.stub(style, 'fire', (type, data) => {
if (data.error && data.error.includes('parameters.layers must be an Array.')) errors++;
});
style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {layers:'string'});
t.equals(errors, 1);
t.end();
});

t.test('includes layout properties', (t) => {
const results = style.queryRenderedFeatures([{column: 1, row: 1, zoom: 1}], {}, 0, 0);
const layout = results[0].layer.layout;
Expand Down

0 comments on commit 28bde4d

Please sign in to comment.