Remove GridIndex TODOs.

Move 'circle' type from `mapbox::geometry` to `mbgl::geometry` since it's not a GeoJSON type.

2 files changed, 5 insertions, 7 deletions

diff --git a/src/mbgl/util/grid_index.cpp b/src/mbgl/util/grid_index.cpp
index 61589f4284..88ec1f2b86 100644
--- a/src/mbgl/util/grid_index.cpp
+++ b/src/mbgl/util/grid_index.cpp
@@ -91,7 +91,6 @@ bool GridIndex<T>::hitTest(const BBox& queryBBox) const {
     return hit;
 }
 
-// TODO: templatize this on geometry type
 template <class T>
 bool GridIndex<T>::hitTest(const BCircle& queryBCircle) const {
     bool hit = false;
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp
index 6e42a97bd7..6ef2966bee 100644
--- a/src/mbgl/util/grid_index.hpp
+++ b/src/mbgl/util/grid_index.hpp
@@ -8,14 +8,14 @@
 #include <vector>
 #include <functional>
 
-// TODO: Move into geometry.hpp project
-namespace mapbox {
+namespace mbgl {
+
 namespace geometry {
 
 template <typename T>
 struct circle
 {
-    using point_type = point<T>;
+    using point_type = mapbox::geometry::point<T>;
 
     constexpr circle(point_type const& center_, T const& radius_)
         : center(center_), radius(radius_)
@@ -38,9 +38,7 @@ constexpr bool operator!=(circle<T> const& lhs, circle<T> const& rhs)
 }
 
 } // namespace geometry
-} // namespace mapbox
 
-namespace mbgl {
 
 /*
  GridIndex is a data structure for testing the intersection of
@@ -57,10 +55,11 @@ namespace mbgl {
 template <class T>
 class GridIndex {
 public:
+
     GridIndex(const float width_, const float height_, const int16_t cellSize_);
 
     using BBox = mapbox::geometry::box<float>;
-    using BCircle = mapbox::geometry::circle<float>;
+    using BCircle = geometry::circle<float>;
 
     void insert(T&& t, const BBox&);
     void insert(T&& t, const BCircle&);