1 files changed, 2 insertions, 39 deletions

diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 962ba0f39b..f601c4126c 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -15,7 +15,6 @@
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/parser.hpp>
 #include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/class_dictionary.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/sprite/sprite_image_collection.hpp>
 #include <mbgl/sprite/sprite_loader.hpp>
@@ -93,33 +92,6 @@ Style::~Style() {
     }
 }
 
-bool Style::addClass(const std::string& className) {
-    if (hasClass(className)) return false;
-    classes.push_back(className);
-    return true;
-}
-
-bool Style::hasClass(const std::string& className) const {
-    return std::find(classes.begin(), classes.end(), className) != classes.end();
-}
-
-bool Style::removeClass(const std::string& className) {
-    const auto it = std::find(classes.begin(), classes.end(), className);
-    if (it != classes.end()) {
-        classes.erase(it);
-        return true;
-    }
-    return false;
-}
-
-void Style::setClasses(const std::vector<std::string>& classNames) {
-    classes = classNames;
-}
-
-std::vector<std::string> Style::getClasses() const {
-    return classes;
-}
-
 void Style::setTransitionOptions(const TransitionOptions& options) {
     transitionOptions = options;
 }
@@ -132,7 +104,6 @@ void Style::setJSON(const std::string& json) {
     sources.clear();
     renderSources.clear();
     layers.clear();
-    classes.clear();
     transitionOptions = {};
     updateBatch = {};
 
@@ -333,16 +304,8 @@ double Style::getDefaultPitch() const {
 
 void Style::update(const UpdateParameters& parameters) {
     const bool zoomChanged = zoomHistory.update(parameters.transformState.getZoom(), parameters.timePoint);
-    const bool classesChanged = parameters.updateFlags & Update::Classes;
-
-    std::vector<ClassID> classIDs;
-    for (const auto& className : classes) {
-        classIDs.push_back(ClassDictionary::Get().lookup(className));
-    }
-    classIDs.push_back(ClassID::Default);
 
     const TransitionParameters transitionParameters {
-        classIDs,
         parameters.timePoint,
         parameters.mode == MapMode::Continuous ? transitionOptions : TransitionOptions()
     };
@@ -432,11 +395,11 @@ void Style::update(const UpdateParameters& parameters) {
         const bool layerAdded = layerDiff.added.count(entry.first);
         const bool layerChanged = layerDiff.changed.count(entry.first);
 
-        if (classesChanged || layerAdded || layerChanged) {
+        if (layerAdded || layerChanged) {
             layer.transition(transitionParameters);
         }
 
-        if (classesChanged || layerAdded || layerChanged || zoomChanged || layer.hasTransition()) {
+        if (layerAdded || layerChanged || zoomChanged || layer.hasTransition()) {
             layer.evaluate(evaluationParameters);
         }
     }