From 13991cf78677e6ea4fdd3ee623d46724f494880d Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 1 Apr 2015 12:37:41 -0700
Subject: [PATCH] Rename methods to match gl-js

---
 src/mbgl/map/map.cpp     |  6 +++---
 src/mbgl/style/style.cpp | 17 +++++++++--------
 src/mbgl/style/style.hpp |  5 ++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e36c13a42..c4ad6efc5 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -796,7 +796,7 @@ void Map::loadStyleJSON(const std::string& json, const std::string& base) {
     style = std::make_shared<Style>();
     style->base = base;
     style->loadJSON((const uint8_t *)json.c_str());
-    style->cascadeClasses(data->getClasses());
+    style->cascade(data->getClasses());
     style->setDefaultTransitionDuration(data->getDefaultTransitionDuration());
 
     const std::string glyphURL = util::mapbox::normalizeGlyphsURL(style->glyph_url, getAccessToken());
@@ -823,7 +823,7 @@ void Map::prepare() {
     }
     if (u & static_cast<UpdateType>(Update::Classes)) {
         if (style) {
-            style->cascadeClasses(data->getClasses());
+            style->cascade(data->getClasses());
         }
     }
 
@@ -839,7 +839,7 @@ void Map::prepare() {
 
     if (style) {
         updateSources();
-        style->updateProperties(state.getNormalizedZoom(), animationTime);
+        style->recalculate(state.getNormalizedZoom(), animationTime);
 
         // Allow the sprite atlas to potentially pull new sprite images if needed.
         spriteAtlas->resize(state.getPixelRatio());
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 2992715f4..d0adfe27c 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -25,7 +25,15 @@ Style::Style()
 // for deleting the std::unique_ptr<uv::rwlock>.
 Style::~Style() {}
 
-void Style::updateProperties(float z, std::chrono::steady_clock::time_point now) {
+void Style::cascade(const std::vector<std::string>& classes) {
+    std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
+
+    for (const auto& layer : layers) {
+        layer->setClasses(classes, now, defaultTransition);
+    }
+}
+
+void Style::recalculate(float z, std::chrono::steady_clock::time_point now) {
     uv::writelock lock(mtx);
 
     zoomHistory.update(z, now);
@@ -43,13 +51,6 @@ void Style::setDefaultTransitionDuration(std::chrono::steady_clock::duration dur
     defaultTransition.duration = duration;
 }
 
-void Style::cascadeClasses(const std::vector<std::string>& classes) {
-    std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
-    for (const auto& layer : layers) {
-        layer->setClasses(classes, now, defaultTransition);
-    }
-}
-
 bool Style::hasTransitions() const {
     for (const auto& layer : layers) {
         if (layer->hasTransitions()) {
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 63ad4a66e..453ebacff 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -24,11 +24,10 @@ public:
 
     void loadJSON(const uint8_t *const data);
 
-    void updateProperties(float z, std::chrono::steady_clock::time_point now);
+    void cascade(const std::vector<std::string>&);
+    void recalculate(float z, std::chrono::steady_clock::time_point now);
 
     void setDefaultTransitionDuration(std::chrono::steady_clock::duration);
-    void cascadeClasses(const std::vector<std::string>&);
-
     bool hasTransitions() const;
 
     const std::string &getSpriteURL() const;