[glfw] No longer necessary to wait for style load to add default marker

mapbox · Nov 30, 2015 · 2ff3a5e · 2ff3a5e
1 parent 44f56dd
commit 2ff3a5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
@@ -20,7 +20,6 @@ class GLFWView : public mbgl::View {
  std::array<uint16_t, 2> getFramebufferSize() const override;
 
  void initialize(mbgl::Map *map) override;
- void notifyMapChange(mbgl::MapChange) override;
  void activate() override;
  void deactivate() override;
  void notify() override;
@@ -62,7 +61,6 @@ class GLFWView : public mbgl::View {
  std::vector<std::string> spriteIDs;
 
 private:
- bool initializedDefaultMarker = false;
  bool fullscreen = false;
  const bool benchmark = false;
  bool tracking = false;

diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
@@ -115,13 +115,7 @@ GLFWView::~GLFWView() {
 
 void GLFWView::initialize(mbgl::Map *map_) {
  View::initialize(map_);
-}
-
-void GLFWView::notifyMapChange(mbgl::MapChange change) {
- if (change == mbgl::MapChange::MapChangeDidFinishLoadingMap && !initializedDefaultMarker) {
- initializedDefaultMarker = true;
- map->setSprite("default_marker", makeSpriteImage(22, 22, 1));
- }
+ map->setSprite("default_marker", makeSpriteImage(22, 22, 1));
 }
 
 void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, int mods) {