tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of brittle hardcoded style toggling method

Browse Source 
Conflicts:
	ios/mapbox-gl-cocoa
This commit is contained in:
Justin R. Miller
2014-06-01 11:18:52 -07:00
parent 1be972eb15
commit 4d66a51d22
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/llmr/map/map.hpp
View File

@@ -53,7 +53,6 @@ public:
void resize(uint16_t width, uint16_t height, float ratio, uint16_t fb_width, uint16_t fb_height);
// Styling
void toggleStyle();
void setAppliedClasses(std::set<std::string> appliedClasses);
std::set<std::string> getAppliedClasses() const;
void setDefaultTransitionDuration(uint64_t duration_milliseconds = 0);

2
ios/mapbox-gl-cocoa

Submodule ios/mapbox-gl-cocoa updated: 31b708821d...687d84e7c9

23
src/map/map.cpp
View File

@@ -387,29 +387,6 @@ bool Map::getDebug() const {
return debug;
}
void Map::toggleStyle() {
setDefaultTransitionDuration(300);
style->cancelTransitions();
if (style->appliedClasses.size() == 1) {
for (auto source_it = style->classes.begin(); source_it != style->classes.end(); source_it++) {
if (source_it->first != "default") {
style->appliedClasses.insert(source_it->first);
break;
}
}
} else {
for (auto source_it = style->classes.begin(); source_it != style->classes.end(); source_it++) {
if (source_it->first != "default") {
style->appliedClasses.erase(source_it->first);
break;
}
}
}
update();
}
void Map::setAppliedClasses(std::set<std::string> appliedClasses) {
style->cancelTransitions();