1 files changed, 113 insertions, 5 deletions

diff --git a/platform/default/mbgl/map/map_snapshotter.cpp b/platform/default/mbgl/map/map_snapshotter.cpp
index 95c46344fe..7b4ec5913b 100644
--- a/platform/default/mbgl/map/map_snapshotter.cpp
+++ b/platform/default/mbgl/map/map_snapshotter.cpp
@@ -3,9 +3,11 @@
 #include <mbgl/actor/actor_ref.hpp>
 #include <mbgl/gl/headless_frontend.hpp>
 #include <mbgl/map/map.hpp>
+#include <mbgl/map/transform_state.hpp>
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/util/event.hpp>
+#include <mbgl/map/transform.hpp>
 
 namespace mbgl {
 
@@ -20,6 +22,18 @@ public:
          const optional<LatLngBounds> region,
          const optional<std::string> programCacheDir);
 
+    void setStyleURL(std::string styleURL);
+    std::string getStyleURL() const;
+
+    void setSize(Size);
+    Size getSize() const;
+
+    void setCameraOptions(CameraOptions);
+    CameraOptions getCameraOptions() const;
+
+    void setRegion(LatLngBounds);
+    LatLngBounds getRegion() const;
+
     void snapshot(ActorRef<MapSnapshotter::Callback>);
 
 private:
@@ -44,18 +58,80 @@ MapSnapshotter::Impl::Impl(FileSource& fileSource,
 
     // Set region, if specified
     if (region) {
-        mbgl::EdgeInsets insets = { 0, 0, 0, 0 };
-        std::vector<LatLng> latLngs = { region->southwest(), region->northeast() };
-        map.jumpTo(map.cameraForLatLngs(latLngs, insets));
+        this->setRegion(*region);
     }
 }
 
 void MapSnapshotter::Impl::snapshot(ActorRef<MapSnapshotter::Callback> callback) {
     map.renderStill([this, callback = std::move(callback)] (std::exception_ptr error) mutable {
-        callback.invoke(&MapSnapshotter::Callback::operator(), error, error ? PremultipliedImage() : frontend.readStillImage());
+
+        // Create lambda that captures the current transform state
+        // and can be used to translate for geographic to screen
+        // coordinates
+        assert (frontend.getTransformState());
+        PointForFn pointForFn { [=, center=map.getLatLng(), transformState = *frontend.getTransformState()] (const LatLng& latLng) {
+            LatLng unwrappedLatLng = latLng.wrapped();
+            unwrappedLatLng.unwrapForShortestPath(center);
+            Transform transform { transformState };
+            return transform.latLngToScreenCoordinate(unwrappedLatLng);
+        }};
+
+        // Collect all source attributions
+        std::vector<std::string> attributions;
+        for (auto source : map.getStyle().getSources()) {
+            auto attribution = source->getAttribution();
+            if (attribution) {
+                attributions.push_back(*attribution);
+            }
+        }
+
+        // Invoke callback
+        callback.invoke(
+                &MapSnapshotter::Callback::operator(),
+                error,
+                error ? PremultipliedImage() : frontend.readStillImage(),
+                std::move(attributions),
+                std::move(pointForFn)
+        );
     });
 }
 
+void MapSnapshotter::Impl::setStyleURL(std::string styleURL) {
+    map.getStyle().loadURL(styleURL);
+}
+
+std::string MapSnapshotter::Impl::getStyleURL() const {
+    return map.getStyle().getURL();
+}
+
+void MapSnapshotter::Impl::setSize(Size size) {
+    map.setSize(size);
+    frontend.setSize(size);
+}
+
+Size MapSnapshotter::Impl::getSize() const {
+    return map.getSize();
+}
+
+void MapSnapshotter::Impl::setCameraOptions(CameraOptions cameraOptions) {
+    map.jumpTo(cameraOptions);
+}
+
+CameraOptions MapSnapshotter::Impl::getCameraOptions() const {
+    EdgeInsets insets;
+    return map.getCameraOptions(insets);
+}
+
+void MapSnapshotter::Impl::setRegion(LatLngBounds region) {
+    mbgl::EdgeInsets insets = { 0, 0, 0, 0 };
+    std::vector<LatLng> latLngs = { region.southwest(), region.northeast() };
+    map.jumpTo(map.cameraForLatLngs(latLngs, insets));
+}
+
+LatLngBounds MapSnapshotter::Impl::getRegion() const {
+    return map.latLngBoundsForCamera(getCameraOptions());
+}
+
 MapSnapshotter::MapSnapshotter(FileSource& fileSource,
                                Scheduler& scheduler,
                                const std::string& styleURL,
@@ -70,7 +146,39 @@ MapSnapshotter::MapSnapshotter(FileSource& fileSource,
 MapSnapshotter::~MapSnapshotter() = default;
 
 void MapSnapshotter::snapshot(ActorRef<MapSnapshotter::Callback> callback) {
-   impl->actor().invoke(&Impl::snapshot, std::move(callback));
+    impl->actor().invoke(&Impl::snapshot, std::move(callback));
+}
+
+void MapSnapshotter::setStyleURL(const std::string& styleURL) {
+    impl->actor().invoke(&Impl::setStyleURL, styleURL);
+}
+
+std::string MapSnapshotter::getStyleURL() const {
+    return impl->actor().ask(&Impl::getStyleURL).get();
+}
+
+void MapSnapshotter::setSize(const Size& size) {
+    impl->actor().invoke(&Impl::setSize, size);
+}
+
+Size MapSnapshotter::getSize() const {
+    return impl->actor().ask(&Impl::getSize).get();
+}
+
+void MapSnapshotter::setCameraOptions(const CameraOptions& options) {
+    impl->actor().invoke(&Impl::setCameraOptions, options);
+}
+
+CameraOptions MapSnapshotter::getCameraOptions() const {
+    return impl->actor().ask(&Impl::getCameraOptions).get();
+}
+
+void MapSnapshotter::setRegion(const LatLngBounds& bounds) {
+    impl->actor().invoke(&Impl::setRegion, std::move(bounds));
+}
+
+LatLngBounds MapSnapshotter::getRegion() const {
+    return impl->actor().ask(&Impl::getRegion).get();
 }
 
 } // namespace mbgl