7 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp
index 55b1ff058c..4bf2956a6d 100644
--- a/src/mbgl/style/layer_impl.hpp
+++ b/src/mbgl/style/layer_impl.hpp
@@ -69,7 +69,7 @@ public:
 
     virtual float getQueryRadius() const { return 0; }
     virtual bool queryIntersectsGeometry(
-            const GeometryCollection&,
+            const GeometryCoordinates&,
             const GeometryCollection&,
             const float,
             const float) const { return false; };
diff --git a/src/mbgl/style/layers/circle_layer_impl.cpp b/src/mbgl/style/layers/circle_layer_impl.cpp
index e08d9df146..33699b6665 100644
--- a/src/mbgl/style/layers/circle_layer_impl.cpp
+++ b/src/mbgl/style/layers/circle_layer_impl.cpp
@@ -40,7 +40,7 @@ float CircleLayer::Impl::getQueryRadius() const {
 }
 
 bool CircleLayer::Impl::queryIntersectsGeometry(
-        const GeometryCollection& queryGeometry,
+        const GeometryCoordinates& queryGeometry,
         const GeometryCollection& geometry,
         const float bearing,
         const float pixelsToTileUnits) const {
@@ -50,7 +50,7 @@ bool CircleLayer::Impl::queryIntersectsGeometry(
 
     auto circleRadius = paint.circleRadius * pixelsToTileUnits;
 
-    return util::multiPolygonIntersectsBufferedMultiPoint(
+    return util::polygonIntersectsBufferedMultiPoint(
             translatedQueryGeometry.value_or(queryGeometry), geometry, circleRadius);
 }
 
diff --git a/src/mbgl/style/layers/circle_layer_impl.hpp b/src/mbgl/style/layers/circle_layer_impl.hpp
index 555691b6b4..14baaf84e4 100644
--- a/src/mbgl/style/layers/circle_layer_impl.hpp
+++ b/src/mbgl/style/layers/circle_layer_impl.hpp
@@ -19,7 +19,7 @@ public:
 
     float getQueryRadius() const override;
     bool queryIntersectsGeometry(
-            const GeometryCollection& queryGeometry,
+            const GeometryCoordinates& queryGeometry,
             const GeometryCollection& geometry,
             const float bearing,
             const float pixelsToTileUnits) const override;
diff --git a/src/mbgl/style/layers/fill_layer_impl.cpp b/src/mbgl/style/layers/fill_layer_impl.cpp
index 2992312514..fc439f1cd1 100644
--- a/src/mbgl/style/layers/fill_layer_impl.cpp
+++ b/src/mbgl/style/layers/fill_layer_impl.cpp
@@ -49,7 +49,7 @@ float FillLayer::Impl::getQueryRadius() const {
 }
 
 bool FillLayer::Impl::queryIntersectsGeometry(
-        const GeometryCollection& queryGeometry,
+        const GeometryCoordinates& queryGeometry,
         const GeometryCollection& geometry,
         const float bearing,
         const float pixelsToTileUnits) const {
@@ -57,7 +57,7 @@ bool FillLayer::Impl::queryIntersectsGeometry(
     auto translatedQueryGeometry = FeatureIndex::translateQueryGeometry(
             queryGeometry, paint.fillTranslate, paint.fillTranslateAnchor, bearing, pixelsToTileUnits);
 
-    return util::multiPolygonIntersectsMultiPolygon(translatedQueryGeometry.value_or(queryGeometry), geometry);
+    return util::polygonIntersectsMultiPolygon(translatedQueryGeometry.value_or(queryGeometry), geometry);
 }
 
 } // namespace style
diff --git a/src/mbgl/style/layers/fill_layer_impl.hpp b/src/mbgl/style/layers/fill_layer_impl.hpp
index fc6578ecd1..54cfb80c86 100644
--- a/src/mbgl/style/layers/fill_layer_impl.hpp
+++ b/src/mbgl/style/layers/fill_layer_impl.hpp
@@ -19,7 +19,7 @@ public:
 
     float getQueryRadius() const override;
     bool queryIntersectsGeometry(
-            const GeometryCollection& queryGeometry,
+            const GeometryCoordinates& queryGeometry,
             const GeometryCollection& geometry,
             const float bearing,
             const float pixelsToTileUnits) const override;
diff --git a/src/mbgl/style/layers/line_layer_impl.cpp b/src/mbgl/style/layers/line_layer_impl.cpp
index 3cdd90b7fd..c116af5fc2 100644
--- a/src/mbgl/style/layers/line_layer_impl.cpp
+++ b/src/mbgl/style/layers/line_layer_impl.cpp
@@ -87,7 +87,7 @@ float LineLayer::Impl::getQueryRadius() const {
 }
 
 bool LineLayer::Impl::queryIntersectsGeometry(
-        const GeometryCollection& queryGeometry,
+        const GeometryCoordinates& queryGeometry,
         const GeometryCollection& geometry,
         const float bearing,
         const float pixelsToTileUnits) const {
@@ -98,7 +98,7 @@ bool LineLayer::Impl::queryIntersectsGeometry(
             queryGeometry, paint.lineTranslate, paint.lineTranslateAnchor, bearing, pixelsToTileUnits);
     auto offsetGeometry = offsetLine(geometry, paint.lineOffset * pixelsToTileUnits);
 
-    return util::multiPolygonIntersectsBufferedMultiLine(
+    return util::polygonIntersectsBufferedMultiLine(
             translatedQueryGeometry.value_or(queryGeometry),
             offsetGeometry.value_or(geometry),
             halfWidth);
diff --git a/src/mbgl/style/layers/line_layer_impl.hpp b/src/mbgl/style/layers/line_layer_impl.hpp
index e130bc01bc..c6b4be3bec 100644
--- a/src/mbgl/style/layers/line_layer_impl.hpp
+++ b/src/mbgl/style/layers/line_layer_impl.hpp
@@ -19,7 +19,7 @@ public:
 
     float getQueryRadius() const override;
     bool queryIntersectsGeometry(
-            const GeometryCollection& queryGeometry,
+            const GeometryCoordinates& queryGeometry,
             const GeometryCollection& geometry,
             const float bearing,
             const float pixelsToTileUnits) const override;