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 --- src/mbgl/annotation/shape_annotation_impl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index 1da2e4ea9f..76a237bfc2 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -91,8 +91,9 @@ void ShapeAnnotationImpl::updateTile(const CanonicalTileID& tileID, AnnotationTi for (auto& segment : shape.segments) { std::vector points; for (auto& latLng : segment) { - const double constrainedLatitude = util::clamp(latLng.latitude, -util::LATITUDE_MAX, util::LATITUDE_MAX); - points.push_back(geojsonvt::LonLat(latLng.longitude, constrainedLatitude)); + const double wrappedLongitude = util::wrap(latLng.longitude, -util::LONGITUDE_MAX, util::LONGITUDE_MAX); + const double clampedLatitude = util::clamp(latLng.latitude, -util::LATITUDE_MAX, util::LATITUDE_MAX); + points.push_back(geojsonvt::LonLat(wrappedLongitude, clampedLatitude)); } if (type == geojsonvt::ProjectedFeatureType::Polygon && -- cgit v1.2.1