From d24b73b1a67a2ab4f65f413d19374050f17782bb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 14 Jan 2015 17:11:59 -0800
Subject: Move class state to map

https://github.com/mapbox/mapbox-gl-js/pull/936
---
 src/mbgl/map/map.cpp     | 42 ++++++++++++++++++++++++++++++++----------
 src/mbgl/style/style.cpp | 28 ++--------------------------
 src/mbgl/style/style.hpp | 14 +-------------
 3 files changed, 35 insertions(+), 49 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f78b8385c0..a0c143701b 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -311,6 +311,7 @@ void Map::setStyleJSON(std::string newStyleJSON, const std::string &base) {
         style = std::make_shared<Style>();
     }
     style->loadJSON((const uint8_t *)styleJSON.c_str());
+    style->cascadeClasses(classes);
     fileSource.setBase(base);
     glyphStore->setURL(style->glyph_url);
     update();
@@ -497,23 +498,44 @@ bool Map::getDebug() const {
     return debug;
 }
 
-void Map::setAppliedClasses(const std::vector<std::string> &classes) {
-    style->setAppliedClasses(classes);
-    if (style->hasTransitions()) {
-        update();
+void Map::addClass(const std::string& klass) {
+    if (hasClass(klass)) return;
+    classes.push_back(klass);
+    if (style) {
+        style->cascadeClasses(classes);
+        if (style->hasTransitions()) {
+            update();
+        }
     }
 }
 
+void Map::removeClass(const std::string& klass) {
+    if (!hasClass(klass)) return;
+    classes.erase(std::remove(classes.begin(), classes.end(), klass), classes.end());
+    if (style) {
+        style->cascadeClasses(classes);
+        if (style->hasTransitions()) {
+            update();
+        }
+    }
+}
 
-void Map::toggleClass(const std::string &name) {
-    style->toggleClass(name);
-    if (style->hasTransitions()) {
-        update();
+void Map::setClasses(const std::vector<std::string>& classes_) {
+    classes = classes_;
+    if (style) {
+        style->cascadeClasses(classes);
+        if (style->hasTransitions()) {
+            update();
+        }
     }
 }
 
-const std::vector<std::string> &Map::getAppliedClasses() const {
-   return style->getAppliedClasses();
+bool Map::hasClass(const std::string& klass) const {
+    return std::find(classes.begin(), classes.end(), klass) != classes.end();
+}
+
+std::vector<std::string> Map::getClasses() const {
+   return classes;
 }
 
 void Map::setDefaultTransitionDuration(uint64_t milliseconds) {
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 15ca4e14fb..c9b06d7676 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -47,31 +47,9 @@ void Style::setDefaultTransitionDuration(uint16_t duration_milliseconds) {
     defaultTransition.duration = duration_milliseconds;
 }
 
-const std::vector<std::string> &Style::getAppliedClasses() const {
-    return appliedClasses;
-}
-
-void Style::setAppliedClasses(const std::vector<std::string> &class_names) {
-    appliedClasses = class_names;
-    updateClasses();
-}
-
-void Style::toggleClass(const std::string &name) {
-    if (name.length()) {
-        auto it = std::find(appliedClasses.begin(), appliedClasses.end(), name);
-        if (it == appliedClasses.end()) {
-            appliedClasses.push_back(name);
-        } else {
-            appliedClasses.erase(it);
-        }
-    }
-
-    updateClasses();
-}
-
-void Style::updateClasses() {
+void Style::cascadeClasses(const std::vector<std::string>& classes) {
     if (layers) {
-        layers->setClasses(appliedClasses, util::now(), defaultTransition);
+        layers->setClasses(classes, util::now(), defaultTransition);
     }
 }
 
@@ -100,8 +78,6 @@ void Style::loadJSON(const uint8_t *const data) {
     layers = parser.getLayers();
     sprite_url = parser.getSprite();
     glyph_url = parser.getGlyphURL();
-
-    updateClasses();
 }
 
 }
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 56f318ecbb..e9205712ef 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -25,7 +25,6 @@ class Style {
 public:
     struct exception : std::runtime_error { exception(const char *msg) : std::runtime_error(msg) {} };
 
-public:
     Style();
     ~Style();
 
@@ -35,31 +34,20 @@ public:
     void updateProperties(float z, timestamp t);
 
     void setDefaultTransitionDuration(uint16_t duration_milliseconds = 0);
-
-    void setAppliedClasses(const std::vector<std::string> &classes);
-    const std::vector<std::string> &getAppliedClasses() const;
-    void toggleClass(const std::string &name);
-
-    // Updates the styling information to reflect the current array
-    // of applied classes.
-    void updateClasses();
+    void cascadeClasses(const std::vector<std::string>&);
 
     bool hasTransitions() const;
 
     const std::string &getSpriteURL() const;
 
-public:
     util::ptr<StyleLayerGroup> layers;
     std::vector<std::string> appliedClasses;
     std::string glyph_url;
 
 private:
     std::string sprite_url;
-
-private:
     PropertyTransition defaultTransition;
     bool initial_render_complete = false;
-
     std::unique_ptr<uv::rwlock> mtx;
 };
 
-- 
cgit v1.2.1


From 5e44256fe87d78abe282190fb8a41745f8115c5b Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 16 Jan 2015 09:50:05 +1100
Subject: Move terminate() call to GLFWView to avoid problems with node

---
 src/mbgl/map/map.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index f78b8385c0..99c8320a0a 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -250,8 +250,6 @@ void Map::run() {
         mode = Mode::None;
         fileSource.clearLoop();
     }
-
-    terminate();
 }
 
 void Map::rerender() {
-- 
cgit v1.2.1