set the correct v7 default font

- also skip layers with empty font names
mapbox · Apr 9, 2015 · ec94e03 · ec94e03
1 parent 6efce53
commit ec94e03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
@@ -45,8 +45,8 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer
                                                          const FilterExpression& filter,
                                                          GlyphStore &glyphStore,
                                                          const Sprite &sprite) {
-    const bool has_text = layout.text.field.size();
-    const bool has_icon = layout.icon.image.size();
+    const bool has_text = !layout.text.field.empty() && !layout.text.font.empty();
+    const bool has_icon = !layout.icon.image.empty();
 
     std::vector<SymbolFeature> features;
 

diff --git a/src/mbgl/style/style_layout.hpp b/src/mbgl/style/style_layout.hpp
@@ -61,7 +61,7 @@ class StyleLayoutSymbol {
     struct {
         RotationAlignmentType rotation_alignment = RotationAlignmentType::Viewport;
         std::string field;
-        std::string font;
+        std::string font = "Open Sans Regular, Arial Unicode MS Regular";
         float max_size = 16.0f;
         float max_width = 15.0f /* em */;
         float line_height = 1.2f /* em */;