Refactor util::fontStacks()
So that it does not downcast `Layer::Impl` instances. Also, an unneeded `std::vector` construction was removed from `Parser::fontStacks()`.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
#include <mbgl/util/font_stack.hpp>
|
||||
#include <mbgl/util/logging.hpp>
|
||||
#include <mbgl/style/layers/symbol_layer_impl.hpp>
|
||||
#include <mbgl/util/hash.hpp>
|
||||
|
||||
@@ -23,35 +22,8 @@ FontStackHash FontStackHasher::operator()(const FontStack& fontStack) const {
|
||||
|
||||
std::set<FontStack> fontStacks(const std::vector<Immutable<style::Layer::Impl>>& layers) {
|
||||
std::set<FontStack> result;
|
||||
|
||||
for (const auto& layer : layers) {
|
||||
if (layer->type != LayerType::Symbol) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const SymbolLayer::Impl& impl = dynamic_cast<const SymbolLayer::Impl&>(*layer);
|
||||
if (impl.layout.get<TextField>().isUndefined()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
impl.layout.get<TextFont>().match(
|
||||
[&] (Undefined) {
|
||||
result.insert({"Open Sans Regular", "Arial Unicode MS Regular"});
|
||||
},
|
||||
[&] (const FontStack& constant) {
|
||||
result.insert(constant);
|
||||
},
|
||||
[&] (const auto& function) {
|
||||
for (const auto& value : function.possibleOutputs()) {
|
||||
if (value) {
|
||||
result.insert(*value);
|
||||
} else {
|
||||
Log::Warning(Event::ParseStyle, "Layer '%s' has an invalid value for text-font and will not render text. Output values must be contained as literals within the expression.", impl.id.c_str());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
layer->populateFontStack(result);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user