From b6e5edc26844df6a5f1f6e34881826828d36ce6a Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 9 Feb 2017 12:36:40 -0800 Subject: [core] Restore support for *-transition properties --- include/mbgl/style/layers/background_layer.hpp | 5 +++++ include/mbgl/style/layers/circle_layer.hpp | 12 ++++++++++++ include/mbgl/style/layers/fill_extrusion_layer.hpp | 9 +++++++++ include/mbgl/style/layers/fill_layer.hpp | 9 +++++++++ include/mbgl/style/layers/layer.hpp.ejs | 3 +++ include/mbgl/style/layers/line_layer.hpp | 12 ++++++++++++ include/mbgl/style/layers/raster_layer.hpp | 9 +++++++++ include/mbgl/style/layers/symbol_layer.hpp | 16 ++++++++++++++++ 8 files changed, 75 insertions(+) (limited to 'include/mbgl/style/layers') diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 050cb67df6..94076931e7 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class BackgroundLayer : public Layer { public: BackgroundLayer(const std::string& layerID); @@ -22,14 +24,17 @@ public: static PropertyValue getDefaultBackgroundColor(); PropertyValue getBackgroundColor(const optional& klass = {}) const; void setBackgroundColor(PropertyValue, const optional& klass = {}); + void setBackgroundColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultBackgroundPattern(); PropertyValue getBackgroundPattern(const optional& klass = {}) const; void setBackgroundPattern(PropertyValue, const optional& klass = {}); + void setBackgroundPatternTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultBackgroundOpacity(); PropertyValue getBackgroundOpacity(const optional& klass = {}) const; void setBackgroundOpacity(PropertyValue, const optional& klass = {}); + void setBackgroundOpacityTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 8ffea9946f..35db4b3962 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class CircleLayer : public Layer { public: CircleLayer(const std::string& layerID, const std::string& sourceID); @@ -30,42 +32,52 @@ public: static DataDrivenPropertyValue getDefaultCircleRadius(); DataDrivenPropertyValue getCircleRadius(const optional& klass = {}) const; void setCircleRadius(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleRadiusTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleColor(); DataDrivenPropertyValue getCircleColor(const optional& klass = {}) const; void setCircleColor(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleBlur(); DataDrivenPropertyValue getCircleBlur(const optional& klass = {}) const; void setCircleBlur(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleBlurTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleOpacity(); DataDrivenPropertyValue getCircleOpacity(const optional& klass = {}) const; void setCircleOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultCircleTranslate(); PropertyValue> getCircleTranslate(const optional& klass = {}) const; void setCircleTranslate(PropertyValue>, const optional& klass = {}); + void setCircleTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultCircleTranslateAnchor(); PropertyValue getCircleTranslateAnchor(const optional& klass = {}) const; void setCircleTranslateAnchor(PropertyValue, const optional& klass = {}); + void setCircleTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultCirclePitchScale(); PropertyValue getCirclePitchScale(const optional& klass = {}) const; void setCirclePitchScale(PropertyValue, const optional& klass = {}); + void setCirclePitchScaleTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeWidth(); DataDrivenPropertyValue getCircleStrokeWidth(const optional& klass = {}) const; void setCircleStrokeWidth(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeColor(); DataDrivenPropertyValue getCircleStrokeColor(const optional& klass = {}) const; void setCircleStrokeColor(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultCircleStrokeOpacity(); DataDrivenPropertyValue getCircleStrokeOpacity(const optional& klass = {}) const; void setCircleStrokeOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setCircleStrokeOpacityTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index 09a0040ff3..c19a4ee168 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class FillExtrusionLayer : public Layer { public: FillExtrusionLayer(const std::string& layerID, const std::string& sourceID); @@ -30,30 +32,37 @@ public: static PropertyValue getDefaultFillExtrusionOpacity(); PropertyValue getFillExtrusionOpacity(const optional& klass = {}) const; void setFillExtrusionOpacity(PropertyValue, const optional& klass = {}); + void setFillExtrusionOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionColor(); DataDrivenPropertyValue getFillExtrusionColor(const optional& klass = {}) const; void setFillExtrusionColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultFillExtrusionTranslate(); PropertyValue> getFillExtrusionTranslate(const optional& klass = {}) const; void setFillExtrusionTranslate(PropertyValue>, const optional& klass = {}); + void setFillExtrusionTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillExtrusionTranslateAnchor(); PropertyValue getFillExtrusionTranslateAnchor(const optional& klass = {}) const; void setFillExtrusionTranslateAnchor(PropertyValue, const optional& klass = {}); + void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillExtrusionPattern(); PropertyValue getFillExtrusionPattern(const optional& klass = {}) const; void setFillExtrusionPattern(PropertyValue, const optional& klass = {}); + void setFillExtrusionPatternTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionHeight(); DataDrivenPropertyValue getFillExtrusionHeight(const optional& klass = {}) const; void setFillExtrusionHeight(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionHeightTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillExtrusionBase(); DataDrivenPropertyValue getFillExtrusionBase(const optional& klass = {}) const; void setFillExtrusionBase(DataDrivenPropertyValue, const optional& klass = {}); + void setFillExtrusionBaseTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 079541ec39..c064eab350 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class FillLayer : public Layer { public: FillLayer(const std::string& layerID, const std::string& sourceID); @@ -30,30 +32,37 @@ public: static PropertyValue getDefaultFillAntialias(); PropertyValue getFillAntialias(const optional& klass = {}) const; void setFillAntialias(PropertyValue, const optional& klass = {}); + void setFillAntialiasTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillOpacity(); DataDrivenPropertyValue getFillOpacity(const optional& klass = {}) const; void setFillOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setFillOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillColor(); DataDrivenPropertyValue getFillColor(const optional& klass = {}) const; void setFillColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillColorTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultFillOutlineColor(); DataDrivenPropertyValue getFillOutlineColor(const optional& klass = {}) const; void setFillOutlineColor(DataDrivenPropertyValue, const optional& klass = {}); + void setFillOutlineColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultFillTranslate(); PropertyValue> getFillTranslate(const optional& klass = {}) const; void setFillTranslate(PropertyValue>, const optional& klass = {}); + void setFillTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillTranslateAnchor(); PropertyValue getFillTranslateAnchor(const optional& klass = {}) const; void setFillTranslateAnchor(PropertyValue, const optional& klass = {}); + void setFillTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultFillPattern(); PropertyValue getFillPattern(const optional& klass = {}) const; void setFillPattern(PropertyValue, const optional& klass = {}); + void setFillPatternTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 0c902de5af..d66eae8198 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -21,6 +21,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class <%- camelize(type) %>Layer : public Layer { public: <% if (type === 'background') { -%> @@ -58,6 +60,7 @@ public: static <%- propertyValueType(property) %> getDefault<%- camelize(property.name) %>(); <%- propertyValueType(property) %> get<%- camelize(property.name) %>(const optional& klass = {}) const; void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>, const optional& klass = {}); + void set<%- camelize(property.name) %>Transition(const TransitionOptions&, const optional& klass = {}); <% } -%> // Private implementation diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index c9413f1096..2ed269ae74 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -14,6 +14,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class LineLayer : public Layer { public: LineLayer(const std::string& layerID, const std::string& sourceID); @@ -50,42 +52,52 @@ public: static DataDrivenPropertyValue getDefaultLineOpacity(); DataDrivenPropertyValue getLineOpacity(const optional& klass = {}) const; void setLineOpacity(DataDrivenPropertyValue, const optional& klass = {}); + void setLineOpacityTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineColor(); DataDrivenPropertyValue getLineColor(const optional& klass = {}) const; void setLineColor(DataDrivenPropertyValue, const optional& klass = {}); + void setLineColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultLineTranslate(); PropertyValue> getLineTranslate(const optional& klass = {}) const; void setLineTranslate(PropertyValue>, const optional& klass = {}); + void setLineTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLineTranslateAnchor(); PropertyValue getLineTranslateAnchor(const optional& klass = {}) const; void setLineTranslateAnchor(PropertyValue, const optional& klass = {}); + void setLineTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLineWidth(); PropertyValue getLineWidth(const optional& klass = {}) const; void setLineWidth(PropertyValue, const optional& klass = {}); + void setLineWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineGapWidth(); DataDrivenPropertyValue getLineGapWidth(const optional& klass = {}) const; void setLineGapWidth(DataDrivenPropertyValue, const optional& klass = {}); + void setLineGapWidthTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineOffset(); DataDrivenPropertyValue getLineOffset(const optional& klass = {}) const; void setLineOffset(DataDrivenPropertyValue, const optional& klass = {}); + void setLineOffsetTransition(const TransitionOptions&, const optional& klass = {}); static DataDrivenPropertyValue getDefaultLineBlur(); DataDrivenPropertyValue getLineBlur(const optional& klass = {}) const; void setLineBlur(DataDrivenPropertyValue, const optional& klass = {}); + void setLineBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultLineDasharray(); PropertyValue> getLineDasharray(const optional& klass = {}) const; void setLineDasharray(PropertyValue>, const optional& klass = {}); + void setLineDasharrayTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultLinePattern(); PropertyValue getLinePattern(const optional& klass = {}) const; void setLinePattern(PropertyValue, const optional& klass = {}); + void setLinePatternTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index e998abf12a..72665baa72 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -12,6 +12,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class RasterLayer : public Layer { public: RasterLayer(const std::string& layerID, const std::string& sourceID); @@ -25,30 +27,37 @@ public: static PropertyValue getDefaultRasterOpacity(); PropertyValue getRasterOpacity(const optional& klass = {}) const; void setRasterOpacity(PropertyValue, const optional& klass = {}); + void setRasterOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterHueRotate(); PropertyValue getRasterHueRotate(const optional& klass = {}) const; void setRasterHueRotate(PropertyValue, const optional& klass = {}); + void setRasterHueRotateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterBrightnessMin(); PropertyValue getRasterBrightnessMin(const optional& klass = {}) const; void setRasterBrightnessMin(PropertyValue, const optional& klass = {}); + void setRasterBrightnessMinTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterBrightnessMax(); PropertyValue getRasterBrightnessMax(const optional& klass = {}) const; void setRasterBrightnessMax(PropertyValue, const optional& klass = {}); + void setRasterBrightnessMaxTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterSaturation(); PropertyValue getRasterSaturation(const optional& klass = {}) const; void setRasterSaturation(PropertyValue, const optional& klass = {}); + void setRasterSaturationTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterContrast(); PropertyValue getRasterContrast(const optional& klass = {}) const; void setRasterContrast(PropertyValue, const optional& klass = {}); + void setRasterContrastTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultRasterFadeDuration(); PropertyValue getRasterFadeDuration(const optional& klass = {}) const; void setRasterFadeDuration(PropertyValue, const optional& klass = {}); + void setRasterFadeDurationTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index 8826408e81..ad21a70698 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -14,6 +14,8 @@ namespace mbgl { namespace style { +class TransitionOptions; + class SymbolLayer : public Layer { public: SymbolLayer(const std::string& layerID, const std::string& sourceID); @@ -170,58 +172,72 @@ public: static PropertyValue getDefaultIconOpacity(); PropertyValue getIconOpacity(const optional& klass = {}) const; void setIconOpacity(PropertyValue, const optional& klass = {}); + void setIconOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconColor(); PropertyValue getIconColor(const optional& klass = {}) const; void setIconColor(PropertyValue, const optional& klass = {}); + void setIconColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloColor(); PropertyValue getIconHaloColor(const optional& klass = {}) const; void setIconHaloColor(PropertyValue, const optional& klass = {}); + void setIconHaloColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloWidth(); PropertyValue getIconHaloWidth(const optional& klass = {}) const; void setIconHaloWidth(PropertyValue, const optional& klass = {}); + void setIconHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconHaloBlur(); PropertyValue getIconHaloBlur(const optional& klass = {}) const; void setIconHaloBlur(PropertyValue, const optional& klass = {}); + void setIconHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultIconTranslate(); PropertyValue> getIconTranslate(const optional& klass = {}) const; void setIconTranslate(PropertyValue>, const optional& klass = {}); + void setIconTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultIconTranslateAnchor(); PropertyValue getIconTranslateAnchor(const optional& klass = {}) const; void setIconTranslateAnchor(PropertyValue, const optional& klass = {}); + void setIconTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextOpacity(); PropertyValue getTextOpacity(const optional& klass = {}) const; void setTextOpacity(PropertyValue, const optional& klass = {}); + void setTextOpacityTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextColor(); PropertyValue getTextColor(const optional& klass = {}) const; void setTextColor(PropertyValue, const optional& klass = {}); + void setTextColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloColor(); PropertyValue getTextHaloColor(const optional& klass = {}) const; void setTextHaloColor(PropertyValue, const optional& klass = {}); + void setTextHaloColorTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloWidth(); PropertyValue getTextHaloWidth(const optional& klass = {}) const; void setTextHaloWidth(PropertyValue, const optional& klass = {}); + void setTextHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextHaloBlur(); PropertyValue getTextHaloBlur(const optional& klass = {}) const; void setTextHaloBlur(PropertyValue, const optional& klass = {}); + void setTextHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue> getDefaultTextTranslate(); PropertyValue> getTextTranslate(const optional& klass = {}) const; void setTextTranslate(PropertyValue>, const optional& klass = {}); + void setTextTranslateTransition(const TransitionOptions&, const optional& klass = {}); static PropertyValue getDefaultTextTranslateAnchor(); PropertyValue getTextTranslateAnchor(const optional& klass = {}) const; void setTextTranslateAnchor(PropertyValue, const optional& klass = {}); + void setTextTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); // Private implementation -- cgit v1.2.1