diff options
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/map/camera_position.cpp | 6 | ||||
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 15 | ||||
-rw-r--r-- | platform/darwin/src/MGLMapSnapshotter.mm | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 4 | ||||
-rw-r--r-- | platform/node/src/node_map.cpp | 4 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 4 |
6 files changed, 17 insertions, 18 deletions
diff --git a/platform/android/src/map/camera_position.cpp b/platform/android/src/map/camera_position.cpp index 3caf4ea2f3..6c7b78c101 100644 --- a/platform/android/src/map/camera_position.cpp +++ b/platform/android/src/map/camera_position.cpp @@ -14,7 +14,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb // convert bearing, measured in radians counterclockwise from true north. // Wrapped to [−π rad, π rad). Android binding from 0 to 360 degrees - double bearing_degrees = -options.angle.value_or(0) * util::RAD2DEG; + double bearing_degrees = options.angle.value_or(0); while (bearing_degrees > 360) { bearing_degrees -= 360; } @@ -23,7 +23,7 @@ jni::Local<jni::Object<CameraPosition>> CameraPosition::New(jni::JNIEnv &env, mb } // convert tilt, core ranges from [0 rad, 1,0472 rad], android ranges from 0 to 60 - double tilt_degrees = options.pitch.value_or(0) * util::RAD2DEG; + double tilt_degrees = options.pitch.value_or(0); return javaClass.New(env, constructor, LatLng::New(env, center), options.zoom.value_or(0), tilt_degrees, bearing_degrees); } @@ -42,7 +42,7 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni {}, {}, position.Get(env, zoom), - position.Get(env, bearing) * util::DEG2RAD, + position.Get(env, bearing), position.Get(env, tilt) }; } diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 7b22e1e81b..f12c48f938 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -257,12 +257,12 @@ void NativeMapView::moveBy(jni::JNIEnv&, jni::jdouble dx, jni::jdouble dy, jni:: void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jdouble pitch, jni::jdouble zoom) { mbgl::CameraOptions options; if (angle != -1) { - options.angle = -angle * util::DEG2RAD; + options.angle = angle; } options.center = mbgl::LatLng(latitude, longitude); options.padding = insets; if (pitch != -1) { - options.pitch = pitch * util::DEG2RAD; + options.pitch = pitch; } if (zoom != -1) { options.zoom = zoom; @@ -274,12 +274,12 @@ void NativeMapView::jumpTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom, jni::jboolean easing) { mbgl::CameraOptions cameraOptions; if (angle != -1) { - cameraOptions.angle = -angle * util::DEG2RAD; + cameraOptions.angle = angle; } cameraOptions.center = mbgl::LatLng(latitude, longitude); cameraOptions.padding = insets; if (pitch != -1) { - cameraOptions.pitch = pitch * util::DEG2RAD; + cameraOptions.pitch = pitch; } if (zoom != -1) { cameraOptions.zoom = zoom; @@ -298,12 +298,12 @@ void NativeMapView::easeTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitu void NativeMapView::flyTo(jni::JNIEnv&, jni::jdouble angle, jni::jdouble latitude, jni::jdouble longitude, jni::jlong duration, jni::jdouble pitch, jni::jdouble zoom) { mbgl::CameraOptions cameraOptions; if (angle != -1) { - cameraOptions.angle = -angle * util::DEG2RAD; + cameraOptions.angle = angle; } cameraOptions.center = mbgl::LatLng(latitude, longitude); cameraOptions.padding = insets; if (pitch != -1) { - cameraOptions.pitch = pitch * util::DEG2RAD; + cameraOptions.pitch = pitch; } if (zoom != -1) { cameraOptions.zoom = zoom; @@ -416,8 +416,7 @@ void NativeMapView::setVisibleCoordinateBounds(JNIEnv& env, const jni::Array<jni mbgl::EdgeInsets mbglInsets = { RectF::getTop(env, padding), RectF::getLeft(env, padding), RectF::getBottom(env, padding), RectF::getRight(env, padding) }; mbgl::CameraOptions cameraOptions = map->cameraForLatLngs(latLngs, mbglInsets); if (direction >= 0) { - // convert from degrees to radians - cameraOptions.angle = (-direction * M_PI) / 180; + cameraOptions.angle = direction; } mbgl::AnimationOptions animationOptions; diff --git a/platform/darwin/src/MGLMapSnapshotter.mm b/platform/darwin/src/MGLMapSnapshotter.mm index aa1a988b1b..590c387145 100644 --- a/platform/darwin/src/MGLMapSnapshotter.mm +++ b/platform/darwin/src/MGLMapSnapshotter.mm @@ -550,7 +550,7 @@ const CGFloat MGLSnapshotterMinimumPixelSize = 64; if (CLLocationCoordinate2DIsValid(options.camera.centerCoordinate)) { cameraOptions.center = MGLLatLngFromLocationCoordinate2D(options.camera.centerCoordinate); } - cameraOptions.angle = MAX(0, options.camera.heading) * mbgl::util::DEG2RAD; + cameraOptions.angle = MAX(0, options.camera.heading); cameraOptions.zoom = MAX(0, options.zoomLevel); cameraOptions.pitch = MAX(0, options.camera.pitch); diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 7096c55a8c..0e95636294 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -1970,7 +1970,7 @@ public: MGLMapCamera *camera; mbgl::ScreenCoordinate anchor = mbgl::ScreenCoordinate { anchorPoint.x, anchorPoint.y }; - currentCameraOptions.angle = degrees * mbgl::util::DEG2RAD; + currentCameraOptions.angle = degrees; currentCameraOptions.anchor = anchor; camera = [self cameraForCameraOptions:currentCameraOptions]; @@ -1984,7 +1984,7 @@ public: MGLMapCamera *camera; - currentCameraOptions.pitch = pitch * mbgl::util::DEG2RAD; + currentCameraOptions.pitch = pitch; camera = [self cameraForCameraOptions:currentCameraOptions]; return camera; diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp index e32c576e14..5693edbd03 100644 --- a/platform/node/src/node_map.cpp +++ b/platform/node/src/node_map.cpp @@ -443,8 +443,8 @@ void NodeMap::startRender(NodeMap::RenderOptions options) { mbgl::CameraOptions camera; camera.center = mbgl::LatLng { options.latitude, options.longitude }; camera.zoom = options.zoom; - camera.angle = -options.bearing * mbgl::util::DEG2RAD; - camera.pitch = options.pitch * mbgl::util::DEG2RAD; + camera.angle = options.bearing; + camera.pitch = options.pitch; if (map->getAxonometric() != options.axonometric) { map->setAxonometric(options.axonometric); diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index e1fe7f5a37..ceed411ca3 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -808,10 +808,10 @@ void QMapboxGL::jumpTo(const QMapboxGLCameraOptions& camera) mbglCamera.zoom = camera.zoom.value<double>(); } if (camera.angle.isValid()) { - mbglCamera.angle = -camera.angle.value<double>() * mbgl::util::DEG2RAD; + mbglCamera.angle = camera.angle.value<double>(); } if (camera.pitch.isValid()) { - mbglCamera.pitch = camera.pitch.value<double>() * mbgl::util::DEG2RAD; + mbglCamera.pitch = camera.pitch.value<double>(); } mbglCamera.padding = d_ptr->margins; |