summaryrefslogtreecommitdiff
path: root/include/mbgl/map/map.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/mbgl/map/map.hpp')
-rw-r--r--include/mbgl/map/map.hpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 4f6207fc6f..b1c840e68d 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -2,8 +2,6 @@
#include <mbgl/util/optional.hpp>
#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/map/update.hpp>
#include <mbgl/map/mode.hpp>
#include <mbgl/util/geo.hpp>
#include <mbgl/util/feature.hpp>
@@ -35,7 +33,7 @@ class Layer;
class Map : private util::noncopyable {
public:
explicit Map(Backend&,
- View&,
+ std::array<uint16_t, 2> size,
float pixelRatio,
FileSource&,
Scheduler&,
@@ -47,14 +45,14 @@ public:
// Register a callback that will get called (on the render thread) when all resources have
// been loaded and a complete render occurs.
- using StillImageCallback = std::function<void (std::exception_ptr, PremultipliedImage&&)>;
- void renderStill(StillImageCallback callback);
+ using StillImageCallback = std::function<void (std::exception_ptr)>;
+ void renderStill(View&, StillImageCallback callback);
- // Main render function.
- void render();
+ // Triggers a repaint.
+ void triggerRepaint();
- // Notifies the Map that the state has changed and an update might be necessary.
- void update(Update update);
+ // Main render function.
+ void render(View&);
// Styling
void addClass(const std::string&);
@@ -138,6 +136,7 @@ public:
ViewportMode getViewportMode() const;
// Size
+ void setSize(const std::array<uint16_t, 2>&);
uint16_t getWidth() const;
uint16_t getHeight() const;