extend annotation bounds querying for shapes

mapbox · Jun 1, 2015 · 376ad5e · 376ad5e
1 parent da01318
commit 376ad5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp
@@ -33,12 +33,19 @@ struct LatLngBounds {
         if (point.longitude > ne.longitude) ne.longitude = point.longitude;
     }
 
-    inline bool contains(const LatLng& point) {
+    inline bool contains(const LatLng& point) const {
         return (point.latitude  >= sw.latitude  &&
                 point.latitude  <= ne.latitude  &&
                 point.longitude >= sw.longitude &&
                 point.longitude <= ne.longitude);
     }
+
+    inline bool intersects(const LatLngBounds area) const {
+        return (area.ne.latitude  > sw.latitude  &&
+                area.sw.latitude  < ne.latitude  &&
+                area.ne.longitude > sw.longitude &&
+                area.sw.longitude < ne.longitude);
+    }
 };
 
 }

diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/map/annotation.cpp
@@ -450,14 +450,13 @@ AnnotationIDs AnnotationManager::getAnnotationsInBounds(const LatLngBounds& quer
                             }
 
                             // check bounds
-                            const LatLngBounds annoBounds = it->second->getBounds();
-                            return (annoBounds.sw.latitude >= queryBounds.sw.latitude &&
-                                    annoBounds.ne.latitude <= queryBounds.ne.latitude &&
-                                    annoBounds.sw.longitude >= queryBounds.sw.longitude &&
-                                    annoBounds.ne.longitude <= queryBounds.ne.longitude);
-                        } else {
-                            return false;
+                            if (it->second->type == AnnotationType::Point) {
+                                return queryBounds.contains(it->second->getPoint());
+                            } else if (it->second->type == AnnotationType::Shape) {
+                                return queryBounds.intersects(it->second->getBounds());
+                            }
                         }
+                        return false;
                     });
                 }
             }