diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-01 10:00:36 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-04 14:45:32 +0200 |
| commit | 586b22c0df99dec7e2089ba938cfbd8f96b3ce18 (patch) | |
| tree | 27b614da853bb7f1db0e0ea5f7eaa10534ca4f4e /platform/qt/src | |
| parent | ba7427b4acf116aca7451ad3a6067dc234d3fa70 (diff) | |
| download | qtlocation-mapboxgl-586b22c0df99dec7e2089ba938cfbd8f96b3ce18.tar.gz | |
[core] Remove map coordinate setters/getters
Diffstat (limited to 'platform/qt/src')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 02c38e209d..7ed8f04007 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -685,12 +685,12 @@ void QMapboxGL::setStyleUrl(const QString &url) */ double QMapboxGL::latitude() const { - return d_ptr->mapObj->getLatLng(d_ptr->margins).latitude(); + return d_ptr->mapObj->getCameraOptions(d_ptr->margins).center->latitude(); } void QMapboxGL::setLatitude(double latitude_) { - d_ptr->mapObj->setLatLng(mbgl::LatLng { latitude_, longitude() }, d_ptr->margins); + d_ptr->mapObj->jumpTo(mbgl::CameraOptions().withCenter(mbgl::LatLng { latitude_, longitude() }).withPadding(d_ptr->margins)); } /*! @@ -703,12 +703,12 @@ void QMapboxGL::setLatitude(double latitude_) */ double QMapboxGL::longitude() const { - return d_ptr->mapObj->getLatLng(d_ptr->margins).longitude(); + return d_ptr->mapObj->getCameraOptions(d_ptr->margins).center->longitude(); } void QMapboxGL::setLongitude(double longitude_) { - d_ptr->mapObj->setLatLng(mbgl::LatLng { latitude(), longitude_ }, d_ptr->margins); + d_ptr->mapObj->jumpTo(mbgl::CameraOptions().withCenter(mbgl::LatLng { latitude(), longitude_ }).withPadding(d_ptr->margins)); } /*! @@ -784,13 +784,15 @@ double QMapboxGL::maximumZoom() const */ Coordinate QMapboxGL::coordinate() const { - const mbgl::LatLng& latLng = d_ptr->mapObj->getLatLng(d_ptr->margins); + const mbgl::LatLng& latLng = *d_ptr->mapObj->getCameraOptions(d_ptr->margins).center; return Coordinate(latLng.latitude(), latLng.longitude()); } void QMapboxGL::setCoordinate(const QMapbox::Coordinate &coordinate_) { - d_ptr->mapObj->setLatLng(mbgl::LatLng { coordinate_.first, coordinate_.second }, d_ptr->margins); + d_ptr->mapObj->jumpTo(mbgl::CameraOptions() + .withCenter(mbgl::LatLng { coordinate_.first, coordinate_.second }) + .withPadding(d_ptr->margins)); } /*! |