From e329492f0f830eff9e482cf4f62ea31c41d5d6c8 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Mon, 8 Apr 2019 17:58:34 +0300 Subject: [core] Add 'auto' enum value to symbol-z-order layout property --- src/mbgl/style/layers/symbol_layer_properties.hpp | 2 +- src/mbgl/style/types.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp index cf8a9ab0d0..6b6e86fc3e 100644 --- a/src/mbgl/style/layers/symbol_layer_properties.hpp +++ b/src/mbgl/style/layers/symbol_layer_properties.hpp @@ -29,7 +29,7 @@ struct SymbolAvoidEdges : LayoutProperty { struct SymbolZOrder : LayoutProperty { static constexpr const char *name() { return "symbol-z-order"; } - static SymbolZOrderType defaultValue() { return SymbolZOrderType::ViewportY; } + static SymbolZOrderType defaultValue() { return SymbolZOrderType::Auto; } }; struct IconAllowOverlap : LayoutProperty { diff --git a/src/mbgl/style/types.cpp b/src/mbgl/style/types.cpp index 889f6029e2..f388a9385f 100644 --- a/src/mbgl/style/types.cpp +++ b/src/mbgl/style/types.cpp @@ -78,6 +78,7 @@ MBGL_DEFINE_ENUM(SymbolAnchorType, { }); MBGL_DEFINE_ENUM(SymbolZOrderType, { + { SymbolZOrderType::Auto, "auto" }, { SymbolZOrderType::ViewportY, "viewport-y" }, { SymbolZOrderType::Source, "source" } }); -- cgit v1.2.1