From 16c435b1517b15a5ea8654987979ef58800b838b Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Jun 2016 16:28:21 -0700 Subject: [core, node] Implement bindings for addLayer --- include/mbgl/style/layers/background_layer.hpp | 6 +++--- include/mbgl/style/layers/circle_layer.hpp | 12 +++++------ include/mbgl/style/layers/fill_layer.hpp | 14 ++++++------- include/mbgl/style/layers/layer.hpp.ejs | 2 +- include/mbgl/style/layers/line_layer.hpp | 20 +++++++++--------- include/mbgl/style/layers/raster_layer.hpp | 14 ++++++------- include/mbgl/style/layers/symbol_layer.hpp | 28 +++++++++++++------------- 7 files changed, 48 insertions(+), 48 deletions(-) (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 2eb84ee499..ac97ec2e6d 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -19,13 +19,13 @@ public: // Paint properties PropertyValue getBackgroundColor() const; - void setBackgroundColor(PropertyValue); + void setBackgroundColor(PropertyValue, const optional& klass = {}); PropertyValue getBackgroundPattern() const; - void setBackgroundPattern(PropertyValue); + void setBackgroundPattern(PropertyValue, const optional& klass = {}); PropertyValue getBackgroundOpacity() const; - void setBackgroundOpacity(PropertyValue); + void setBackgroundOpacity(PropertyValue, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index 9c2b458d4b..c8d99ab30e 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -27,22 +27,22 @@ public: // Paint properties PropertyValue getCircleRadius() const; - void setCircleRadius(PropertyValue); + void setCircleRadius(PropertyValue, const optional& klass = {}); PropertyValue getCircleColor() const; - void setCircleColor(PropertyValue); + void setCircleColor(PropertyValue, const optional& klass = {}); PropertyValue getCircleBlur() const; - void setCircleBlur(PropertyValue); + void setCircleBlur(PropertyValue, const optional& klass = {}); PropertyValue getCircleOpacity() const; - void setCircleOpacity(PropertyValue); + void setCircleOpacity(PropertyValue, const optional& klass = {}); PropertyValue> getCircleTranslate() const; - void setCircleTranslate(PropertyValue>); + void setCircleTranslate(PropertyValue>, const optional& klass = {}); PropertyValue getCircleTranslateAnchor() const; - void setCircleTranslateAnchor(PropertyValue); + void setCircleTranslateAnchor(PropertyValue, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 90538dd3ea..e70d67f538 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -27,25 +27,25 @@ public: // Paint properties PropertyValue getFillAntialias() const; - void setFillAntialias(PropertyValue); + void setFillAntialias(PropertyValue, const optional& klass = {}); PropertyValue getFillOpacity() const; - void setFillOpacity(PropertyValue); + void setFillOpacity(PropertyValue, const optional& klass = {}); PropertyValue getFillColor() const; - void setFillColor(PropertyValue); + void setFillColor(PropertyValue, const optional& klass = {}); PropertyValue getFillOutlineColor() const; - void setFillOutlineColor(PropertyValue); + void setFillOutlineColor(PropertyValue, const optional& klass = {}); PropertyValue> getFillTranslate() const; - void setFillTranslate(PropertyValue>); + void setFillTranslate(PropertyValue>, const optional& klass = {}); PropertyValue getFillTranslateAnchor() const; - void setFillTranslateAnchor(PropertyValue); + void setFillTranslateAnchor(PropertyValue, const optional& klass = {}); PropertyValue getFillPattern() const; - void setFillPattern(PropertyValue); + void setFillPattern(PropertyValue, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 60365be906..aaae30287c 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -54,7 +54,7 @@ public: <% for (const property of paintProperties) { -%> PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() const; - void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>); + void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>, const optional& klass = {}); <% } -%> // Private implementation diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 4ffeee114a..abcb425b96 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -43,34 +43,34 @@ public: // Paint properties PropertyValue getLineOpacity() const; - void setLineOpacity(PropertyValue); + void setLineOpacity(PropertyValue, const optional& klass = {}); PropertyValue getLineColor() const; - void setLineColor(PropertyValue); + void setLineColor(PropertyValue, const optional& klass = {}); PropertyValue> getLineTranslate() const; - void setLineTranslate(PropertyValue>); + void setLineTranslate(PropertyValue>, const optional& klass = {}); PropertyValue getLineTranslateAnchor() const; - void setLineTranslateAnchor(PropertyValue); + void setLineTranslateAnchor(PropertyValue, const optional& klass = {}); PropertyValue getLineWidth() const; - void setLineWidth(PropertyValue); + void setLineWidth(PropertyValue, const optional& klass = {}); PropertyValue getLineGapWidth() const; - void setLineGapWidth(PropertyValue); + void setLineGapWidth(PropertyValue, const optional& klass = {}); PropertyValue getLineOffset() const; - void setLineOffset(PropertyValue); + void setLineOffset(PropertyValue, const optional& klass = {}); PropertyValue getLineBlur() const; - void setLineBlur(PropertyValue); + void setLineBlur(PropertyValue, const optional& klass = {}); PropertyValue> getLineDasharray() const; - void setLineDasharray(PropertyValue>); + void setLineDasharray(PropertyValue>, const optional& klass = {}); PropertyValue getLinePattern() const; - void setLinePattern(PropertyValue); + void setLinePattern(PropertyValue, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index 372434e46d..dea0c26bf3 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -22,25 +22,25 @@ public: // Paint properties PropertyValue getRasterOpacity() const; - void setRasterOpacity(PropertyValue); + void setRasterOpacity(PropertyValue, const optional& klass = {}); PropertyValue getRasterHueRotate() const; - void setRasterHueRotate(PropertyValue); + void setRasterHueRotate(PropertyValue, const optional& klass = {}); PropertyValue getRasterBrightnessMin() const; - void setRasterBrightnessMin(PropertyValue); + void setRasterBrightnessMin(PropertyValue, const optional& klass = {}); PropertyValue getRasterBrightnessMax() const; - void setRasterBrightnessMax(PropertyValue); + void setRasterBrightnessMax(PropertyValue, const optional& klass = {}); PropertyValue getRasterSaturation() const; - void setRasterSaturation(PropertyValue); + void setRasterSaturation(PropertyValue, const optional& klass = {}); PropertyValue getRasterContrast() const; - void setRasterContrast(PropertyValue); + void setRasterContrast(PropertyValue, const optional& klass = {}); PropertyValue getRasterFadeDuration() const; - void setRasterFadeDuration(PropertyValue); + void setRasterFadeDuration(PropertyValue, const optional& klass = {}); // Private implementation diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index b21c8deaf7..77b63d9b91 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -133,46 +133,46 @@ public: // Paint properties PropertyValue getIconOpacity() const; - void setIconOpacity(PropertyValue); + void setIconOpacity(PropertyValue, const optional& klass = {}); PropertyValue getIconColor() const; - void setIconColor(PropertyValue); + void setIconColor(PropertyValue, const optional& klass = {}); PropertyValue getIconHaloColor() const; - void setIconHaloColor(PropertyValue); + void setIconHaloColor(PropertyValue, const optional& klass = {}); PropertyValue getIconHaloWidth() const; - void setIconHaloWidth(PropertyValue); + void setIconHaloWidth(PropertyValue, const optional& klass = {}); PropertyValue getIconHaloBlur() const; - void setIconHaloBlur(PropertyValue); + void setIconHaloBlur(PropertyValue, const optional& klass = {}); PropertyValue> getIconTranslate() const; - void setIconTranslate(PropertyValue>); + void setIconTranslate(PropertyValue>, const optional& klass = {}); PropertyValue getIconTranslateAnchor() const; - void setIconTranslateAnchor(PropertyValue); + void setIconTranslateAnchor(PropertyValue, const optional& klass = {}); PropertyValue getTextOpacity() const; - void setTextOpacity(PropertyValue); + void setTextOpacity(PropertyValue, const optional& klass = {}); PropertyValue getTextColor() const; - void setTextColor(PropertyValue); + void setTextColor(PropertyValue, const optional& klass = {}); PropertyValue getTextHaloColor() const; - void setTextHaloColor(PropertyValue); + void setTextHaloColor(PropertyValue, const optional& klass = {}); PropertyValue getTextHaloWidth() const; - void setTextHaloWidth(PropertyValue); + void setTextHaloWidth(PropertyValue, const optional& klass = {}); PropertyValue getTextHaloBlur() const; - void setTextHaloBlur(PropertyValue); + void setTextHaloBlur(PropertyValue, const optional& klass = {}); PropertyValue> getTextTranslate() const; - void setTextTranslate(PropertyValue>); + void setTextTranslate(PropertyValue>, const optional& klass = {}); PropertyValue getTextTranslateAnchor() const; - void setTextTranslateAnchor(PropertyValue); + void setTextTranslateAnchor(PropertyValue, const optional& klass = {}); // Private implementation -- cgit v1.2.1