tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Layer::getPaintProperty() -> Layer::getProperty()

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-09-26 14:58:00 +03:00
parent 1733e29f0a
commit 34ab7be225
24 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/style/layer.hpp
View File

@@ -115,7 +115,7 @@ public:
const conversion::Convertible& value) = 0;
optional<conversion::Error> setVisibility(const conversion::Convertible& value);
virtual StyleProperty getPaintProperty(const std::string&) const = 0;
virtual StyleProperty getProperty(const std::string&) const = 0;
// Private implementation
// TODO : We should not have public mutable data members.

2
include/mbgl/style/layers/background_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/circle_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/custom_layer.hpp
View File

@@ -71,7 +71,7 @@ public:
// Dynamic properties
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string&) const final;
StyleProperty getProperty(const std::string&) const final;
// Private implementation
class Impl;

2
include/mbgl/style/layers/fill_extrusion_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/fill_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/heatmap_layer.hpp
View File

@@ -25,7 +25,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/hillshade_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/layer.hpp.ejs
View File

@@ -40,7 +40,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
<% if (layoutProperties.length) { -%>
// Layout properties

2
include/mbgl/style/layers/line_layer.hpp
View File

@@ -27,7 +27,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Layout properties

2
include/mbgl/style/layers/raster_layer.hpp
View File

@@ -24,7 +24,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Paint properties

2
include/mbgl/style/layers/symbol_layer.hpp
View File

@@ -26,7 +26,7 @@ public:
optional<conversion::Error> setLayoutProperty(const std::string& name, const conversion::Convertible& value) final;
optional<conversion::Error> setPaintProperty(const std::string& name, const conversion::Convertible& value) final;
StyleProperty getPaintProperty(const std::string& name) const final;
StyleProperty getProperty(const std::string& name) const final;
// Layout properties

2
src/mbgl/style/layers/background_layer.cpp
View File

@@ -244,7 +244,7 @@ optional<Error> BackgroundLayer::setPaintProperty(const std::string& name, const
return Error{"layer doesn't support this property"};
}
StyleProperty BackgroundLayer::getPaintProperty(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()) {
return {};

2
src/mbgl/style/layers/circle_layer.cpp
View File

@@ -597,7 +597,7 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con
return Error{"layer doesn't support this property"};
}
StyleProperty CircleLayer::getPaintProperty(const std::string& name) const {
StyleProperty CircleLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/custom_layer.cpp
View File

@@ -47,7 +47,7 @@ optional<Error> CustomLayer::setLayoutProperty(const std::string&, const Convert
return Error { "layer doesn't support this property" };
}
StyleProperty CustomLayer::getPaintProperty(const std::string&) const {
StyleProperty CustomLayer::getProperty(const std::string&) const {
return {};
}

2
src/mbgl/style/layers/fill_extrusion_layer.cpp
View File

@@ -479,7 +479,7 @@ optional<Error> FillExtrusionLayer::setPaintProperty(const std::string& name, co
return Error{"layer doesn't support this property"};
}
StyleProperty FillExtrusionLayer::getPaintProperty(const std::string& name) const {
StyleProperty FillExtrusionLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/fill_layer.cpp
View File

@@ -431,7 +431,7 @@ optional<Error> FillLayer::setPaintProperty(const std::string& name, const Conve
return Error{"layer doesn't support this property"};
}
StyleProperty FillLayer::getPaintProperty(const std::string& name) const {
StyleProperty FillLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/heatmap_layer.cpp
View File

@@ -332,7 +332,7 @@ optional<Error> HeatmapLayer::setPaintProperty(const std::string& name, const Co
return Error{"layer doesn't support this property"};
}
StyleProperty HeatmapLayer::getPaintProperty(const std::string& name) const {
StyleProperty HeatmapLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/hillshade_layer.cpp
View File

@@ -371,7 +371,7 @@ optional<Error> HillshadeLayer::setPaintProperty(const std::string& name, const
return Error{"layer doesn't support this property"};
}
StyleProperty HillshadeLayer::getPaintProperty(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()) {
return {};

2
src/mbgl/style/layers/layer.cpp.ejs
View File

@@ -265,7 +265,7 @@ optional<Error> <%- camelize(type) %>Layer::setPaintProperty(const std::string&
return Error{"layer doesn't support this property"};
}
StyleProperty <%- camelize(type) %>Layer::getPaintProperty(const std::string& name) const {
StyleProperty <%- camelize(type) %>Layer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/line_layer.cpp
View File

@@ -668,7 +668,7 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
return Error{"layer doesn't support this property"};
}
StyleProperty LineLayer::getPaintProperty(const std::string& name) const {
StyleProperty LineLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/raster_layer.cpp
View File

@@ -444,7 +444,7 @@ optional<Error> RasterLayer::setPaintProperty(const std::string& name, const Con
return Error{"layer doesn't support this property"};
}
StyleProperty RasterLayer::getPaintProperty(const std::string& name) const {
StyleProperty RasterLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

2
src/mbgl/style/layers/symbol_layer.cpp
View File

@@ -1367,7 +1367,7 @@ optional<Error> SymbolLayer::setPaintProperty(const std::string& name, const Con
return Error{"layer doesn't support this property"};
}
StyleProperty SymbolLayer::getPaintProperty(const std::string& name) const {
StyleProperty SymbolLayer::getProperty(const std::string& name) const {
const auto it = paintProperties.find(name.c_str());
if (it == paintProperties.end()) {
return {};

12
test/map/map.test.cpp
View File

@@ -953,15 +953,15 @@ TEST(Map, UniversalStyleGetter) {
Layer* lineLayer = test.map.getStyle().getLayer("line");
ASSERT_TRUE(lineLayer);
StyleProperty nonexistent = lineLayer->getPaintProperty("nonexistent");
StyleProperty nonexistent = lineLayer->getProperty("nonexistent");
ASSERT_FALSE(nonexistent.value);
EXPECT_EQ(StyleProperty::Kind::Undefined, nonexistent.kind);
StyleProperty undefined = lineLayer->getPaintProperty("line-blur");
StyleProperty undefined = lineLayer->getProperty("line-blur");
ASSERT_FALSE(undefined.value);
EXPECT_EQ(StyleProperty::Kind::Undefined, undefined.kind);
StyleProperty lineColor = lineLayer->getPaintProperty("line-color");
StyleProperty lineColor = lineLayer->getProperty("line-color");
ASSERT_TRUE(lineColor.value);
EXPECT_EQ(StyleProperty::Kind::Constant, lineColor.kind);
ASSERT_TRUE(lineColor.value.getObject());
@@ -971,19 +971,19 @@ TEST(Map, UniversalStyleGetter) {
EXPECT_EQ(0.0, *color.at("b").getDouble());
EXPECT_EQ(1.0, *color.at("a").getDouble());
StyleProperty lineOpacity = lineLayer->getPaintProperty("line-opacity");
StyleProperty lineOpacity = lineLayer->getProperty("line-opacity");
ASSERT_TRUE(lineOpacity.value);
EXPECT_EQ(StyleProperty::Kind::Constant, lineOpacity.kind);
ASSERT_TRUE(lineOpacity.value.getDouble());
EXPECT_EQ(0.5, *lineOpacity.value.getDouble());
StyleProperty lineOpacityTransition = lineLayer->getPaintProperty("line-opacity-transition");
StyleProperty lineOpacityTransition = lineLayer->getProperty("line-opacity-transition");
ASSERT_TRUE(lineOpacityTransition.value);
EXPECT_EQ(StyleProperty::Kind::Transition, lineOpacityTransition.kind);
ASSERT_TRUE(lineOpacityTransition.value.getArray());
EXPECT_EQ(3u, lineOpacityTransition.value.getArray()->size());
StyleProperty lineWidth = lineLayer->getPaintProperty("line-width");
StyleProperty lineWidth = lineLayer->getProperty("line-width");
ASSERT_TRUE(lineWidth.value);
EXPECT_EQ(StyleProperty::Kind::Expression, lineWidth.kind);
ASSERT_TRUE(lineWidth.value.getArray());