tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[qt] Cleanup QMapboxGL::coordinateZoomForBounds()

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2019-02-28 10:02:35 +02:00
parent 2ce70f7335
commit 362231e2d0
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/qt/src/qmapboxgl.cpp
View File

@@ -1246,21 +1246,8 @@ QMapbox::CoordinateZoom QMapboxGL::coordinateZoomForBounds(const QMapbox::Coordi
double newBearing, double newPitch)
{
// FIXME: mbgl::Map::cameraForLatLngBounds should
// take bearing and pitch as input too, so this
// hack won't be needed.
double currentBearing = bearing();
double currentPitch = pitch();
setBearing(newBearing);
setPitch(newPitch);
auto bounds = mbgl::LatLngBounds::hull(mbgl::LatLng { sw.first, sw.second }, mbgl::LatLng { ne.first, ne.second });
mbgl::CameraOptions camera = d_ptr->mapObj->cameraForLatLngBounds(bounds, d_ptr->margins);
setBearing(currentBearing);
setPitch(currentPitch);
mbgl::CameraOptions camera = d_ptr->mapObj->cameraForLatLngBounds(bounds, d_ptr->margins, newBearing, newPitch);
return {{ (*camera.center).latitude(), (*camera.center).longitude() }, *camera.zoom };
}