From 90f6c531f31a4edc5945f15a9864b914ce156ba8 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis@mapbox.com>
Date: Fri, 30 Mar 2018 22:28:05 +0200
Subject: [core] only index features within tile boundaries

Previously we relied on tile buffers for querying features who's
rendered representations cross tile boundaries. Now we query multiple
tiles making it unnecessary to index features that are completely
outside a tile's boundaries.

(cherry picked from commit 0ca53ea)
---
 src/mbgl/geometry/feature_index.cpp              | 12 +++++++++---
 src/mbgl/renderer/layers/render_circle_layer.cpp |  2 +-
 src/mbgl/tile/geometry_tile.cpp                  |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp
index 00a89e782c..6bb4783da7 100644
--- a/src/mbgl/geometry/feature_index.cpp
+++ b/src/mbgl/geometry/feature_index.cpp
@@ -27,8 +27,13 @@ void FeatureIndex::insert(const GeometryCollection& geometries,
                           const std::string& bucketName) {
     for (const auto& ring : geometries) {
         auto envelope = mapbox::geometry::envelope(ring);
-        grid.insert(IndexedSubfeature(index, sourceLayerName, bucketName, sortIndex++),
-                    {convertPoint<float>(envelope.min), convertPoint<float>(envelope.max)});
+        if (envelope.min.x < util::EXTENT &&
+            envelope.min.y < util::EXTENT &&
+            envelope.max.x >= 0 &&
+            envelope.max.y >= 0) {
+            grid.insert(IndexedSubfeature(index, sourceLayerName, bucketName, sortIndex++),
+                        {convertPoint<float>(envelope.min), convertPoint<float>(envelope.max)});
+        }
     }
 }
 
@@ -105,7 +110,8 @@ std::unordered_map<std::string, std::vector<Feature>> FeatureIndex::lookupSymbol
     });
 
     for (const auto& symbolFeature : sortedFeatures) {
-        addFeature(result, symbolFeature, queryOptions, tileID.canonical, layers, GeometryCoordinates(), {}, 0, {});
+        mat4 unusedMatrix;
+        addFeature(result, symbolFeature, queryOptions, tileID.canonical, layers, GeometryCoordinates(), {}, 0, unusedMatrix);
     }
     return result;
 }
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index acd9366072..b433a9d3fa 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -146,7 +146,7 @@ bool RenderCircleLayer::queryIntersectsFeature(
     auto stroke = evaluated.evaluate<style::CircleStrokeWidth>(zoom, feature);
     auto size = radius + stroke;
 
-	// For pitch-alignment: map, compare feature geometry to query geometry in the plane of the tile
+    // For pitch-alignment: map, compare feature geometry to query geometry in the plane of the tile
     // Otherwise, compare geometry in the plane of the viewport
     // A circle with fixed scaling relative to the viewport gets larger in tile space as it moves into the distance
     // A circle with fixed scaling relative to the map gets smaller in viewport space as it moves into the distance
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index e6177cbe34..af28fe3963 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -204,7 +204,7 @@ float GeometryTile::getQueryPadding(const std::vector<const RenderLayer*>& layer
     float queryPadding = 0;
     for (const RenderLayer* layer : layers) {
         auto bucket = getBucket(*layer->baseImpl);
-        if (bucket) {
+        if (bucket && bucket->hasData()) {
             queryPadding = std::max(queryPadding, bucket->getQueryRadius(*layer));
         }
     }
-- 
cgit v1.2.1