Corrected roundtripping altitude with rotation

mapbox · Sep 7, 2015 · 7b93107 · 7b93107
1 parent 0a172a2
commit 7b93107
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -1825,7 +1825,7 @@ - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration a
     double angle = -1;
     if (camera.heading >= 0)
     {
-        angle = MGLRadiansFromDegrees(mbgl::util::wrap(-camera.heading, 0., 360.));
+        angle = MGLRadiansFromDegrees(-camera.heading);
     }
     double pitch = -1;
     if (camera.pitch >= 0)
@@ -1851,12 +1851,12 @@ - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration a
     else // portrait
     {
         sw = _mbglMap->latLngForProjectedMeters({
-            centerMeters.northing - centerToEdge * std::cos(angle) + centerToEdge * std::cos(angle) * std::sin(pitch) / 2,
-            centerMeters.easting - centerToEdge * std::sin(angle) + centerToEdge * std::sin(angle) * std::sin(pitch) / 2,
+            centerMeters.northing - centerToEdge * std::cos(-angle) + centerToEdge * std::cos(-angle) * std::sin(pitch) / 2,
+            centerMeters.easting - centerToEdge * std::sin(-angle) + centerToEdge * std::sin(-angle) * std::sin(pitch) / 2,
         });
         ne = _mbglMap->latLngForProjectedMeters({
-            centerMeters.northing + centerToEdge * std::cos(angle) - centerToEdge * std::cos(angle) * std::sin(pitch) / 2,
-            centerMeters.easting + centerToEdge * std::sin(angle) - centerToEdge * std::sin(angle) * std::sin(pitch) / 2,
+            centerMeters.northing + centerToEdge * std::cos(-angle) - centerToEdge * std::cos(-angle) * std::sin(pitch) / 2,
+            centerMeters.easting + centerToEdge * std::sin(-angle) - centerToEdge * std::sin(-angle) * std::sin(pitch) / 2,
         });
     }
 
@@ -1865,7 +1865,7 @@ - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration a
     mbgl::CameraOptions options = _mbglMap->cameraForLatLngs({ sw, ne }, {});
     options.center = centerLatLng;
 
-    if (angle >= 0)
+    if (camera.heading >= 0)
     {
         options.angle = angle;
     }