Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native

Conflicts: src/style/style.cpp
2014-07-07 09:30:00 -07:00
parent 3e54c59656 9e9623d2ec
commit c81780a9ca
13 changed files with 67 additions and 13 deletions
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -397,6 +397,10 @@ const std::vector<std::string> &Map::getAppliedClasses() const {
   return style->getAppliedClasses();
 }

+void Map::setAppliedClasses(std::vector<std::string> &class_names) {
+    style->setAppliedClasses(class_names);
+}
+
 void Map::setDefaultTransitionDuration(uint64_t duration_milliseconds) {
    style->setDefaultTransitionDuration(duration_milliseconds);
 }