diff --git a/common/glfw_view.cpp b/common/glfw_view.cpp index d4f896914..0d26928e0 100644 --- a/common/glfw_view.cpp +++ b/common/glfw_view.cpp @@ -1,5 +1,7 @@ #include "glfw_view.hpp" +#include + GLFWView::GLFWView(bool fullscreen) : fullscreen(fullscreen) { #ifdef NVIDIA glDiscardFramebufferEXT = (PFNGLDISCARDFRAMEBUFFEREXTPROC)glfwGetProcAddress("glDiscardFramebufferEXT"); @@ -281,7 +283,7 @@ void show_color_debug_image(std::string name, const char *data, size_t logical_w } #endif -void notify_map_change(MapChange change) { +void notify_map_change(MapChange change, timestamp delay) { // no-op } diff --git a/common/headless_view.cpp b/common/headless_view.cpp index a44c6e6ed..2ca804664 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -1,4 +1,5 @@ #include "headless_view.hpp" +#include #include #include @@ -6,7 +7,7 @@ namespace llmr { namespace platform { -void notify_map_change(MapChange change) { +void notify_map_change(MapChange change, timestamp delay) { // no-op } diff --git a/include/llmr/platform/platform.hpp b/include/llmr/platform/platform.hpp index 138843fee..540f22619 100644 --- a/include/llmr/platform/platform.hpp +++ b/include/llmr/platform/platform.hpp @@ -1,6 +1,8 @@ #ifndef LLMR_PLATFORM_PLATFORM #define LLMR_PLATFORM_PLATFORM +#include + #include #include #include @@ -49,7 +51,7 @@ std::shared_ptr request_http(const std::string &url, void cancel_request_http(const std::shared_ptr &req); // Notifies a watcher of map changes. -void notify_map_change(MapChange key); +void notify_map_change(MapChange key, timestamp delay = 0); // Shows an alpha image with the specified dimensions in a named window. void show_debug_image(std::string name, const char *data, size_t width, size_t height); diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index 9d403d2ce..fcb1de181 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit 9d403d2cefcd63797a3da2c67d4b653e287aeec5 +Subproject commit fcb1de1812fcf460712c210bdbfe9372ce341e34 diff --git a/src/map/transform.cpp b/src/map/transform.cpp index eb9aef69e..46ddc237c 100644 --- a/src/map/transform.cpp +++ b/src/map/transform.cpp @@ -86,7 +86,8 @@ void Transform::_moveBy(const double dx, const double dy, const timestamp durati platform::notify_map_change(duration ? platform::MapChangeRegionDidChangeAnimated : - platform::MapChangeRegionDidChange); + platform::MapChangeRegionDidChange, + duration); } void Transform::setLonLat(const double lon, const double lat, const timestamp duration) { @@ -310,7 +311,8 @@ void Transform::_setScaleXY(const double new_scale, const double xn, const doubl platform::notify_map_change(duration ? platform::MapChangeRegionDidChangeAnimated : - platform::MapChangeRegionDidChange); + platform::MapChangeRegionDidChange, + duration); } #pragma mark - Constraints @@ -410,7 +412,8 @@ void Transform::_setAngle(double new_angle, const timestamp duration) { platform::notify_map_change(duration ? platform::MapChangeRegionDidChangeAnimated : - platform::MapChangeRegionDidChange); + platform::MapChangeRegionDidChange, + duration); } double Transform::getAngle() const {