diff options
| author | ryanhamley <ryan.hamley@mapbox.com> | 2018-08-30 17:18:29 -0700 |
|---|---|---|
| committer | ryanhamley <ryan.hamley@mapbox.com> | 2018-09-07 13:05:19 -0700 |
| commit | 31cca05fc6a9d08d3b0028149f7ef2f2348b18e9 (patch) | |
| tree | 0fc6980686269d0deade28823be33bf9446610a7 /include/mbgl | |
| parent | 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 (diff) | |
| download | qtlocation-mapboxgl-31cca05fc6a9d08d3b0028149f7ef2f2348b18e9.tar.gz | |
Port symbol-z-order symbol layout style-spec property to Nativeupstream/sort-by-y
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/style/layers/symbol_layer.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/types.hpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index fa0b0c4e4e..aabda0d794 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -53,6 +53,10 @@ public: PropertyValue<bool> getSymbolAvoidEdges() const; void setSymbolAvoidEdges(PropertyValue<bool>); + static PropertyValue<SymbolZOrderType> getDefaultSymbolZOrder(); + PropertyValue<SymbolZOrderType> getSymbolZOrder() const; + void setSymbolZOrder(PropertyValue<SymbolZOrderType>); + static PropertyValue<bool> getDefaultIconAllowOverlap(); PropertyValue<bool> getIconAllowOverlap() const; void setIconAllowOverlap(PropertyValue<bool>); diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index 805cff118c..ed875733c7 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -68,6 +68,11 @@ enum class SymbolPlacementType : uint8_t { Line, LineCenter }; + +enum class SymbolZOrderType : uint8_t { + ViewportY, + Source +}; enum class AlignmentType : uint8_t { Map, |