diff options
24 files changed, 29 insertions, 29 deletions
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index 849cb436be..b50ca75067 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -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. diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index ad40e49660..ebdce35d0f 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index f0bd18a825..842094f944 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index ad27226505..c193cfb8d9 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -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; diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index f2a5284fb9..76c2359617 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 0f4ce02aea..9ec33d7e96 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 233ed32e36..2dec03b927 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp index aaed4597dc..824606c29b 100644 --- a/include/mbgl/style/layers/hillshade_layer.hpp +++ b/include/mbgl/style/layers/hillshade_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 20dcb86abd..7b60fcf6ea 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -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 diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 410b518f7b..4f2cf53708 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index 91dab175ec..bff38d42ac 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -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 diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 0c128f84a6..92e214919a 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -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 diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index 0e9e95d51a..0a83af537c 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index 8b5359149c..f174aacadb 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index 98ca68aa48..e13cf0069a 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -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 {}; } diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index 690d74b2f5..a24ea6416a 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index e4f2a8cc53..6b4b15f83f 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index 5cda778d0f..f1da87928d 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index 7e67409a35..28a3d903da 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index 723c2b87ca..69f7ed1765 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -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 {}; diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 96b84ee1c5..da2c801e10 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index 20640020e0..2e548dfa5b 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -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 {}; diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 86c049e509..50906c51e2 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -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 {}; diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 758d1fa7cd..7293c1c6ca 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -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()); |