[core] Add only the outer polygon ring geometry to the feature index

src/mbgl/geometry/feature_index.cpp

@@ -23,17 +23,20 @@ FeatureIndex::FeatureIndex(std::unique_ptr<const GeometryTileData> tileData_)
 
 void FeatureIndex::insert(const GeometryCollection& geometries,
                           std::size_t index,
+                          FeatureType featureType,
                           const std::string& sourceLayerName,
                           const std::string& bucketLeaderID) {
-    auto featureSortIndex = sortIndex++;
     for (const auto& ring : geometries) {
         auto envelope = mapbox::geometry::envelope(ring);
         if (envelope.min.x < util::EXTENT &&
             envelope.min.y < util::EXTENT &&
             envelope.max.x >= 0 &&
             envelope.max.y >= 0) {
-            grid.insert(IndexedSubfeature(index, sourceLayerName, bucketLeaderID, featureSortIndex++),
+            grid.insert(IndexedSubfeature(index, sourceLayerName, bucketLeaderID, sortIndex++),
                         {convertPoint<float>(envelope.min), convertPoint<float>(envelope.max)});
+            if (featureType == FeatureType::Polygon) {
+                break; // Add only the first geometry as it contains outer polygon ring.
+            }
         }
     }
 }
@@ -67,13 +70,7 @@ void FeatureIndex::query(
     std::sort(features.begin(), features.end(), [](const IndexedSubfeature& a, const IndexedSubfeature& b) {
         return a.sortIndex > b.sortIndex;
     });
-    size_t previousSortIndex = std::numeric_limits<size_t>::max();
     for (const auto& indexedFeature : features) {
-
-        // If this feature is the same as the previous feature, skip it.
-        if (indexedFeature.sortIndex == previousSortIndex) continue;
-        previousSortIndex = indexedFeature.sortIndex;
-
         addFeature(result, indexedFeature, queryOptions, tileID.canonical, layers, queryGeometry, transformState, pixelsToTileUnits, posMatrix);
     }
 }

src/mbgl/geometry/feature_index.hpp

@@ -56,7 +56,7 @@ class FeatureIndex {
 
     const GeometryTileData* getData() { return tileData.get(); }
 
-    void insert(const GeometryCollection&, std::size_t index, const std::string& sourceLayerName, const std::string& bucketLeaderID);
+    void insert(const GeometryCollection&, std::size_t index, FeatureType, const std::string& sourceLayerName, const std::string& bucketLeaderID);
 
     void query(
             std::unordered_map<std::string, std::vector<Feature>>& result,

src/mbgl/layout/pattern_layout.hpp

@@ -109,7 +109,7 @@ class PatternLayout : public Layout {
             GeometryCollection geometries = feature->getGeometries();
 
             bucket->addFeature(*feature, geometries, patternPositions, patterns);
-            featureIndex->insert(geometries, i, sourceLayerID, bucketLeaderID);
+            featureIndex->insert(geometries, i, feature->getType(), sourceLayerID, bucketLeaderID);
         }
         if (bucket->hasData()) {
             for (const auto& pair : layerPropertiesMap) {

src/mbgl/tile/geometry_tile_worker.cpp

@@ -384,7 +384,7 @@ void GeometryTileWorker::parse() {
 
                 GeometryCollection geometries = feature->getGeometries();
                 bucket->addFeature(*feature, geometries, {}, PatternLayerMap ());
-                featureIndex->insert(geometries, i, sourceLayerID, leaderImpl.id);
+                featureIndex->insert(geometries, i, feature->getType(), sourceLayerID, leaderImpl.id);
             }
 
             if (!bucket->hasData()) {