From 8ec0b70722c704545c4c1953799c43481a038489 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 12 May 2016 14:27:12 -0700
Subject: [core] Use mapbox::geometry::box in queryRenderedFeatures

---
 include/mbgl/map/map.hpp  | 4 ++--
 include/mbgl/util/geo.hpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 885fc6716c..39f0c86959 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -165,8 +165,8 @@ public:
     void removeCustomLayer(const std::string& id);
 
     // Feature queries
-    std::vector<Feature> queryRenderedFeatures(const            ScreenCoordinate&,     const optional<std::vector<std::string>>& layerIDs = {});
-    std::vector<Feature> queryRenderedFeatures(const std::array<ScreenCoordinate, 2>&, const optional<std::vector<std::string>>& layerIDs = {});
+    std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const optional<std::vector<std::string>>& layerIDs = {});
+    std::vector<Feature> queryRenderedFeatures(const ScreenBox&,        const optional<std::vector<std::string>>& layerIDs = {});
 
     // Memory
     void setSourceTileCacheSize(size_t);
diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp
index d88d8f3e8b..0fa782e06a 100644
--- a/include/mbgl/util/geo.hpp
+++ b/include/mbgl/util/geo.hpp
@@ -6,6 +6,7 @@
 
 #include <mapbox/geometry/point.hpp>
 #include <mapbox/geometry/point_arithmetic.hpp>
+#include <mapbox/geometry/box.hpp>
 
 #include <cmath>
 
@@ -15,6 +16,7 @@ class CanonicalTileID;
 class UnwrappedTileID;
 
 using ScreenCoordinate = mapbox::geometry::point<double>;
+using ScreenBox        = mapbox::geometry::box<double>;
 
 class LatLng {
 public:
-- 
cgit v1.2.1