remove interactive property and make all layers interactive

fix #1479
mapbox · Feb 13, 2016 · da423d9 · da423d9
1 parent e814424
commit da423d9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/js/data/bucket.js b/js/data/bucket.js
@@ -58,7 +58,6 @@ function Bucket(options) {
     this.features = [];
     this.id = this.layer.id;
     this['source-layer'] = this.layer['source-layer'];
-    this.interactive = this.layer.interactive;
     this.minZoom = this.layer.minzoom;
     this.maxZoom = this.layer.maxzoom;
     this.filter = featureFilter(this.layer.filter);

diff --git a/js/source/worker_tile.js b/js/source/worker_tile.js
@@ -164,7 +164,7 @@ WorkerTile.prototype.parse = function(data, layers, actor, callback) {
         bucket.addFeatures(collisionTile, stacks, icons);
         var time = Date.now() - now;
 
-        if (bucket.interactive && bucket.type !== 'symbol') {
+        if (bucket.type !== 'symbol') {
             for (var i = 0; i < bucket.features.length; i++) {
                 var feature = bucket.features[i];
                 tile.featureTree.insert(feature.bbox(), bucket.layerIDs, feature);

diff --git a/js/style/style_layer.js b/js/style/style_layer.js
@@ -32,7 +32,6 @@ function StyleLayer(layer, refLayer) {
     this.minzoom = (refLayer || layer).minzoom;
     this.maxzoom = (refLayer || layer).maxzoom;
     this.filter = (refLayer || layer).filter;
-    this.interactive = (refLayer || layer).interactive;
 
     this._paintSpecifications = StyleSpecification['paint_' + this.type];
     this._layoutSpecifications = StyleSpecification['layout_' + this.type];
@@ -220,8 +219,7 @@ StyleLayer.prototype = {
             'ref': this.ref,
             'metadata': this.metadata,
             'minzoom': this.minzoom,
-            'maxzoom': this.maxzoom,
-            'interactive': this.interactive
+            'maxzoom': this.maxzoom
         };
 
         for (var klass in this._paintDeclarations) {

diff --git a/js/ui/map.js b/js/ui/map.js
@@ -301,8 +301,6 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
     /**
      * Query features at a point, or within a certain radius thereof.
      *
-     * To use this method, you must set the style property `"interactive": true` on layers you wish to query.
-     *
      * @param {Array<number>} point [x, y] pixel coordinates
      * @param {Object} params
      * @param {number} [params.radius=0] Radius in pixels to search in
@@ -328,8 +326,6 @@ util.extend(Map.prototype, /** @lends Map.prototype */{
     /**
      * Query features within a rectangle.
      *
-     * To use this method, you must set the style property `"interactive": true` on layers you wish to query.
-     *
      * @param {Array<Point>|Array<Array<number>>} [bounds] Coordinates of opposite corners of bounding rectangle, in pixel coordinates. Optional: use entire viewport if omitted.
      * @param {Object} params
      * @param {string|Array<string>} [params.layer] Only return features from a given layer or layers