Move class state to map

https://github.com/mapbox/mapbox-gl-js/pull/936
This commit is contained in:
John Firebaugh
2015-01-14 17:11:59 -08:00
parent c6ca57045f
commit d24b73b1a6
7 changed files with 50 additions and 56 deletions

View File

@@ -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::toggleClass(const std::string &name) {
style->toggleClass(name);
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();
}
}
}
const std::vector<std::string> &Map::getAppliedClasses() const {
return style->getAppliedClasses();
void Map::setClasses(const std::vector<std::string>& classes_) {
classes = classes_;
if (style) {
style->cascadeClasses(classes);
if (style->hasTransitions()) {
update();
}
}
}
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) {