summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-03-13 14:58:40 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-03-15 14:53:32 +0200
commit2aa20ff47128e1840a51357e02cc691656cffe74 (patch)
tree800a89010656f72e2ccb7744a1846352b746800b
parent2a25b026af8247c446d32353479e11bcb76673e4 (diff)
downloadqtlocation-mapboxgl-2aa20ff47128e1840a51357e02cc691656cffe74.tar.gz
[glfw] Support mbgl::MapObserver
-rw-r--r--platform/default/mbgl/gl/headless_backend.cpp6
-rw-r--r--platform/default/mbgl/gl/headless_backend.hpp5
-rw-r--r--platform/glfw/glfw_view.cpp10
-rw-r--r--platform/glfw/glfw_view.hpp5
4 files changed, 0 insertions, 26 deletions
diff --git a/platform/default/mbgl/gl/headless_backend.cpp b/platform/default/mbgl/gl/headless_backend.cpp
index c105fd6b84..6ae19356fb 100644
--- a/platform/default/mbgl/gl/headless_backend.cpp
+++ b/platform/default/mbgl/gl/headless_backend.cpp
@@ -50,10 +50,4 @@ void HeadlessBackend::invalidate() {
assert(false);
}
-void HeadlessBackend::notifyMapChange(MapChange change) {
- if (mapChangeCallback) {
- mapChangeCallback(change);
- }
-}
-
} // namespace mbgl
diff --git a/platform/default/mbgl/gl/headless_backend.hpp b/platform/default/mbgl/gl/headless_backend.hpp
index e632d0feb6..63e3cec9ee 100644
--- a/platform/default/mbgl/gl/headless_backend.hpp
+++ b/platform/default/mbgl/gl/headless_backend.hpp
@@ -18,9 +18,6 @@ public:
~HeadlessBackend() override;
void invalidate() override;
- void notifyMapChange(MapChange) override;
-
- void setMapChangeCallback(std::function<void(MapChange)>&& cb) { mapChangeCallback = std::move(cb); }
struct Impl {
virtual ~Impl() {}
@@ -45,8 +42,6 @@ private:
bool extensionsLoaded = false;
bool active = false;
-
- std::function<void(MapChange)> mapChangeCallback;
};
} // namespace mbgl
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index 4070a0fe9b..39dca8080b 100644
--- a/platform/glfw/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -538,16 +538,6 @@ void GLFWView::setWindowTitle(const std::string& title) {
glfwSetWindowTitle(window, (std::string { "Mapbox GL: " } + title).c_str());
}
-void GLFWView::setMapChangeCallback(std::function<void(mbgl::MapChange)> callback) {
- this->mapChangeCallback = callback;
-}
-
-void GLFWView::notifyMapChange(mbgl::MapChange change) {
- if (mapChangeCallback) {
- mapChangeCallback(change);
- }
-}
-
namespace mbgl {
namespace platform {
diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index a426e58a94..bfabf6cc68 100644
--- a/platform/glfw/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
@@ -60,9 +60,6 @@ private:
// Internal
void report(float duration);
- void setMapChangeCallback(std::function<void(mbgl::MapChange)> callback);
- void notifyMapChange(mbgl::MapChange change) override;
-
mbgl::Color makeRandomColor() const;
mbgl::Point<double> makeRandomPoint() const;
static std::shared_ptr<const mbgl::SpriteImage>
@@ -81,8 +78,6 @@ private:
mbgl::AnnotationIDs annotationIDs;
std::vector<std::string> spriteIDs;
- std::function<void(mbgl::MapChange)> mapChangeCallback;
-
private:
mbgl::Map* map = nullptr;