Merge pull request mapbox#554 from mapbox/fix-map-featuresAt

Fixes for map.featuresAt
timiyay · Jul 19, 2014 · 82bfb8b · 82bfb8b
2 parents c0a924b + ba2771e
commit 82bfb8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/js/geometry/featuretree.js b/js/geometry/featuretree.js
@@ -104,11 +104,11 @@ FeatureTree.prototype.queryBuckets = function(matching, x, y, radius, params, ca
 
 
 function geometryContainsPoint(rings, type, p, radius) {
-    if (type === 'point') {
+    if (type === 'Point') {
         return pointContainsPoint(rings, p, radius);
-    } else if (type === 'line') {
+    } else if (type === 'LineString') {
         return lineContainsPoint(rings, p, radius);
-    } else if (type === 'fill') {
+    } else if (type === 'Polygon') {
         return polyContainsPoint(rings, p) ? true : lineContainsPoint(rings, p, radius);
     } else {
         return false;

diff --git a/js/ui/vectortile.js b/js/ui/vectortile.js
@@ -47,9 +47,9 @@ VectorTile.prototype.featuresAt = function(pos, params, callback) {
         x: pos.x,
         y: pos.y,
         scale: pos.scale,
+        source: this.source.id,
         params: params
     }, callback, this.workerID);
-
 };
 
 VectorTile.prototype.onTileLoad = function(data) {