summaryrefslogtreecommitdiff
path: root/src/mbgl/util/grid_index.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util/grid_index.hpp')
-rw-r--r--src/mbgl/util/grid_index.hpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp
index 20e3dfff68..30b033cedd 100644
--- a/src/mbgl/util/grid_index.hpp
+++ b/src/mbgl/util/grid_index.hpp
@@ -65,8 +65,7 @@ public:
void insert(T&& t, const BBox&);
void insert(T&& t, const BCircle&);
- std::vector<T> query(const BBox&) const;
- std::vector<T> query(const BCircle&) const;
+ std::vector<std::pair<T,BBox>> query(const BBox&) const;
bool hitTest(const BBox&) const;
bool hitTest(const BCircle&) const;
@@ -78,8 +77,8 @@ private:
bool completeIntersection(const BBox& query) const;
BBox convertToBox(const BCircle& circle) const;
- void query(const BBox&, std::function<bool (const T&)>) const;
- void query(const BCircle&, std::function<bool (const T&)>) const;
+ void query(const BBox&, std::function<bool (const T&, const BBox&)>) const;
+ void query(const BCircle&, std::function<bool (const T&, const BBox&)>) const;
int16_t convertToXCellCoord(const float x) const;
int16_t convertToYCellCoord(const float y) const;