From aa1a54c577a95082824f2a5a6bdf4948506fcaa9 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 26 May 2016 15:59:23 -0700 Subject: [core] Do annotation longitude wrapping together with latitude clamping --- include/mbgl/annotation/shape_annotation.hpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'include/mbgl/annotation') diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp index 6e3fe95dd4..c5d4c42d87 100644 --- a/include/mbgl/annotation/shape_annotation.hpp +++ b/include/mbgl/annotation/shape_annotation.hpp @@ -31,24 +31,10 @@ public: std::string>; // creates an annotation whose type and properties are sourced from a style layer ShapeAnnotation(const AnnotationSegments& segments_, const Properties& properties_) - : segments(wrapCoordinates(segments_)), properties(properties_) {} + : segments(segments_), properties(properties_) {} const AnnotationSegments segments; const Properties properties; - -private: - AnnotationSegments wrapCoordinates(const AnnotationSegments& segments_) { - AnnotationSegments wrappedSegments; - // Wrap all segments coordinates. - for (const auto& segment_ : segments_) { - AnnotationSegment wrappedSegment; - for (const auto& latLng_ : segment_) { - wrappedSegment.push_back(latLng_.wrapped()); - } - wrappedSegments.push_back(wrappedSegment); - } - return wrappedSegments; - } }; } // namespace mbgl -- cgit v1.2.1