summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-01-25 15:24:29 -0800
committerKonstantin Käfer <mail@kkaefer.com>2018-01-26 14:36:51 -0800
commitce429dcc1fce2a827e5c9462e3226c3bb04c6a39 (patch)
tree5eed851bef213b319289f70c3361826075570b02 /src
parent306898d77bae63220b3a69191aaadef6da7e2fc5 (diff)
downloadqtlocation-mapboxgl-ce429dcc1fce2a827e5c9462e3226c3bb04c6a39.tar.gz
[core] don't force downloading of Open Sans fonts
When a SymbolLayer doesn't have a text-font defined, we automatically add Open Sans/Arial Unicode MS. However, when the SymbolLayer is only used for rendering icons, it doesn't have text-field defined either. In those cases, we still force downloading Open Sans/Arial Unicode MS during offline pack creation. If the user doesn't use this font, this change should save ~15MB and a few seconds in download time.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index b177f2159c..8d14d7972c 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -277,7 +277,7 @@ std::vector<FontStack> Parser::fontStacks() const {
std::set<FontStack> result;
for (const auto& layer : layers) {
- if (layer->is<SymbolLayer>()) {
+ if (layer->is<SymbolLayer>() && !layer->as<SymbolLayer>()->getTextField().isUndefined()) {
layer->as<SymbolLayer>()->getTextFont().match(
[&] (Undefined) {
result.insert({"Open Sans Regular", "Arial Unicode MS Regular"});