diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-07-04 23:12:58 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-07-05 15:11:14 +0300 |
| commit | 514485502db8ecacf2b11abad4599d7af09b0cf8 (patch) | |
| tree | 21a76d2fda8b5ec5e19624f5eedf609a545b59b4 /include/mbgl/style/layers | |
| parent | 32dce870d756063167e000302afb553714f1f0cb (diff) | |
| download | qtlocation-mapboxgl-514485502db8ecacf2b11abad4599d7af09b0cf8.tar.gz | |
Rename `HeatmapColorPropertyValue` to `ColorRampPropertyValue`
Based on patch from @lbud (Lauren Budorick).
Give `HeatmapColorPropertyValue` a more generic name,
since the same value type will be used for both `heatmap-color`
and `line-gradient` properties.
Diffstat (limited to 'include/mbgl/style/layers')
| -rw-r--r-- | include/mbgl/style/layers/heatmap_layer.hpp | 8 | ||||
| -rw-r--r-- | include/mbgl/style/layers/layer.hpp.ejs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp index 33d927ad38..4c434b2aff 100644 --- a/include/mbgl/style/layers/heatmap_layer.hpp +++ b/include/mbgl/style/layers/heatmap_layer.hpp @@ -2,11 +2,11 @@ #pragma once +#include <mbgl/style/color_ramp_property_value.hpp> #include <mbgl/style/layer.hpp> #include <mbgl/style/filter.hpp> #include <mbgl/style/property_value.hpp> #include <mbgl/style/data_driven_property_value.hpp> -#include <mbgl/style/heatmap_color_property_value.hpp> #include <mbgl/util/color.hpp> @@ -55,9 +55,9 @@ public: void setHeatmapIntensityTransition(const TransitionOptions&); TransitionOptions getHeatmapIntensityTransition() const; - static HeatmapColorPropertyValue getDefaultHeatmapColor(); - HeatmapColorPropertyValue getHeatmapColor() const; - void setHeatmapColor(HeatmapColorPropertyValue); + static ColorRampPropertyValue getDefaultHeatmapColor(); + ColorRampPropertyValue getHeatmapColor() const; + void setHeatmapColor(ColorRampPropertyValue); void setHeatmapColorTransition(const TransitionOptions&); TransitionOptions getHeatmapColorTransition() const; diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 6d40405ccd..e15ff74f17 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -7,13 +7,13 @@ #pragma once +<% if (type === 'heatmap') { -%> +#include <mbgl/style/color_ramp_property_value.hpp> +<% } -%> #include <mbgl/style/layer.hpp> #include <mbgl/style/filter.hpp> #include <mbgl/style/property_value.hpp> #include <mbgl/style/data_driven_property_value.hpp> -<% if (type === 'heatmap') { -%> -#include <mbgl/style/heatmap_color_property_value.hpp> -<% } -%> #include <mbgl/util/color.hpp> |