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

[core, ios, macos] Refactor composite stop types and conversions

Browse Source
This commit is contained in:
John Firebaugh
2017-02-07 12:35:27 -08:00
parent 9df24addfb
commit f35ca0d9df
13 changed files with 268 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mbgl/style/conversion/stringify.hpp
View File

@@ -257,31 +257,29 @@ public:
}
template <class T>
void operator()(const std::map<float, ExponentialStops<T>>& f) {
void operator()(const CompositeExponentialStops<T>& f) {
writer.Key("type");
writer.String("exponential");
if (!f.empty()) {
writer.Key("base");
writer.Double(f.begin()->second.base);
}
writer.Key("base");
writer.Double(f.base);
writer.Key("stops");
stringifyCompositeStops(f);
stringifyCompositeStops(f.stops);
}
template <class T>
void operator()(const std::map<float, IntervalStops<T>>& f) {
void operator()(const CompositeIntervalStops<T>& f) {
writer.Key("type");
writer.String("interval");
writer.Key("stops");
stringifyCompositeStops(f);
stringifyCompositeStops(f.stops);
}
template <class T>
void operator()(const std::map<float, CategoricalStops<T>>& f) {
void operator()(const CompositeCategoricalStops<T>& f) {
writer.Key("type");
writer.String("categorical");
writer.Key("stops");
stringifyCompositeStops(f);
stringifyCompositeStops(f.stops);
}
private:
@@ -301,7 +299,7 @@ private:
void stringifyCompositeStops(const std::map<float, InnerStops>& stops) {
writer.StartArray();
for (const auto& outer : stops) {
for (const auto& inner : outer.second.stops) {
for (const auto& inner : outer.second) {
writer.StartArray();
writer.StartObject();
writer.Key("zoom");