diff options
| author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-12-17 15:04:17 +0200 |
|---|---|---|
| committer | Aleksandar Stojiljković <aleksandar.stojiljkovic@mapbox.com> | 2019-12-17 16:19:33 +0200 |
| commit | 2fd9d4a1feee88741d2a869c1b6333085e7fe58e (patch) | |
| tree | 430a3de726e9fb91c3f5abaf8b9efb6a9131674f /src | |
| parent | 5693f3be02a10071d186f33d069ea5b796f427d5 (diff) | |
| download | qtlocation-mapboxgl-2fd9d4a1feee88741d2a869c1b6333085e7fe58e.tar.gz | |
Include padding when testing camera scale in cameraForLatLngBounds
Repurpose LatLngBoundsToCameraWithBearingAndPitch to test scaling and camera setup, both with and without padding.
This adds testing of path not covered in mapbox/mapbox-gl-native-ios#59.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/map.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index cb31d434fa..9cd9fdc15f 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -213,7 +213,10 @@ CameraOptions cameraForLatLngs(const std::vector<LatLng>& latLngs, const Transfo ScreenCoordinate centerPixel = nePixel + swPixel; centerPixel /= 2.0; - return CameraOptions().withCenter(transform.screenCoordinateToLatLng(centerPixel)).withPadding(padding).withZoom(zoom); + return CameraOptions() + .withCenter(transform.screenCoordinateToLatLng(centerPixel)) + .withPadding(padding) + .withZoom(zoom); } CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, const EdgeInsets& padding, optional<double> bearing, optional<double> pitch) const { |