summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-26 17:58:58 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-27 13:08:53 +0300
commit5304bbc438afd60853c97d74cd38f04a50effa06 (patch)
tree916119557766873a5a83baf8068b8b9bb9e5e0a6 /src
parentf3146e43cd19bdf85957d6d62132ac7c31eacc50 (diff)
downloadqtlocation-mapboxgl-5304bbc438afd60853c97d74cd38f04a50effa06.tar.gz
[core] Layer::getProperty supports layout properties
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/layers/background_layer.cpp15
-rw-r--r--src/mbgl/style/layers/circle_layer.cpp15
-rw-r--r--src/mbgl/style/layers/fill_extrusion_layer.cpp15
-rw-r--r--src/mbgl/style/layers/fill_layer.cpp15
-rw-r--r--src/mbgl/style/layers/heatmap_layer.cpp15
-rw-r--r--src/mbgl/style/layers/hillshade_layer.cpp15
-rw-r--r--src/mbgl/style/layers/layer.cpp.ejs41
-rw-r--r--src/mbgl/style/layers/line_layer.cpp50
-rw-r--r--src/mbgl/style/layers/raster_layer.cpp15
-rw-r--r--src/mbgl/style/layers/symbol_layer.cpp274
10 files changed, 262 insertions, 208 deletions
diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp
index 0a83af537c..9187784452 100644
--- a/src/mbgl/style/layers/background_layer.cpp
+++ b/src/mbgl/style/layers/background_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/background_layer.hpp>
@@ -164,7 +162,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"background-color", toUint8(Property::BackgroundColor)},
{"background-opacity", toUint8(Property::BackgroundOpacity)},
{"background-pattern", toUint8(Property::BackgroundPattern)},
@@ -172,11 +170,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"background-opacity-transition", toUint8(Property::BackgroundOpacityTransition)},
{"background-pattern-transition", toUint8(Property::BackgroundPatternTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::BackgroundPatternTransition);
} // namespace
optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -245,8 +244,8 @@ optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const
}
StyleProperty BackgroundLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -281,5 +280,3 @@ Mutable<Layer::Impl> BackgroundLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp
index f174aacadb..145d76a9a8 100644
--- a/src/mbgl/style/layers/circle_layer.cpp
+++ b/src/mbgl/style/layers/circle_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/circle_layer.hpp>
@@ -396,7 +394,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"circle-blur", toUint8(Property::CircleBlur)},
{"circle-color", toUint8(Property::CircleColor)},
{"circle-opacity", toUint8(Property::CircleOpacity)},
@@ -420,11 +418,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"circle-translate-transition", toUint8(Property::CircleTranslateTransition)},
{"circle-translate-anchor-transition", toUint8(Property::CircleTranslateAnchorTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::CircleTranslateAnchorTransition);
} // namespace
optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -598,8 +597,8 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con
}
StyleProperty CircleLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -666,5 +665,3 @@ Mutable<Layer::Impl> CircleLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp
index a24ea6416a..87e196926f 100644
--- a/src/mbgl/style/layers/fill_extrusion_layer.cpp
+++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/fill_extrusion_layer.hpp>
@@ -309,7 +307,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"fill-extrusion-base", toUint8(Property::FillExtrusionBase)},
{"fill-extrusion-color", toUint8(Property::FillExtrusionColor)},
{"fill-extrusion-height", toUint8(Property::FillExtrusionHeight)},
@@ -327,11 +325,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"fill-extrusion-translate-anchor-transition", toUint8(Property::FillExtrusionTranslateAnchorTransition)},
{"fill-extrusion-vertical-gradient-transition", toUint8(Property::FillExtrusionVerticalGradientTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::FillExtrusionVerticalGradientTransition);
} // namespace
optional<Error> FillExtrusionLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -480,8 +479,8 @@ optional<Error> FillExtrusionLayer::setPaintProperty(const std::string& name, co
}
StyleProperty FillExtrusionLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -536,5 +535,3 @@ Mutable<Layer::Impl> FillExtrusionLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp
index 6b4b15f83f..e3d6c6c708 100644
--- a/src/mbgl/style/layers/fill_layer.cpp
+++ b/src/mbgl/style/layers/fill_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/fill_layer.hpp>
@@ -280,7 +278,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"fill-antialias", toUint8(Property::FillAntialias)},
{"fill-color", toUint8(Property::FillColor)},
{"fill-opacity", toUint8(Property::FillOpacity)},
@@ -296,11 +294,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"fill-translate-transition", toUint8(Property::FillTranslateTransition)},
{"fill-translate-anchor-transition", toUint8(Property::FillTranslateAnchorTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::FillTranslateAnchorTransition);
} // namespace
optional<Error> FillLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -432,8 +431,8 @@ optional<Error> FillLayer::setPaintProperty(const std::string& name, const Conve
}
StyleProperty FillLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -484,5 +483,3 @@ Mutable<Layer::Impl> FillLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp
index f1da87928d..332c65c6b4 100644
--- a/src/mbgl/style/layers/heatmap_layer.cpp
+++ b/src/mbgl/style/layers/heatmap_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/heatmap_layer.hpp>
@@ -224,7 +222,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"heatmap-color", toUint8(Property::HeatmapColor)},
{"heatmap-intensity", toUint8(Property::HeatmapIntensity)},
{"heatmap-opacity", toUint8(Property::HeatmapOpacity)},
@@ -236,11 +234,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"heatmap-radius-transition", toUint8(Property::HeatmapRadiusTransition)},
{"heatmap-weight-transition", toUint8(Property::HeatmapWeightTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::HeatmapWeightTransition);
} // namespace
optional<Error> HeatmapLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -333,8 +332,8 @@ optional<Error> HeatmapLayer::setPaintProperty(const std::string& name, const Co
}
StyleProperty HeatmapLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -377,5 +376,3 @@ Mutable<Layer::Impl> HeatmapLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp
index 28a3d903da..a55c079c49 100644
--- a/src/mbgl/style/layers/hillshade_layer.cpp
+++ b/src/mbgl/style/layers/hillshade_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/hillshade_layer.hpp>
@@ -251,7 +249,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"hillshade-accent-color", toUint8(Property::HillshadeAccentColor)},
{"hillshade-exaggeration", toUint8(Property::HillshadeExaggeration)},
{"hillshade-highlight-color", toUint8(Property::HillshadeHighlightColor)},
@@ -265,11 +263,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"hillshade-illumination-direction-transition", toUint8(Property::HillshadeIlluminationDirectionTransition)},
{"hillshade-shadow-color-transition", toUint8(Property::HillshadeShadowColorTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::HillshadeShadowColorTransition);
} // namespace
optional<Error> HillshadeLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -372,8 +371,8 @@ optional<Error> HillshadeLayer::setPaintProperty(const std::string& name, const
}
StyleProperty HillshadeLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -420,5 +419,3 @@ Mutable<Layer::Impl> HillshadeLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs
index 69f7ed1765..775288264f 100644
--- a/src/mbgl/style/layers/layer.cpp.ejs
+++ b/src/mbgl/style/layers/layer.cpp.ejs
@@ -3,8 +3,6 @@
const layoutProperties = locals.layoutProperties;
const paintProperties = locals.paintProperties;
-%>
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
@@ -199,6 +197,9 @@ enum class Property : uint8_t {
<% for (const property of paintProperties) { -%>
<%- camelize(property.name) %>Transition,
<% } -%>
+<% for (const property of layoutProperties) { -%>
+ <%- camelize(property.name) %>,
+<% } -%>
};
template <typename T>
@@ -206,15 +207,22 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{<%- paintProperties.map(p => `{"${p.name}", toUint8(Property::${camelize(p.name)})}`).join(',\n ') %>,
+<% if (!layoutProperties.length) { -%>
<%- paintProperties.map(p => `{"${p.name}-transition", toUint8(Property::${camelize(p.name)}Transition)}`).join(',\n ') %>});
+<% } else { -%>
+ <%- paintProperties.map(p => `{"${p.name}-transition", toUint8(Property::${camelize(p.name)}Transition)}`).join(',\n ') %>,
+ <%- layoutProperties.map(p => `{"${p.name}", toUint8(Property::${camelize(p.name)})}`).join(',\n ') %>});
+<% } -%>
+<% const lastPaintProperty = paintProperties[paintProperties.length - 1]; -%>
+<%-`constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::${camelize(lastPaintProperty.name)}Transition);` %>
} // namespace
optional<Error> <%- camelize(type) %>Layer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -266,8 +274,8 @@ optional<Error> <%- camelize(type) %>Layer::setPaintProperty(const std::string&
}
StyleProperty <%- camelize(type) %>Layer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -280,6 +288,10 @@ StyleProperty <%- camelize(type) %>Layer::getProperty(const std::string& name) c
case Property::<%- camelize(property.name) %>Transition:
return makeStyleProperty(get<%- camelize(property.name) %>Transition());
<% } -%>
+<% for (const property of layoutProperties) { -%>
+ case Property::<%- camelize(property.name) %>:
+ return makeStyleProperty(get<%- camelize(property.name) %>());
+<% } -%>
}
return {};
}
@@ -289,17 +301,8 @@ optional<Error> <%- camelize(type) %>Layer::setLayoutProperty(const std::string&
return Layer::setVisibility(value);
}
<% if (layoutProperties.length) { -%>
- enum class Property {
-<% for (const property of layoutProperties) { -%>
- <%- camelize(property.name) %>,
-<% } -%>
- };
- MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({
- <%- layoutProperties.map(p => `{ "${p.name}", mbgl::underlying_type(Property::${camelize(p.name)}) }`).join(',\n ') %>
- });
-
- const auto it = properties.find(name.c_str());
- if (it == properties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second <= lastPaintPropertyIndex) {
return Error { "layer doesn't support this property" };
}
@@ -345,5 +348,3 @@ Mutable<Layer::Impl> <%- camelize(type) %>Layer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp
index da2c801e10..309a81ae2b 100644
--- a/src/mbgl/style/layers/line_layer.cpp
+++ b/src/mbgl/style/layers/line_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/line_layer.hpp>
@@ -455,6 +453,10 @@ enum class Property : uint8_t {
LineTranslateTransition,
LineTranslateAnchorTransition,
LineWidthTransition,
+ LineCap,
+ LineJoin,
+ LineMiterLimit,
+ LineRoundLimit,
};
template <typename T>
@@ -462,7 +464,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"line-blur", toUint8(Property::LineBlur)},
{"line-color", toUint8(Property::LineColor)},
{"line-dasharray", toUint8(Property::LineDasharray)},
@@ -484,13 +486,18 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"line-pattern-transition", toUint8(Property::LinePatternTransition)},
{"line-translate-transition", toUint8(Property::LineTranslateTransition)},
{"line-translate-anchor-transition", toUint8(Property::LineTranslateAnchorTransition)},
- {"line-width-transition", toUint8(Property::LineWidthTransition)}});
+ {"line-width-transition", toUint8(Property::LineWidthTransition)},
+ {"line-cap", toUint8(Property::LineCap)},
+ {"line-join", toUint8(Property::LineJoin)},
+ {"line-miter-limit", toUint8(Property::LineMiterLimit)},
+ {"line-round-limit", toUint8(Property::LineRoundLimit)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::LineWidthTransition);
} // namespace
optional<Error> LineLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -669,8 +676,8 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
}
StyleProperty LineLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -719,6 +726,14 @@ StyleProperty LineLayer::getProperty(const std::string& name) const {
return makeStyleProperty(getLineTranslateAnchorTransition());
case Property::LineWidthTransition:
return makeStyleProperty(getLineWidthTransition());
+ case Property::LineCap:
+ return makeStyleProperty(getLineCap());
+ case Property::LineJoin:
+ return makeStyleProperty(getLineJoin());
+ case Property::LineMiterLimit:
+ return makeStyleProperty(getLineMiterLimit());
+ case Property::LineRoundLimit:
+ return makeStyleProperty(getLineRoundLimit());
}
return {};
}
@@ -727,21 +742,8 @@ optional<Error> LineLayer::setLayoutProperty(const std::string& name, const Conv
if (name == "visibility") {
return Layer::setVisibility(value);
}
- enum class Property {
- LineCap,
- LineJoin,
- LineMiterLimit,
- LineRoundLimit,
- };
- MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({
- { "line-cap", mbgl::underlying_type(Property::LineCap) },
- { "line-join", mbgl::underlying_type(Property::LineJoin) },
- { "line-miter-limit", mbgl::underlying_type(Property::LineMiterLimit) },
- { "line-round-limit", mbgl::underlying_type(Property::LineRoundLimit) }
- });
-
- const auto it = properties.find(name.c_str());
- if (it == properties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second <= lastPaintPropertyIndex) {
return Error { "layer doesn't support this property" };
}
@@ -801,5 +803,3 @@ Mutable<Layer::Impl> LineLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp
index 2e548dfa5b..359e502f3e 100644
--- a/src/mbgl/style/layers/raster_layer.cpp
+++ b/src/mbgl/style/layers/raster_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/raster_layer.hpp>
@@ -309,7 +307,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"raster-brightness-max", toUint8(Property::RasterBrightnessMax)},
{"raster-brightness-min", toUint8(Property::RasterBrightnessMin)},
{"raster-contrast", toUint8(Property::RasterContrast)},
@@ -327,11 +325,12 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"raster-resampling-transition", toUint8(Property::RasterResamplingTransition)},
{"raster-saturation-transition", toUint8(Property::RasterSaturationTransition)}});
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::RasterSaturationTransition);
} // namespace
optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -445,8 +444,8 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
}
StyleProperty RasterLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -501,5 +500,3 @@ Mutable<Layer::Impl> RasterLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp
index 50906c51e2..b3ee0f698c 100644
--- a/src/mbgl/style/layers/symbol_layer.cpp
+++ b/src/mbgl/style/layers/symbol_layer.cpp
@@ -1,5 +1,3 @@
-// clang-format off
-
// This file is generated. Edit scripts/generate-style-code.js, then run `make style-code`.
#include <mbgl/style/layers/symbol_layer.hpp>
@@ -1133,6 +1131,47 @@ enum class Property : uint8_t {
TextOpacityTransition,
TextTranslateTransition,
TextTranslateAnchorTransition,
+ IconAllowOverlap,
+ IconAnchor,
+ IconIgnorePlacement,
+ IconImage,
+ IconKeepUpright,
+ IconOffset,
+ IconOptional,
+ IconPadding,
+ IconPitchAlignment,
+ IconRotate,
+ IconRotationAlignment,
+ IconSize,
+ IconTextFit,
+ IconTextFitPadding,
+ SymbolAvoidEdges,
+ SymbolPlacement,
+ SymbolSortKey,
+ SymbolSpacing,
+ SymbolZOrder,
+ TextAllowOverlap,
+ TextAnchor,
+ TextField,
+ TextFont,
+ TextIgnorePlacement,
+ TextJustify,
+ TextKeepUpright,
+ TextLetterSpacing,
+ TextLineHeight,
+ TextMaxAngle,
+ TextMaxWidth,
+ TextOffset,
+ TextOptional,
+ TextPadding,
+ TextPitchAlignment,
+ TextRadialOffset,
+ TextRotate,
+ TextRotationAlignment,
+ TextSize,
+ TextTransform,
+ TextVariableAnchor,
+ TextWritingMode,
};
template <typename T>
@@ -1140,7 +1179,7 @@ constexpr uint8_t toUint8(T t) noexcept {
return uint8_t(mbgl::underlying_type(t));
}
-MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
+MAPBOX_ETERNAL_CONSTEXPR const auto layerProperties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>(
{{"icon-color", toUint8(Property::IconColor)},
{"icon-halo-blur", toUint8(Property::IconHaloBlur)},
{"icon-halo-color", toUint8(Property::IconHaloColor)},
@@ -1168,13 +1207,55 @@ MAPBOX_ETERNAL_CONSTEXPR const auto paintProperties = mapbox::eternal::hash_map<
{"text-halo-width-transition", toUint8(Property::TextHaloWidthTransition)},
{"text-opacity-transition", toUint8(Property::TextOpacityTransition)},
{"text-translate-transition", toUint8(Property::TextTranslateTransition)},
- {"text-translate-anchor-transition", toUint8(Property::TextTranslateAnchorTransition)}});
-
+ {"text-translate-anchor-transition", toUint8(Property::TextTranslateAnchorTransition)},
+ {"icon-allow-overlap", toUint8(Property::IconAllowOverlap)},
+ {"icon-anchor", toUint8(Property::IconAnchor)},
+ {"icon-ignore-placement", toUint8(Property::IconIgnorePlacement)},
+ {"icon-image", toUint8(Property::IconImage)},
+ {"icon-keep-upright", toUint8(Property::IconKeepUpright)},
+ {"icon-offset", toUint8(Property::IconOffset)},
+ {"icon-optional", toUint8(Property::IconOptional)},
+ {"icon-padding", toUint8(Property::IconPadding)},
+ {"icon-pitch-alignment", toUint8(Property::IconPitchAlignment)},
+ {"icon-rotate", toUint8(Property::IconRotate)},
+ {"icon-rotation-alignment", toUint8(Property::IconRotationAlignment)},
+ {"icon-size", toUint8(Property::IconSize)},
+ {"icon-text-fit", toUint8(Property::IconTextFit)},
+ {"icon-text-fit-padding", toUint8(Property::IconTextFitPadding)},
+ {"symbol-avoid-edges", toUint8(Property::SymbolAvoidEdges)},
+ {"symbol-placement", toUint8(Property::SymbolPlacement)},
+ {"symbol-sort-key", toUint8(Property::SymbolSortKey)},
+ {"symbol-spacing", toUint8(Property::SymbolSpacing)},
+ {"symbol-z-order", toUint8(Property::SymbolZOrder)},
+ {"text-allow-overlap", toUint8(Property::TextAllowOverlap)},
+ {"text-anchor", toUint8(Property::TextAnchor)},
+ {"text-field", toUint8(Property::TextField)},
+ {"text-font", toUint8(Property::TextFont)},
+ {"text-ignore-placement", toUint8(Property::TextIgnorePlacement)},
+ {"text-justify", toUint8(Property::TextJustify)},
+ {"text-keep-upright", toUint8(Property::TextKeepUpright)},
+ {"text-letter-spacing", toUint8(Property::TextLetterSpacing)},
+ {"text-line-height", toUint8(Property::TextLineHeight)},
+ {"text-max-angle", toUint8(Property::TextMaxAngle)},
+ {"text-max-width", toUint8(Property::TextMaxWidth)},
+ {"text-offset", toUint8(Property::TextOffset)},
+ {"text-optional", toUint8(Property::TextOptional)},
+ {"text-padding", toUint8(Property::TextPadding)},
+ {"text-pitch-alignment", toUint8(Property::TextPitchAlignment)},
+ {"text-radial-offset", toUint8(Property::TextRadialOffset)},
+ {"text-rotate", toUint8(Property::TextRotate)},
+ {"text-rotation-alignment", toUint8(Property::TextRotationAlignment)},
+ {"text-size", toUint8(Property::TextSize)},
+ {"text-transform", toUint8(Property::TextTransform)},
+ {"text-variable-anchor", toUint8(Property::TextVariableAnchor)},
+ {"text-writing-mode", toUint8(Property::TextWritingMode)}});
+
+constexpr uint8_t lastPaintPropertyIndex = toUint8(Property::TextTranslateAnchorTransition);
} // namespace
optional<Error> SymbolLayer::setPaintProperty(const std::string& name, const Convertible& value) {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second > lastPaintPropertyIndex) {
return Error{"layer doesn't support this property"};
}
@@ -1368,8 +1449,8 @@ optional<Error> SymbolLayer::setPaintProperty(const std::string& name, const Con
}
StyleProperty SymbolLayer::getProperty(const std::string& name) const {
- const auto it = paintProperties.find(name.c_str());
- if (it == paintProperties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end()) {
return {};
}
@@ -1430,6 +1511,88 @@ StyleProperty SymbolLayer::getProperty(const std::string& name) const {
return makeStyleProperty(getTextTranslateTransition());
case Property::TextTranslateAnchorTransition:
return makeStyleProperty(getTextTranslateAnchorTransition());
+ case Property::IconAllowOverlap:
+ return makeStyleProperty(getIconAllowOverlap());
+ case Property::IconAnchor:
+ return makeStyleProperty(getIconAnchor());
+ case Property::IconIgnorePlacement:
+ return makeStyleProperty(getIconIgnorePlacement());
+ case Property::IconImage:
+ return makeStyleProperty(getIconImage());
+ case Property::IconKeepUpright:
+ return makeStyleProperty(getIconKeepUpright());
+ case Property::IconOffset:
+ return makeStyleProperty(getIconOffset());
+ case Property::IconOptional:
+ return makeStyleProperty(getIconOptional());
+ case Property::IconPadding:
+ return makeStyleProperty(getIconPadding());
+ case Property::IconPitchAlignment:
+ return makeStyleProperty(getIconPitchAlignment());
+ case Property::IconRotate:
+ return makeStyleProperty(getIconRotate());
+ case Property::IconRotationAlignment:
+ return makeStyleProperty(getIconRotationAlignment());
+ case Property::IconSize:
+ return makeStyleProperty(getIconSize());
+ case Property::IconTextFit:
+ return makeStyleProperty(getIconTextFit());
+ case Property::IconTextFitPadding:
+ return makeStyleProperty(getIconTextFitPadding());
+ case Property::SymbolAvoidEdges:
+ return makeStyleProperty(getSymbolAvoidEdges());
+ case Property::SymbolPlacement:
+ return makeStyleProperty(getSymbolPlacement());
+ case Property::SymbolSortKey:
+ return makeStyleProperty(getSymbolSortKey());
+ case Property::SymbolSpacing:
+ return makeStyleProperty(getSymbolSpacing());
+ case Property::SymbolZOrder:
+ return makeStyleProperty(getSymbolZOrder());
+ case Property::TextAllowOverlap:
+ return makeStyleProperty(getTextAllowOverlap());
+ case Property::TextAnchor:
+ return makeStyleProperty(getTextAnchor());
+ case Property::TextField:
+ return makeStyleProperty(getTextField());
+ case Property::TextFont:
+ return makeStyleProperty(getTextFont());
+ case Property::TextIgnorePlacement:
+ return makeStyleProperty(getTextIgnorePlacement());
+ case Property::TextJustify:
+ return makeStyleProperty(getTextJustify());
+ case Property::TextKeepUpright:
+ return makeStyleProperty(getTextKeepUpright());
+ case Property::TextLetterSpacing:
+ return makeStyleProperty(getTextLetterSpacing());
+ case Property::TextLineHeight:
+ return makeStyleProperty(getTextLineHeight());
+ case Property::TextMaxAngle:
+ return makeStyleProperty(getTextMaxAngle());
+ case Property::TextMaxWidth:
+ return makeStyleProperty(getTextMaxWidth());
+ case Property::TextOffset:
+ return makeStyleProperty(getTextOffset());
+ case Property::TextOptional:
+ return makeStyleProperty(getTextOptional());
+ case Property::TextPadding:
+ return makeStyleProperty(getTextPadding());
+ case Property::TextPitchAlignment:
+ return makeStyleProperty(getTextPitchAlignment());
+ case Property::TextRadialOffset:
+ return makeStyleProperty(getTextRadialOffset());
+ case Property::TextRotate:
+ return makeStyleProperty(getTextRotate());
+ case Property::TextRotationAlignment:
+ return makeStyleProperty(getTextRotationAlignment());
+ case Property::TextSize:
+ return makeStyleProperty(getTextSize());
+ case Property::TextTransform:
+ return makeStyleProperty(getTextTransform());
+ case Property::TextVariableAnchor:
+ return makeStyleProperty(getTextVariableAnchor());
+ case Property::TextWritingMode:
+ return makeStyleProperty(getTextWritingMode());
}
return {};
}
@@ -1438,95 +1601,8 @@ optional<Error> SymbolLayer::setLayoutProperty(const std::string& name, const Co
if (name == "visibility") {
return Layer::setVisibility(value);
}
- enum class Property {
- IconAllowOverlap,
- IconAnchor,
- IconIgnorePlacement,
- IconImage,
- IconKeepUpright,
- IconOffset,
- IconOptional,
- IconPadding,
- IconPitchAlignment,
- IconRotate,
- IconRotationAlignment,
- IconSize,
- IconTextFit,
- IconTextFitPadding,
- SymbolAvoidEdges,
- SymbolPlacement,
- SymbolSortKey,
- SymbolSpacing,
- SymbolZOrder,
- TextAllowOverlap,
- TextAnchor,
- TextField,
- TextFont,
- TextIgnorePlacement,
- TextJustify,
- TextKeepUpright,
- TextLetterSpacing,
- TextLineHeight,
- TextMaxAngle,
- TextMaxWidth,
- TextOffset,
- TextOptional,
- TextPadding,
- TextPitchAlignment,
- TextRadialOffset,
- TextRotate,
- TextRotationAlignment,
- TextSize,
- TextTransform,
- TextVariableAnchor,
- TextWritingMode,
- };
- MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({
- { "icon-allow-overlap", mbgl::underlying_type(Property::IconAllowOverlap) },
- { "icon-anchor", mbgl::underlying_type(Property::IconAnchor) },
- { "icon-ignore-placement", mbgl::underlying_type(Property::IconIgnorePlacement) },
- { "icon-image", mbgl::underlying_type(Property::IconImage) },
- { "icon-keep-upright", mbgl::underlying_type(Property::IconKeepUpright) },
- { "icon-offset", mbgl::underlying_type(Property::IconOffset) },
- { "icon-optional", mbgl::underlying_type(Property::IconOptional) },
- { "icon-padding", mbgl::underlying_type(Property::IconPadding) },
- { "icon-pitch-alignment", mbgl::underlying_type(Property::IconPitchAlignment) },
- { "icon-rotate", mbgl::underlying_type(Property::IconRotate) },
- { "icon-rotation-alignment", mbgl::underlying_type(Property::IconRotationAlignment) },
- { "icon-size", mbgl::underlying_type(Property::IconSize) },
- { "icon-text-fit", mbgl::underlying_type(Property::IconTextFit) },
- { "icon-text-fit-padding", mbgl::underlying_type(Property::IconTextFitPadding) },
- { "symbol-avoid-edges", mbgl::underlying_type(Property::SymbolAvoidEdges) },
- { "symbol-placement", mbgl::underlying_type(Property::SymbolPlacement) },
- { "symbol-sort-key", mbgl::underlying_type(Property::SymbolSortKey) },
- { "symbol-spacing", mbgl::underlying_type(Property::SymbolSpacing) },
- { "symbol-z-order", mbgl::underlying_type(Property::SymbolZOrder) },
- { "text-allow-overlap", mbgl::underlying_type(Property::TextAllowOverlap) },
- { "text-anchor", mbgl::underlying_type(Property::TextAnchor) },
- { "text-field", mbgl::underlying_type(Property::TextField) },
- { "text-font", mbgl::underlying_type(Property::TextFont) },
- { "text-ignore-placement", mbgl::underlying_type(Property::TextIgnorePlacement) },
- { "text-justify", mbgl::underlying_type(Property::TextJustify) },
- { "text-keep-upright", mbgl::underlying_type(Property::TextKeepUpright) },
- { "text-letter-spacing", mbgl::underlying_type(Property::TextLetterSpacing) },
- { "text-line-height", mbgl::underlying_type(Property::TextLineHeight) },
- { "text-max-angle", mbgl::underlying_type(Property::TextMaxAngle) },
- { "text-max-width", mbgl::underlying_type(Property::TextMaxWidth) },
- { "text-offset", mbgl::underlying_type(Property::TextOffset) },
- { "text-optional", mbgl::underlying_type(Property::TextOptional) },
- { "text-padding", mbgl::underlying_type(Property::TextPadding) },
- { "text-pitch-alignment", mbgl::underlying_type(Property::TextPitchAlignment) },
- { "text-radial-offset", mbgl::underlying_type(Property::TextRadialOffset) },
- { "text-rotate", mbgl::underlying_type(Property::TextRotate) },
- { "text-rotation-alignment", mbgl::underlying_type(Property::TextRotationAlignment) },
- { "text-size", mbgl::underlying_type(Property::TextSize) },
- { "text-transform", mbgl::underlying_type(Property::TextTransform) },
- { "text-variable-anchor", mbgl::underlying_type(Property::TextVariableAnchor) },
- { "text-writing-mode", mbgl::underlying_type(Property::TextWritingMode) }
- });
-
- const auto it = properties.find(name.c_str());
- if (it == properties.end()) {
+ const auto it = layerProperties.find(name.c_str());
+ if (it == layerProperties.end() || it->second <= lastPaintPropertyIndex) {
return Error { "layer doesn't support this property" };
}
@@ -1879,5 +1955,3 @@ Mutable<Layer::Impl> SymbolLayer::mutableBaseImpl() const {
} // namespace style
} // namespace mbgl
-
-// clang-format on