abstract out LatLngBounds::extend

mapbox · Mar 17, 2015 · 6eea1ac · 6eea1ac
1 parent 5551f0a
commit 6eea1ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp
@@ -25,6 +25,13 @@ struct LatLngBounds {
 
     inline LatLngBounds(LatLng sw_ = {90, 180}, LatLng ne_ = {-90, -180})
         : sw(sw_), ne(ne_) {}
+
+    inline void extend(const LatLng& point) {
+        if (point.latitude < sw.latitude) sw.latitude = point.latitude;
+        if (point.latitude > ne.latitude) ne.latitude = point.latitude;
+        if (point.longitude < sw.longitude) sw.longitude = point.longitude;
+        if (point.longitude > ne.longitude) ne.longitude = point.longitude;
+    }
 };
 
 }

diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/map/annotation.cpp
@@ -12,16 +12,11 @@ Annotation::Annotation(AnnotationType type_, std::vector<AnnotationSegment> geom
     if (type == AnnotationType::Point) {
         bounds = LatLngBounds(getPoint(), getPoint());
     } else {
-        LatLng sw, ne;
         for (auto segment : geometry) {
             for (auto point : segment) {
-                if (point.latitude < sw.latitude) sw.latitude = point.latitude;
-                if (point.latitude > ne.latitude) ne.latitude = point.latitude;
-                if (point.longitude < sw.longitude) sw.longitude = point.longitude;
-                if (point.longitude > ne.longitude) ne.longitude = point.longitude;
+                bounds.extend(point);
             }
         }
-        bounds = LatLngBounds(sw, ne);
     }
 }