summaryrefslogtreecommitdiff
path: root/platform/default/mbgl/map/map_snapshotter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'platform/default/mbgl/map/map_snapshotter.cpp')
-rw-r--r--platform/default/mbgl/map/map_snapshotter.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/platform/default/mbgl/map/map_snapshotter.cpp b/platform/default/mbgl/map/map_snapshotter.cpp
index 39f96d7210..a909e3fe9b 100644
--- a/platform/default/mbgl/map/map_snapshotter.cpp
+++ b/platform/default/mbgl/map/map_snapshotter.cpp
@@ -18,7 +18,7 @@ public:
const std::pair<bool, std::string> style,
const Size&,
const float pixelRatio,
- const CameraOptions&,
+ const optional<CameraOptions> cameraOptions,
const optional<LatLngBounds> region,
const optional<std::string> programCacheDir);
@@ -49,7 +49,7 @@ MapSnapshotter::Impl::Impl(FileSource& fileSource,
const std::pair<bool, std::string> style,
const Size& size,
const float pixelRatio,
- const CameraOptions& cameraOptions,
+ const optional<CameraOptions> cameraOptions,
const optional<LatLngBounds> region,
const optional<std::string> programCacheDir)
: frontend(size, pixelRatio, fileSource, scheduler, programCacheDir)
@@ -60,7 +60,10 @@ MapSnapshotter::Impl::Impl(FileSource& fileSource,
} else{
map.getStyle().loadURL(style.second);
}
- map.jumpTo(cameraOptions);
+
+ if (cameraOptions) {
+ map.jumpTo(*cameraOptions);
+ }
// Set region, if specified
if (region) {
@@ -151,7 +154,7 @@ MapSnapshotter::MapSnapshotter(FileSource& fileSource,
const std::pair<bool, std::string> style,
const Size& size,
const float pixelRatio,
- const CameraOptions& cameraOptions,
+ const optional<CameraOptions> cameraOptions,
const optional<LatLngBounds> region,
const optional<std::string> programCacheDir)
: impl(std::make_unique<util::Thread<MapSnapshotter::Impl>>("Map Snapshotter", fileSource, scheduler, style, size, pixelRatio, cameraOptions, region, programCacheDir)) {