summaryrefslogtreecommitdiff
path: root/platform/qt
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-01 09:58:58 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-04 14:45:32 +0200
commitba7427b4acf116aca7451ad3a6067dc234d3fa70 (patch)
tree106462886345e60f47bdeeaaf46580c67987b064 /platform/qt
parent73ac3c784fe755650dc631e2e722a47890981248 (diff)
downloadqtlocation-mapboxgl-ba7427b4acf116aca7451ad3a6067dc234d3fa70.tar.gz
[core] Transform{State}: s/angle/bearing/
Diffstat (limited to 'platform/qt')
-rw-r--r--platform/qt/include/qmapboxgl.hpp2
-rw-r--r--platform/qt/src/qmapboxgl.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp
index 5309c58494..e83be37511 100644
--- a/platform/qt/include/qmapboxgl.hpp
+++ b/platform/qt/include/qmapboxgl.hpp
@@ -94,7 +94,7 @@ struct Q_MAPBOXGL_EXPORT QMapboxGLCameraOptions {
QVariant center; // Coordinate
QVariant anchor; // QPointF
QVariant zoom; // double
- QVariant angle; // double
+ QVariant bearing; // double
QVariant pitch; // double
};
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 3f3b40b7a8..02c38e209d 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -829,8 +829,8 @@ void QMapboxGL::jumpTo(const QMapboxGLCameraOptions& camera)
if (camera.zoom.isValid()) {
mbglCamera.zoom = camera.zoom.value<double>();
}
- if (camera.angle.isValid()) {
- mbglCamera.angle = camera.angle.value<double>();
+ if (camera.bearing.isValid()) {
+ mbglCamera.bearing = camera.bearing.value<double>();
}
if (camera.pitch.isValid()) {
mbglCamera.pitch = camera.pitch.value<double>();
@@ -855,20 +855,20 @@ void QMapboxGL::jumpTo(const QMapboxGLCameraOptions& camera)
*/
double QMapboxGL::bearing() const
{
- return *d_ptr->mapObj->getCameraOptions().angle;
+ return *d_ptr->mapObj->getCameraOptions().bearing;
}
void QMapboxGL::setBearing(double degrees)
{
d_ptr->mapObj->jumpTo(mbgl::CameraOptions()
- .withAngle(degrees)
+ .withBearing(degrees)
.withPadding(d_ptr->margins));
}
void QMapboxGL::setBearing(double degrees, const QPointF &center)
{
d_ptr->mapObj->jumpTo(mbgl::CameraOptions()
- .withAngle(degrees)
+ .withBearing(degrees)
.withAnchor(mbgl::ScreenCoordinate { center.x(), center.y() }));
}