From 8bdf3c7f0926a02b04064153a4685af2ab1ea4a5 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Tue, 23 Feb 2016 11:38:53 -0800 Subject: [PATCH] querySourceFeatures: rename source-layer to sourceLayer --- js/source/worker_tile.js | 2 +- js/ui/map.js | 2 +- test/js/source/worker_tile.test.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/source/worker_tile.js b/js/source/worker_tile.js index 391bda075e3..f9c1aa7e791 100644 --- a/js/source/worker_tile.js +++ b/js/source/worker_tile.js @@ -249,7 +249,7 @@ WorkerTile.prototype.querySourceFeatures = function(params) { if (!this.data) return null; var layer = this.data.layers ? - this.data.layers[params['source-layer']] : + this.data.layers[params.sourceLayer] : this.data; if (!layer) return null; diff --git a/js/ui/map.js b/js/ui/map.js index e3d7d9df1fb..7c5cf06b0b9 100644 --- a/js/ui/map.js +++ b/js/ui/map.js @@ -369,7 +369,7 @@ util.extend(Map.prototype, /** @lends Map.prototype */{ * * @param {string} sourceID source ID * @param {Object} params - * @param {string} [params.source-layer] The name of the vector tile layer to get features from. + * @param {string} [params.sourceLayer] The name of the vector tile layer to get features from. * @param {Array} [params.filter] A mapbox-gl-style-spec filter. * @param {callback} callback function that receives the results * diff --git a/test/js/source/worker_tile.test.js b/test/js/source/worker_tile.test.js index 877712e4b29..7a9437fb8d0 100644 --- a/test/js/source/worker_tile.test.js +++ b/test/js/source/worker_tile.test.js @@ -83,13 +83,13 @@ test('querySourceFeatures', function(t) { tile.data = new vt.VectorTile(new Protobuf(new Uint8Array(fs.readFileSync(path.join(__dirname, '/../../fixtures/mbsv5-6-18-23.vector.pbf'))))); - t.equal(tile.querySourceFeatures({ 'source-layer': 'does-not-exist'}), null); + t.equal(tile.querySourceFeatures({ 'sourceLayer': 'does-not-exist'}), null); - var roads = tile.querySourceFeatures({ 'source-layer': 'road' }); + var roads = tile.querySourceFeatures({ 'sourceLayer': 'road' }); t.equal(roads.length, 3); - t.equal(tile.querySourceFeatures({ 'source-layer': 'road', filter: ['==', 'class', 'main'] }).length, 1); - t.equal(tile.querySourceFeatures({ 'source-layer': 'road', filter: ['!=', 'class', 'main'] }).length, 2); + t.equal(tile.querySourceFeatures({ 'sourceLayer': 'road', filter: ['==', 'class', 'main'] }).length, 1); + t.equal(tile.querySourceFeatures({ 'sourceLayer': 'road', filter: ['!=', 'class', 'main'] }).length, 2); t.end(); });