From 9eba2a66d107f30aa9216fb34ed62df60797986a Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 10 May 2017 12:37:46 -0700 Subject: [core, node, darwin, qt] Remove support for paint classes --- include/mbgl/style/conversion/layer.hpp | 23 +-- .../style/conversion/make_property_setters.hpp | 198 ++++++++++----------- .../style/conversion/make_property_setters.hpp.ejs | 8 +- include/mbgl/style/conversion/property_setter.hpp | 30 +--- include/mbgl/style/layers/background_layer.hpp | 24 +-- include/mbgl/style/layers/circle_layer.hpp | 80 ++++----- include/mbgl/style/layers/fill_extrusion_layer.hpp | 56 +++--- include/mbgl/style/layers/fill_layer.hpp | 56 +++--- include/mbgl/style/layers/layer.hpp.ejs | 8 +- include/mbgl/style/layers/line_layer.hpp | 80 ++++----- include/mbgl/style/layers/raster_layer.hpp | 56 +++--- include/mbgl/style/layers/symbol_layer.hpp | 112 ++++++------ 12 files changed, 352 insertions(+), 379 deletions(-) (limited to 'include/mbgl/style') diff --git a/include/mbgl/style/conversion/layer.hpp b/include/mbgl/style/conversion/layer.hpp index 3a64c36bf5..1fe467165d 100644 --- a/include/mbgl/style/conversion/layer.hpp +++ b/include/mbgl/style/conversion/layer.hpp @@ -28,30 +28,23 @@ optional setLayoutProperty(Layer& layer, const std::string& name, const V } template -optional setPaintProperty(Layer& layer, const std::string& name, const V& value, const optional& klass) { +optional setPaintProperty(Layer& layer, const std::string& name, const V& value) { static const auto setters = makePaintPropertySetters(); auto it = setters.find(name); if (it == setters.end()) { return Error { "property not found" }; } - return it->second(layer, value, klass); + return it->second(layer, value); } template optional setPaintProperties(Layer& layer, const V& value) { - return eachMember(value, [&] (const std::string& paintName, const V& paintValue) -> optional { - if (paintName.compare(0, 5, "paint") != 0) { - return {}; - } - - optional klass; - if (paintName.compare(0, 6, "paint.") == 0) { - klass = paintName.substr(6); - } - - return eachMember(paintValue, [&] (const std::string& k, const V& v) { - return setPaintProperty(layer, k, v, klass); - }); + auto paintValue = objectMember(value, "paint"); + if (!paintValue) { + return {}; + } + return eachMember(*paintValue, [&] (const std::string& k, const V& v) { + return setPaintProperty(layer, k, v); }); } diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp index 105cca99d6..582ac7079f 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp +++ b/include/mbgl/style/conversion/make_property_setters.hpp @@ -20,50 +20,50 @@ namespace conversion { template auto makeLayoutPropertySetters() { - std::unordered_map> result; + std::unordered_map> result; result["visibility"] = &setVisibility; - result["line-cap"] = &setLayoutProperty, &LineLayer::setLineCap>; - result["line-join"] = &setLayoutProperty, &LineLayer::setLineJoin>; - result["line-miter-limit"] = &setLayoutProperty, &LineLayer::setLineMiterLimit>; - result["line-round-limit"] = &setLayoutProperty, &LineLayer::setLineRoundLimit>; - - result["symbol-placement"] = &setLayoutProperty, &SymbolLayer::setSymbolPlacement>; - result["symbol-spacing"] = &setLayoutProperty, &SymbolLayer::setSymbolSpacing>; - result["symbol-avoid-edges"] = &setLayoutProperty, &SymbolLayer::setSymbolAvoidEdges>; - result["icon-allow-overlap"] = &setLayoutProperty, &SymbolLayer::setIconAllowOverlap>; - result["icon-ignore-placement"] = &setLayoutProperty, &SymbolLayer::setIconIgnorePlacement>; - result["icon-optional"] = &setLayoutProperty, &SymbolLayer::setIconOptional>; - result["icon-rotation-alignment"] = &setLayoutProperty, &SymbolLayer::setIconRotationAlignment>; - result["icon-size"] = &setLayoutProperty, &SymbolLayer::setIconSize>; - result["icon-text-fit"] = &setLayoutProperty, &SymbolLayer::setIconTextFit>; - result["icon-text-fit-padding"] = &setLayoutProperty>, &SymbolLayer::setIconTextFitPadding>; - result["icon-image"] = &setLayoutProperty, &SymbolLayer::setIconImage>; - result["icon-rotate"] = &setLayoutProperty, &SymbolLayer::setIconRotate>; - result["icon-padding"] = &setLayoutProperty, &SymbolLayer::setIconPadding>; - result["icon-keep-upright"] = &setLayoutProperty, &SymbolLayer::setIconKeepUpright>; - result["icon-offset"] = &setLayoutProperty>, &SymbolLayer::setIconOffset>; - result["text-pitch-alignment"] = &setLayoutProperty, &SymbolLayer::setTextPitchAlignment>; - result["text-rotation-alignment"] = &setLayoutProperty, &SymbolLayer::setTextRotationAlignment>; - result["text-field"] = &setLayoutProperty, &SymbolLayer::setTextField>; - result["text-font"] = &setLayoutProperty>, &SymbolLayer::setTextFont>; - result["text-size"] = &setLayoutProperty, &SymbolLayer::setTextSize>; - result["text-max-width"] = &setLayoutProperty, &SymbolLayer::setTextMaxWidth>; - result["text-line-height"] = &setLayoutProperty, &SymbolLayer::setTextLineHeight>; - result["text-letter-spacing"] = &setLayoutProperty, &SymbolLayer::setTextLetterSpacing>; - result["text-justify"] = &setLayoutProperty, &SymbolLayer::setTextJustify>; - result["text-anchor"] = &setLayoutProperty, &SymbolLayer::setTextAnchor>; - result["text-max-angle"] = &setLayoutProperty, &SymbolLayer::setTextMaxAngle>; - result["text-rotate"] = &setLayoutProperty, &SymbolLayer::setTextRotate>; - result["text-padding"] = &setLayoutProperty, &SymbolLayer::setTextPadding>; - result["text-keep-upright"] = &setLayoutProperty, &SymbolLayer::setTextKeepUpright>; - result["text-transform"] = &setLayoutProperty, &SymbolLayer::setTextTransform>; - result["text-offset"] = &setLayoutProperty>, &SymbolLayer::setTextOffset>; - result["text-allow-overlap"] = &setLayoutProperty, &SymbolLayer::setTextAllowOverlap>; - result["text-ignore-placement"] = &setLayoutProperty, &SymbolLayer::setTextIgnorePlacement>; - result["text-optional"] = &setLayoutProperty, &SymbolLayer::setTextOptional>; + result["line-cap"] = &setProperty, &LineLayer::setLineCap>; + result["line-join"] = &setProperty, &LineLayer::setLineJoin>; + result["line-miter-limit"] = &setProperty, &LineLayer::setLineMiterLimit>; + result["line-round-limit"] = &setProperty, &LineLayer::setLineRoundLimit>; + + result["symbol-placement"] = &setProperty, &SymbolLayer::setSymbolPlacement>; + result["symbol-spacing"] = &setProperty, &SymbolLayer::setSymbolSpacing>; + result["symbol-avoid-edges"] = &setProperty, &SymbolLayer::setSymbolAvoidEdges>; + result["icon-allow-overlap"] = &setProperty, &SymbolLayer::setIconAllowOverlap>; + result["icon-ignore-placement"] = &setProperty, &SymbolLayer::setIconIgnorePlacement>; + result["icon-optional"] = &setProperty, &SymbolLayer::setIconOptional>; + result["icon-rotation-alignment"] = &setProperty, &SymbolLayer::setIconRotationAlignment>; + result["icon-size"] = &setProperty, &SymbolLayer::setIconSize>; + result["icon-text-fit"] = &setProperty, &SymbolLayer::setIconTextFit>; + result["icon-text-fit-padding"] = &setProperty>, &SymbolLayer::setIconTextFitPadding>; + result["icon-image"] = &setProperty, &SymbolLayer::setIconImage>; + result["icon-rotate"] = &setProperty, &SymbolLayer::setIconRotate>; + result["icon-padding"] = &setProperty, &SymbolLayer::setIconPadding>; + result["icon-keep-upright"] = &setProperty, &SymbolLayer::setIconKeepUpright>; + result["icon-offset"] = &setProperty>, &SymbolLayer::setIconOffset>; + result["text-pitch-alignment"] = &setProperty, &SymbolLayer::setTextPitchAlignment>; + result["text-rotation-alignment"] = &setProperty, &SymbolLayer::setTextRotationAlignment>; + result["text-field"] = &setProperty, &SymbolLayer::setTextField>; + result["text-font"] = &setProperty>, &SymbolLayer::setTextFont>; + result["text-size"] = &setProperty, &SymbolLayer::setTextSize>; + result["text-max-width"] = &setProperty, &SymbolLayer::setTextMaxWidth>; + result["text-line-height"] = &setProperty, &SymbolLayer::setTextLineHeight>; + result["text-letter-spacing"] = &setProperty, &SymbolLayer::setTextLetterSpacing>; + result["text-justify"] = &setProperty, &SymbolLayer::setTextJustify>; + result["text-anchor"] = &setProperty, &SymbolLayer::setTextAnchor>; + result["text-max-angle"] = &setProperty, &SymbolLayer::setTextMaxAngle>; + result["text-rotate"] = &setProperty, &SymbolLayer::setTextRotate>; + result["text-padding"] = &setProperty, &SymbolLayer::setTextPadding>; + result["text-keep-upright"] = &setProperty, &SymbolLayer::setTextKeepUpright>; + result["text-transform"] = &setProperty, &SymbolLayer::setTextTransform>; + result["text-offset"] = &setProperty>, &SymbolLayer::setTextOffset>; + result["text-allow-overlap"] = &setProperty, &SymbolLayer::setTextAllowOverlap>; + result["text-ignore-placement"] = &setProperty, &SymbolLayer::setTextIgnorePlacement>; + result["text-optional"] = &setProperty, &SymbolLayer::setTextOptional>; @@ -74,129 +74,129 @@ auto makeLayoutPropertySetters() { template auto makePaintPropertySetters() { - std::unordered_map> result; + std::unordered_map> result; - result["fill-antialias"] = &setPaintProperty, &FillLayer::setFillAntialias>; + result["fill-antialias"] = &setProperty, &FillLayer::setFillAntialias>; result["fill-antialias-transition"] = &setTransition; - result["fill-opacity"] = &setPaintProperty, &FillLayer::setFillOpacity>; + result["fill-opacity"] = &setProperty, &FillLayer::setFillOpacity>; result["fill-opacity-transition"] = &setTransition; - result["fill-color"] = &setPaintProperty, &FillLayer::setFillColor>; + result["fill-color"] = &setProperty, &FillLayer::setFillColor>; result["fill-color-transition"] = &setTransition; - result["fill-outline-color"] = &setPaintProperty, &FillLayer::setFillOutlineColor>; + result["fill-outline-color"] = &setProperty, &FillLayer::setFillOutlineColor>; result["fill-outline-color-transition"] = &setTransition; - result["fill-translate"] = &setPaintProperty>, &FillLayer::setFillTranslate>; + result["fill-translate"] = &setProperty>, &FillLayer::setFillTranslate>; result["fill-translate-transition"] = &setTransition; - result["fill-translate-anchor"] = &setPaintProperty, &FillLayer::setFillTranslateAnchor>; + result["fill-translate-anchor"] = &setProperty, &FillLayer::setFillTranslateAnchor>; result["fill-translate-anchor-transition"] = &setTransition; - result["fill-pattern"] = &setPaintProperty, &FillLayer::setFillPattern>; + result["fill-pattern"] = &setProperty, &FillLayer::setFillPattern>; result["fill-pattern-transition"] = &setTransition; - result["line-opacity"] = &setPaintProperty, &LineLayer::setLineOpacity>; + result["line-opacity"] = &setProperty, &LineLayer::setLineOpacity>; result["line-opacity-transition"] = &setTransition; - result["line-color"] = &setPaintProperty, &LineLayer::setLineColor>; + result["line-color"] = &setProperty, &LineLayer::setLineColor>; result["line-color-transition"] = &setTransition; - result["line-translate"] = &setPaintProperty>, &LineLayer::setLineTranslate>; + result["line-translate"] = &setProperty>, &LineLayer::setLineTranslate>; result["line-translate-transition"] = &setTransition; - result["line-translate-anchor"] = &setPaintProperty, &LineLayer::setLineTranslateAnchor>; + result["line-translate-anchor"] = &setProperty, &LineLayer::setLineTranslateAnchor>; result["line-translate-anchor-transition"] = &setTransition; - result["line-width"] = &setPaintProperty, &LineLayer::setLineWidth>; + result["line-width"] = &setProperty, &LineLayer::setLineWidth>; result["line-width-transition"] = &setTransition; - result["line-gap-width"] = &setPaintProperty, &LineLayer::setLineGapWidth>; + result["line-gap-width"] = &setProperty, &LineLayer::setLineGapWidth>; result["line-gap-width-transition"] = &setTransition; - result["line-offset"] = &setPaintProperty, &LineLayer::setLineOffset>; + result["line-offset"] = &setProperty, &LineLayer::setLineOffset>; result["line-offset-transition"] = &setTransition; - result["line-blur"] = &setPaintProperty, &LineLayer::setLineBlur>; + result["line-blur"] = &setProperty, &LineLayer::setLineBlur>; result["line-blur-transition"] = &setTransition; - result["line-dasharray"] = &setPaintProperty>, &LineLayer::setLineDasharray>; + result["line-dasharray"] = &setProperty>, &LineLayer::setLineDasharray>; result["line-dasharray-transition"] = &setTransition; - result["line-pattern"] = &setPaintProperty, &LineLayer::setLinePattern>; + result["line-pattern"] = &setProperty, &LineLayer::setLinePattern>; result["line-pattern-transition"] = &setTransition; - result["icon-opacity"] = &setPaintProperty, &SymbolLayer::setIconOpacity>; + result["icon-opacity"] = &setProperty, &SymbolLayer::setIconOpacity>; result["icon-opacity-transition"] = &setTransition; - result["icon-color"] = &setPaintProperty, &SymbolLayer::setIconColor>; + result["icon-color"] = &setProperty, &SymbolLayer::setIconColor>; result["icon-color-transition"] = &setTransition; - result["icon-halo-color"] = &setPaintProperty, &SymbolLayer::setIconHaloColor>; + result["icon-halo-color"] = &setProperty, &SymbolLayer::setIconHaloColor>; result["icon-halo-color-transition"] = &setTransition; - result["icon-halo-width"] = &setPaintProperty, &SymbolLayer::setIconHaloWidth>; + result["icon-halo-width"] = &setProperty, &SymbolLayer::setIconHaloWidth>; result["icon-halo-width-transition"] = &setTransition; - result["icon-halo-blur"] = &setPaintProperty, &SymbolLayer::setIconHaloBlur>; + result["icon-halo-blur"] = &setProperty, &SymbolLayer::setIconHaloBlur>; result["icon-halo-blur-transition"] = &setTransition; - result["icon-translate"] = &setPaintProperty>, &SymbolLayer::setIconTranslate>; + result["icon-translate"] = &setProperty>, &SymbolLayer::setIconTranslate>; result["icon-translate-transition"] = &setTransition; - result["icon-translate-anchor"] = &setPaintProperty, &SymbolLayer::setIconTranslateAnchor>; + result["icon-translate-anchor"] = &setProperty, &SymbolLayer::setIconTranslateAnchor>; result["icon-translate-anchor-transition"] = &setTransition; - result["text-opacity"] = &setPaintProperty, &SymbolLayer::setTextOpacity>; + result["text-opacity"] = &setProperty, &SymbolLayer::setTextOpacity>; result["text-opacity-transition"] = &setTransition; - result["text-color"] = &setPaintProperty, &SymbolLayer::setTextColor>; + result["text-color"] = &setProperty, &SymbolLayer::setTextColor>; result["text-color-transition"] = &setTransition; - result["text-halo-color"] = &setPaintProperty, &SymbolLayer::setTextHaloColor>; + result["text-halo-color"] = &setProperty, &SymbolLayer::setTextHaloColor>; result["text-halo-color-transition"] = &setTransition; - result["text-halo-width"] = &setPaintProperty, &SymbolLayer::setTextHaloWidth>; + result["text-halo-width"] = &setProperty, &SymbolLayer::setTextHaloWidth>; result["text-halo-width-transition"] = &setTransition; - result["text-halo-blur"] = &setPaintProperty, &SymbolLayer::setTextHaloBlur>; + result["text-halo-blur"] = &setProperty, &SymbolLayer::setTextHaloBlur>; result["text-halo-blur-transition"] = &setTransition; - result["text-translate"] = &setPaintProperty>, &SymbolLayer::setTextTranslate>; + result["text-translate"] = &setProperty>, &SymbolLayer::setTextTranslate>; result["text-translate-transition"] = &setTransition; - result["text-translate-anchor"] = &setPaintProperty, &SymbolLayer::setTextTranslateAnchor>; + result["text-translate-anchor"] = &setProperty, &SymbolLayer::setTextTranslateAnchor>; result["text-translate-anchor-transition"] = &setTransition; - result["circle-radius"] = &setPaintProperty, &CircleLayer::setCircleRadius>; + result["circle-radius"] = &setProperty, &CircleLayer::setCircleRadius>; result["circle-radius-transition"] = &setTransition; - result["circle-color"] = &setPaintProperty, &CircleLayer::setCircleColor>; + result["circle-color"] = &setProperty, &CircleLayer::setCircleColor>; result["circle-color-transition"] = &setTransition; - result["circle-blur"] = &setPaintProperty, &CircleLayer::setCircleBlur>; + result["circle-blur"] = &setProperty, &CircleLayer::setCircleBlur>; result["circle-blur-transition"] = &setTransition; - result["circle-opacity"] = &setPaintProperty, &CircleLayer::setCircleOpacity>; + result["circle-opacity"] = &setProperty, &CircleLayer::setCircleOpacity>; result["circle-opacity-transition"] = &setTransition; - result["circle-translate"] = &setPaintProperty>, &CircleLayer::setCircleTranslate>; + result["circle-translate"] = &setProperty>, &CircleLayer::setCircleTranslate>; result["circle-translate-transition"] = &setTransition; - result["circle-translate-anchor"] = &setPaintProperty, &CircleLayer::setCircleTranslateAnchor>; + result["circle-translate-anchor"] = &setProperty, &CircleLayer::setCircleTranslateAnchor>; result["circle-translate-anchor-transition"] = &setTransition; - result["circle-pitch-scale"] = &setPaintProperty, &CircleLayer::setCirclePitchScale>; + result["circle-pitch-scale"] = &setProperty, &CircleLayer::setCirclePitchScale>; result["circle-pitch-scale-transition"] = &setTransition; - result["circle-stroke-width"] = &setPaintProperty, &CircleLayer::setCircleStrokeWidth>; + result["circle-stroke-width"] = &setProperty, &CircleLayer::setCircleStrokeWidth>; result["circle-stroke-width-transition"] = &setTransition; - result["circle-stroke-color"] = &setPaintProperty, &CircleLayer::setCircleStrokeColor>; + result["circle-stroke-color"] = &setProperty, &CircleLayer::setCircleStrokeColor>; result["circle-stroke-color-transition"] = &setTransition; - result["circle-stroke-opacity"] = &setPaintProperty, &CircleLayer::setCircleStrokeOpacity>; + result["circle-stroke-opacity"] = &setProperty, &CircleLayer::setCircleStrokeOpacity>; result["circle-stroke-opacity-transition"] = &setTransition; - result["fill-extrusion-opacity"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionOpacity>; + result["fill-extrusion-opacity"] = &setProperty, &FillExtrusionLayer::setFillExtrusionOpacity>; result["fill-extrusion-opacity-transition"] = &setTransition; - result["fill-extrusion-color"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionColor>; + result["fill-extrusion-color"] = &setProperty, &FillExtrusionLayer::setFillExtrusionColor>; result["fill-extrusion-color-transition"] = &setTransition; - result["fill-extrusion-translate"] = &setPaintProperty>, &FillExtrusionLayer::setFillExtrusionTranslate>; + result["fill-extrusion-translate"] = &setProperty>, &FillExtrusionLayer::setFillExtrusionTranslate>; result["fill-extrusion-translate-transition"] = &setTransition; - result["fill-extrusion-translate-anchor"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionTranslateAnchor>; + result["fill-extrusion-translate-anchor"] = &setProperty, &FillExtrusionLayer::setFillExtrusionTranslateAnchor>; result["fill-extrusion-translate-anchor-transition"] = &setTransition; - result["fill-extrusion-pattern"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionPattern>; + result["fill-extrusion-pattern"] = &setProperty, &FillExtrusionLayer::setFillExtrusionPattern>; result["fill-extrusion-pattern-transition"] = &setTransition; - result["fill-extrusion-height"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionHeight>; + result["fill-extrusion-height"] = &setProperty, &FillExtrusionLayer::setFillExtrusionHeight>; result["fill-extrusion-height-transition"] = &setTransition; - result["fill-extrusion-base"] = &setPaintProperty, &FillExtrusionLayer::setFillExtrusionBase>; + result["fill-extrusion-base"] = &setProperty, &FillExtrusionLayer::setFillExtrusionBase>; result["fill-extrusion-base-transition"] = &setTransition; - result["raster-opacity"] = &setPaintProperty, &RasterLayer::setRasterOpacity>; + result["raster-opacity"] = &setProperty, &RasterLayer::setRasterOpacity>; result["raster-opacity-transition"] = &setTransition; - result["raster-hue-rotate"] = &setPaintProperty, &RasterLayer::setRasterHueRotate>; + result["raster-hue-rotate"] = &setProperty, &RasterLayer::setRasterHueRotate>; result["raster-hue-rotate-transition"] = &setTransition; - result["raster-brightness-min"] = &setPaintProperty, &RasterLayer::setRasterBrightnessMin>; + result["raster-brightness-min"] = &setProperty, &RasterLayer::setRasterBrightnessMin>; result["raster-brightness-min-transition"] = &setTransition; - result["raster-brightness-max"] = &setPaintProperty, &RasterLayer::setRasterBrightnessMax>; + result["raster-brightness-max"] = &setProperty, &RasterLayer::setRasterBrightnessMax>; result["raster-brightness-max-transition"] = &setTransition; - result["raster-saturation"] = &setPaintProperty, &RasterLayer::setRasterSaturation>; + result["raster-saturation"] = &setProperty, &RasterLayer::setRasterSaturation>; result["raster-saturation-transition"] = &setTransition; - result["raster-contrast"] = &setPaintProperty, &RasterLayer::setRasterContrast>; + result["raster-contrast"] = &setProperty, &RasterLayer::setRasterContrast>; result["raster-contrast-transition"] = &setTransition; - result["raster-fade-duration"] = &setPaintProperty, &RasterLayer::setRasterFadeDuration>; + result["raster-fade-duration"] = &setProperty, &RasterLayer::setRasterFadeDuration>; result["raster-fade-duration-transition"] = &setTransition; - result["background-color"] = &setPaintProperty, &BackgroundLayer::setBackgroundColor>; + result["background-color"] = &setProperty, &BackgroundLayer::setBackgroundColor>; result["background-color-transition"] = &setTransition; - result["background-pattern"] = &setPaintProperty, &BackgroundLayer::setBackgroundPattern>; + result["background-pattern"] = &setProperty, &BackgroundLayer::setBackgroundPattern>; result["background-pattern-transition"] = &setTransition; - result["background-opacity"] = &setPaintProperty, &BackgroundLayer::setBackgroundOpacity>; + result["background-opacity"] = &setProperty, &BackgroundLayer::setBackgroundOpacity>; result["background-opacity-transition"] = &setTransition; return result; diff --git a/include/mbgl/style/conversion/make_property_setters.hpp.ejs b/include/mbgl/style/conversion/make_property_setters.hpp.ejs index a99e75aec7..19c9f70538 100644 --- a/include/mbgl/style/conversion/make_property_setters.hpp.ejs +++ b/include/mbgl/style/conversion/make_property_setters.hpp.ejs @@ -16,13 +16,13 @@ namespace conversion { template auto makeLayoutPropertySetters() { - std::unordered_map> result; + std::unordered_map> result; result["visibility"] = &setVisibility; <% for (const layer of locals.layers) { -%> <% for (const property of layer.layoutProperties) { -%> - result["<%- property.name %>"] = &setLayoutPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; + result["<%- property.name %>"] = &setPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; <% } -%> <% } -%> @@ -31,11 +31,11 @@ auto makeLayoutPropertySetters() { template auto makePaintPropertySetters() { - std::unordered_map> result; + std::unordered_map> result; <% for (const layer of locals.layers) { -%> <% for (const property of layer.paintProperties) { -%> - result["<%- property.name %>"] = &setPaintPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; + result["<%- property.name %>"] = &setPropertyLayer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>; result["<%- property.name %>-transition"] = &setTransitionLayer, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition>; <% } -%> diff --git a/include/mbgl/style/conversion/property_setter.hpp b/include/mbgl/style/conversion/property_setter.hpp index 8658fd60b0..759c4512cc 100644 --- a/include/mbgl/style/conversion/property_setter.hpp +++ b/include/mbgl/style/conversion/property_setter.hpp @@ -14,13 +14,10 @@ namespace style { namespace conversion { template -using LayoutPropertySetter = optional (*) (Layer&, const V&); - -template -using PaintPropertySetter = optional (*) (Layer&, const V&, const optional&); +using PropertySetter = optional (*) (Layer&, const V&); template -optional setLayoutProperty(Layer& layer, const V& value) { +optional setProperty(Layer& layer, const V& value) { auto* typedLayer = layer.as(); if (!typedLayer) { return Error { "layer doesn't support this property" }; @@ -36,25 +33,8 @@ optional setLayoutProperty(Layer& layer, const V& value) { return {}; } -template &)> -optional setPaintProperty(Layer& layer, const V& value, const optional& klass) { - auto* typedLayer = layer.as(); - if (!typedLayer) { - return Error { "layer doesn't support this property" }; - } - - Error error; - optional typedValue = convert(value, error); - if (!typedValue) { - return error; - } - - (typedLayer->*setter)(*typedValue, klass); - return {}; -} - -template &)> -optional setTransition(Layer& layer, const V& value, const optional& klass) { +template +optional setTransition(Layer& layer, const V& value) { auto* typedLayer = layer.as(); if (!typedLayer) { return Error { "layer doesn't support this property" }; @@ -66,7 +46,7 @@ optional setTransition(Layer& layer, const V& value, const optional*setter)(*transition, klass); + (typedLayer->*setter)(*transition); return {}; } diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp index 63708a449f..903983844f 100644 --- a/include/mbgl/style/layers/background_layer.hpp +++ b/include/mbgl/style/layers/background_layer.hpp @@ -29,22 +29,22 @@ public: // Paint properties static PropertyValue getDefaultBackgroundColor(); - PropertyValue getBackgroundColor(const optional& klass = {}) const; - void setBackgroundColor(PropertyValue, const optional& klass = {}); - void setBackgroundColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getBackgroundColorTransition(const optional& klass = {}) const; + PropertyValue getBackgroundColor() const; + void setBackgroundColor(PropertyValue); + void setBackgroundColorTransition(const TransitionOptions&); + TransitionOptions getBackgroundColorTransition() const; static PropertyValue getDefaultBackgroundPattern(); - PropertyValue getBackgroundPattern(const optional& klass = {}) const; - void setBackgroundPattern(PropertyValue, const optional& klass = {}); - void setBackgroundPatternTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getBackgroundPatternTransition(const optional& klass = {}) const; + PropertyValue getBackgroundPattern() const; + void setBackgroundPattern(PropertyValue); + void setBackgroundPatternTransition(const TransitionOptions&); + TransitionOptions getBackgroundPatternTransition() const; static PropertyValue getDefaultBackgroundOpacity(); - PropertyValue getBackgroundOpacity(const optional& klass = {}) const; - void setBackgroundOpacity(PropertyValue, const optional& klass = {}); - void setBackgroundOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getBackgroundOpacityTransition(const optional& klass = {}) const; + PropertyValue getBackgroundOpacity() const; + void setBackgroundOpacity(PropertyValue); + void setBackgroundOpacityTransition(const TransitionOptions&); + TransitionOptions getBackgroundOpacityTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp index f40c507e28..275a2e67a5 100644 --- a/include/mbgl/style/layers/circle_layer.hpp +++ b/include/mbgl/style/layers/circle_layer.hpp @@ -37,64 +37,64 @@ public: // Paint properties static DataDrivenPropertyValue getDefaultCircleRadius(); - DataDrivenPropertyValue getCircleRadius(const optional& klass = {}) const; - void setCircleRadius(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleRadiusTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleRadiusTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleRadius() const; + void setCircleRadius(DataDrivenPropertyValue); + void setCircleRadiusTransition(const TransitionOptions&); + TransitionOptions getCircleRadiusTransition() const; static DataDrivenPropertyValue getDefaultCircleColor(); - DataDrivenPropertyValue getCircleColor(const optional& klass = {}) const; - void setCircleColor(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleColor() const; + void setCircleColor(DataDrivenPropertyValue); + void setCircleColorTransition(const TransitionOptions&); + TransitionOptions getCircleColorTransition() const; static DataDrivenPropertyValue getDefaultCircleBlur(); - DataDrivenPropertyValue getCircleBlur(const optional& klass = {}) const; - void setCircleBlur(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleBlurTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleBlurTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleBlur() const; + void setCircleBlur(DataDrivenPropertyValue); + void setCircleBlurTransition(const TransitionOptions&); + TransitionOptions getCircleBlurTransition() const; static DataDrivenPropertyValue getDefaultCircleOpacity(); - DataDrivenPropertyValue getCircleOpacity(const optional& klass = {}) const; - void setCircleOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleOpacity() const; + void setCircleOpacity(DataDrivenPropertyValue); + void setCircleOpacityTransition(const TransitionOptions&); + TransitionOptions getCircleOpacityTransition() const; static PropertyValue> getDefaultCircleTranslate(); - PropertyValue> getCircleTranslate(const optional& klass = {}) const; - void setCircleTranslate(PropertyValue>, const optional& klass = {}); - void setCircleTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleTranslateTransition(const optional& klass = {}) const; + PropertyValue> getCircleTranslate() const; + void setCircleTranslate(PropertyValue>); + void setCircleTranslateTransition(const TransitionOptions&); + TransitionOptions getCircleTranslateTransition() const; static PropertyValue getDefaultCircleTranslateAnchor(); - PropertyValue getCircleTranslateAnchor(const optional& klass = {}) const; - void setCircleTranslateAnchor(PropertyValue, const optional& klass = {}); - void setCircleTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getCircleTranslateAnchor() const; + void setCircleTranslateAnchor(PropertyValue); + void setCircleTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getCircleTranslateAnchorTransition() const; static PropertyValue getDefaultCirclePitchScale(); - PropertyValue getCirclePitchScale(const optional& klass = {}) const; - void setCirclePitchScale(PropertyValue, const optional& klass = {}); - void setCirclePitchScaleTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCirclePitchScaleTransition(const optional& klass = {}) const; + PropertyValue getCirclePitchScale() const; + void setCirclePitchScale(PropertyValue); + void setCirclePitchScaleTransition(const TransitionOptions&); + TransitionOptions getCirclePitchScaleTransition() const; static DataDrivenPropertyValue getDefaultCircleStrokeWidth(); - DataDrivenPropertyValue getCircleStrokeWidth(const optional& klass = {}) const; - void setCircleStrokeWidth(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleStrokeWidthTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleStrokeWidthTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleStrokeWidth() const; + void setCircleStrokeWidth(DataDrivenPropertyValue); + void setCircleStrokeWidthTransition(const TransitionOptions&); + TransitionOptions getCircleStrokeWidthTransition() const; static DataDrivenPropertyValue getDefaultCircleStrokeColor(); - DataDrivenPropertyValue getCircleStrokeColor(const optional& klass = {}) const; - void setCircleStrokeColor(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleStrokeColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleStrokeColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleStrokeColor() const; + void setCircleStrokeColor(DataDrivenPropertyValue); + void setCircleStrokeColorTransition(const TransitionOptions&); + TransitionOptions getCircleStrokeColorTransition() const; static DataDrivenPropertyValue getDefaultCircleStrokeOpacity(); - DataDrivenPropertyValue getCircleStrokeOpacity(const optional& klass = {}) const; - void setCircleStrokeOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setCircleStrokeOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getCircleStrokeOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getCircleStrokeOpacity() const; + void setCircleStrokeOpacity(DataDrivenPropertyValue); + void setCircleStrokeOpacityTransition(const TransitionOptions&); + TransitionOptions getCircleStrokeOpacityTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp index bc6890e82f..e1c54f54ee 100644 --- a/include/mbgl/style/layers/fill_extrusion_layer.hpp +++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp @@ -37,46 +37,46 @@ public: // Paint properties static PropertyValue getDefaultFillExtrusionOpacity(); - PropertyValue getFillExtrusionOpacity(const optional& klass = {}) const; - void setFillExtrusionOpacity(PropertyValue, const optional& klass = {}); - void setFillExtrusionOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionOpacityTransition(const optional& klass = {}) const; + PropertyValue getFillExtrusionOpacity() const; + void setFillExtrusionOpacity(PropertyValue); + void setFillExtrusionOpacityTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionOpacityTransition() const; static DataDrivenPropertyValue getDefaultFillExtrusionColor(); - DataDrivenPropertyValue getFillExtrusionColor(const optional& klass = {}) const; - void setFillExtrusionColor(DataDrivenPropertyValue, const optional& klass = {}); - void setFillExtrusionColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillExtrusionColor() const; + void setFillExtrusionColor(DataDrivenPropertyValue); + void setFillExtrusionColorTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionColorTransition() const; static PropertyValue> getDefaultFillExtrusionTranslate(); - PropertyValue> getFillExtrusionTranslate(const optional& klass = {}) const; - void setFillExtrusionTranslate(PropertyValue>, const optional& klass = {}); - void setFillExtrusionTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionTranslateTransition(const optional& klass = {}) const; + PropertyValue> getFillExtrusionTranslate() const; + void setFillExtrusionTranslate(PropertyValue>); + void setFillExtrusionTranslateTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionTranslateTransition() const; static PropertyValue getDefaultFillExtrusionTranslateAnchor(); - PropertyValue getFillExtrusionTranslateAnchor(const optional& klass = {}) const; - void setFillExtrusionTranslateAnchor(PropertyValue, const optional& klass = {}); - void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getFillExtrusionTranslateAnchor() const; + void setFillExtrusionTranslateAnchor(PropertyValue); + void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionTranslateAnchorTransition() const; static PropertyValue getDefaultFillExtrusionPattern(); - PropertyValue getFillExtrusionPattern(const optional& klass = {}) const; - void setFillExtrusionPattern(PropertyValue, const optional& klass = {}); - void setFillExtrusionPatternTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionPatternTransition(const optional& klass = {}) const; + PropertyValue getFillExtrusionPattern() const; + void setFillExtrusionPattern(PropertyValue); + void setFillExtrusionPatternTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionPatternTransition() const; static DataDrivenPropertyValue getDefaultFillExtrusionHeight(); - DataDrivenPropertyValue getFillExtrusionHeight(const optional& klass = {}) const; - void setFillExtrusionHeight(DataDrivenPropertyValue, const optional& klass = {}); - void setFillExtrusionHeightTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionHeightTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillExtrusionHeight() const; + void setFillExtrusionHeight(DataDrivenPropertyValue); + void setFillExtrusionHeightTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionHeightTransition() const; static DataDrivenPropertyValue getDefaultFillExtrusionBase(); - DataDrivenPropertyValue getFillExtrusionBase(const optional& klass = {}) const; - void setFillExtrusionBase(DataDrivenPropertyValue, const optional& klass = {}); - void setFillExtrusionBaseTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillExtrusionBaseTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillExtrusionBase() const; + void setFillExtrusionBase(DataDrivenPropertyValue); + void setFillExtrusionBaseTransition(const TransitionOptions&); + TransitionOptions getFillExtrusionBaseTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp index 3d08e75a1c..dfbe69d7fe 100644 --- a/include/mbgl/style/layers/fill_layer.hpp +++ b/include/mbgl/style/layers/fill_layer.hpp @@ -37,46 +37,46 @@ public: // Paint properties static PropertyValue getDefaultFillAntialias(); - PropertyValue getFillAntialias(const optional& klass = {}) const; - void setFillAntialias(PropertyValue, const optional& klass = {}); - void setFillAntialiasTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillAntialiasTransition(const optional& klass = {}) const; + PropertyValue getFillAntialias() const; + void setFillAntialias(PropertyValue); + void setFillAntialiasTransition(const TransitionOptions&); + TransitionOptions getFillAntialiasTransition() const; static DataDrivenPropertyValue getDefaultFillOpacity(); - DataDrivenPropertyValue getFillOpacity(const optional& klass = {}) const; - void setFillOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setFillOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillOpacity() const; + void setFillOpacity(DataDrivenPropertyValue); + void setFillOpacityTransition(const TransitionOptions&); + TransitionOptions getFillOpacityTransition() const; static DataDrivenPropertyValue getDefaultFillColor(); - DataDrivenPropertyValue getFillColor(const optional& klass = {}) const; - void setFillColor(DataDrivenPropertyValue, const optional& klass = {}); - void setFillColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillColor() const; + void setFillColor(DataDrivenPropertyValue); + void setFillColorTransition(const TransitionOptions&); + TransitionOptions getFillColorTransition() const; static DataDrivenPropertyValue getDefaultFillOutlineColor(); - DataDrivenPropertyValue getFillOutlineColor(const optional& klass = {}) const; - void setFillOutlineColor(DataDrivenPropertyValue, const optional& klass = {}); - void setFillOutlineColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillOutlineColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getFillOutlineColor() const; + void setFillOutlineColor(DataDrivenPropertyValue); + void setFillOutlineColorTransition(const TransitionOptions&); + TransitionOptions getFillOutlineColorTransition() const; static PropertyValue> getDefaultFillTranslate(); - PropertyValue> getFillTranslate(const optional& klass = {}) const; - void setFillTranslate(PropertyValue>, const optional& klass = {}); - void setFillTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillTranslateTransition(const optional& klass = {}) const; + PropertyValue> getFillTranslate() const; + void setFillTranslate(PropertyValue>); + void setFillTranslateTransition(const TransitionOptions&); + TransitionOptions getFillTranslateTransition() const; static PropertyValue getDefaultFillTranslateAnchor(); - PropertyValue getFillTranslateAnchor(const optional& klass = {}) const; - void setFillTranslateAnchor(PropertyValue, const optional& klass = {}); - void setFillTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getFillTranslateAnchor() const; + void setFillTranslateAnchor(PropertyValue); + void setFillTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getFillTranslateAnchorTransition() const; static PropertyValue getDefaultFillPattern(); - PropertyValue getFillPattern(const optional& klass = {}) const; - void setFillPattern(PropertyValue, const optional& klass = {}); - void setFillPatternTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getFillPatternTransition(const optional& klass = {}) const; + PropertyValue getFillPattern() const; + void setFillPattern(PropertyValue); + void setFillPatternTransition(const TransitionOptions&); + TransitionOptions getFillPatternTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs index 033ae88956..4ee5545247 100644 --- a/include/mbgl/style/layers/layer.hpp.ejs +++ b/include/mbgl/style/layers/layer.hpp.ejs @@ -65,10 +65,10 @@ public: <% for (const property of paintProperties) { -%> 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 = {}); - TransitionOptions get<%- camelize(property.name) %>Transition(const optional& klass = {}) const; + <%- propertyValueType(property) %> get<%- camelize(property.name) %>() const; + void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>); + void set<%- camelize(property.name) %>Transition(const TransitionOptions&); + TransitionOptions get<%- camelize(property.name) %>Transition() const; <% } -%> // Private implementation diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 6000839d1c..c643ad110d 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -57,64 +57,64 @@ public: // Paint properties static DataDrivenPropertyValue getDefaultLineOpacity(); - DataDrivenPropertyValue getLineOpacity(const optional& klass = {}) const; - void setLineOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setLineOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getLineOpacity() const; + void setLineOpacity(DataDrivenPropertyValue); + void setLineOpacityTransition(const TransitionOptions&); + TransitionOptions getLineOpacityTransition() const; static DataDrivenPropertyValue getDefaultLineColor(); - DataDrivenPropertyValue getLineColor(const optional& klass = {}) const; - void setLineColor(DataDrivenPropertyValue, const optional& klass = {}); - void setLineColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getLineColor() const; + void setLineColor(DataDrivenPropertyValue); + void setLineColorTransition(const TransitionOptions&); + TransitionOptions getLineColorTransition() const; static PropertyValue> getDefaultLineTranslate(); - PropertyValue> getLineTranslate(const optional& klass = {}) const; - void setLineTranslate(PropertyValue>, const optional& klass = {}); - void setLineTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineTranslateTransition(const optional& klass = {}) const; + PropertyValue> getLineTranslate() const; + void setLineTranslate(PropertyValue>); + void setLineTranslateTransition(const TransitionOptions&); + TransitionOptions getLineTranslateTransition() const; static PropertyValue getDefaultLineTranslateAnchor(); - PropertyValue getLineTranslateAnchor(const optional& klass = {}) const; - void setLineTranslateAnchor(PropertyValue, const optional& klass = {}); - void setLineTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getLineTranslateAnchor() const; + void setLineTranslateAnchor(PropertyValue); + void setLineTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getLineTranslateAnchorTransition() const; static PropertyValue getDefaultLineWidth(); - PropertyValue getLineWidth(const optional& klass = {}) const; - void setLineWidth(PropertyValue, const optional& klass = {}); - void setLineWidthTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineWidthTransition(const optional& klass = {}) const; + PropertyValue getLineWidth() const; + void setLineWidth(PropertyValue); + void setLineWidthTransition(const TransitionOptions&); + TransitionOptions getLineWidthTransition() const; static DataDrivenPropertyValue getDefaultLineGapWidth(); - DataDrivenPropertyValue getLineGapWidth(const optional& klass = {}) const; - void setLineGapWidth(DataDrivenPropertyValue, const optional& klass = {}); - void setLineGapWidthTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineGapWidthTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getLineGapWidth() const; + void setLineGapWidth(DataDrivenPropertyValue); + void setLineGapWidthTransition(const TransitionOptions&); + TransitionOptions getLineGapWidthTransition() const; static DataDrivenPropertyValue getDefaultLineOffset(); - DataDrivenPropertyValue getLineOffset(const optional& klass = {}) const; - void setLineOffset(DataDrivenPropertyValue, const optional& klass = {}); - void setLineOffsetTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineOffsetTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getLineOffset() const; + void setLineOffset(DataDrivenPropertyValue); + void setLineOffsetTransition(const TransitionOptions&); + TransitionOptions getLineOffsetTransition() const; static DataDrivenPropertyValue getDefaultLineBlur(); - DataDrivenPropertyValue getLineBlur(const optional& klass = {}) const; - void setLineBlur(DataDrivenPropertyValue, const optional& klass = {}); - void setLineBlurTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineBlurTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getLineBlur() const; + void setLineBlur(DataDrivenPropertyValue); + void setLineBlurTransition(const TransitionOptions&); + TransitionOptions getLineBlurTransition() const; static PropertyValue> getDefaultLineDasharray(); - PropertyValue> getLineDasharray(const optional& klass = {}) const; - void setLineDasharray(PropertyValue>, const optional& klass = {}); - void setLineDasharrayTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLineDasharrayTransition(const optional& klass = {}) const; + PropertyValue> getLineDasharray() const; + void setLineDasharray(PropertyValue>); + void setLineDasharrayTransition(const TransitionOptions&); + TransitionOptions getLineDasharrayTransition() const; static PropertyValue getDefaultLinePattern(); - PropertyValue getLinePattern(const optional& klass = {}) const; - void setLinePattern(PropertyValue, const optional& klass = {}); - void setLinePatternTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getLinePatternTransition(const optional& klass = {}) const; + PropertyValue getLinePattern() const; + void setLinePattern(PropertyValue); + void setLinePatternTransition(const TransitionOptions&); + TransitionOptions getLinePatternTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp index ad9a68f1b0..8111364709 100644 --- a/include/mbgl/style/layers/raster_layer.hpp +++ b/include/mbgl/style/layers/raster_layer.hpp @@ -32,46 +32,46 @@ public: // Paint properties static PropertyValue getDefaultRasterOpacity(); - PropertyValue getRasterOpacity(const optional& klass = {}) const; - void setRasterOpacity(PropertyValue, const optional& klass = {}); - void setRasterOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterOpacityTransition(const optional& klass = {}) const; + PropertyValue getRasterOpacity() const; + void setRasterOpacity(PropertyValue); + void setRasterOpacityTransition(const TransitionOptions&); + TransitionOptions getRasterOpacityTransition() const; static PropertyValue getDefaultRasterHueRotate(); - PropertyValue getRasterHueRotate(const optional& klass = {}) const; - void setRasterHueRotate(PropertyValue, const optional& klass = {}); - void setRasterHueRotateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterHueRotateTransition(const optional& klass = {}) const; + PropertyValue getRasterHueRotate() const; + void setRasterHueRotate(PropertyValue); + void setRasterHueRotateTransition(const TransitionOptions&); + TransitionOptions getRasterHueRotateTransition() const; static PropertyValue getDefaultRasterBrightnessMin(); - PropertyValue getRasterBrightnessMin(const optional& klass = {}) const; - void setRasterBrightnessMin(PropertyValue, const optional& klass = {}); - void setRasterBrightnessMinTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterBrightnessMinTransition(const optional& klass = {}) const; + PropertyValue getRasterBrightnessMin() const; + void setRasterBrightnessMin(PropertyValue); + void setRasterBrightnessMinTransition(const TransitionOptions&); + TransitionOptions getRasterBrightnessMinTransition() const; static PropertyValue getDefaultRasterBrightnessMax(); - PropertyValue getRasterBrightnessMax(const optional& klass = {}) const; - void setRasterBrightnessMax(PropertyValue, const optional& klass = {}); - void setRasterBrightnessMaxTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterBrightnessMaxTransition(const optional& klass = {}) const; + PropertyValue getRasterBrightnessMax() const; + void setRasterBrightnessMax(PropertyValue); + void setRasterBrightnessMaxTransition(const TransitionOptions&); + TransitionOptions getRasterBrightnessMaxTransition() const; static PropertyValue getDefaultRasterSaturation(); - PropertyValue getRasterSaturation(const optional& klass = {}) const; - void setRasterSaturation(PropertyValue, const optional& klass = {}); - void setRasterSaturationTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterSaturationTransition(const optional& klass = {}) const; + PropertyValue getRasterSaturation() const; + void setRasterSaturation(PropertyValue); + void setRasterSaturationTransition(const TransitionOptions&); + TransitionOptions getRasterSaturationTransition() const; static PropertyValue getDefaultRasterContrast(); - PropertyValue getRasterContrast(const optional& klass = {}) const; - void setRasterContrast(PropertyValue, const optional& klass = {}); - void setRasterContrastTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterContrastTransition(const optional& klass = {}) const; + PropertyValue getRasterContrast() const; + void setRasterContrast(PropertyValue); + void setRasterContrastTransition(const TransitionOptions&); + TransitionOptions getRasterContrastTransition() const; static PropertyValue getDefaultRasterFadeDuration(); - PropertyValue getRasterFadeDuration(const optional& klass = {}) const; - void setRasterFadeDuration(PropertyValue, const optional& klass = {}); - void setRasterFadeDurationTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getRasterFadeDurationTransition(const optional& klass = {}) const; + PropertyValue getRasterFadeDuration() const; + void setRasterFadeDuration(PropertyValue); + void setRasterFadeDurationTransition(const TransitionOptions&); + TransitionOptions getRasterFadeDurationTransition() const; // Private implementation diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp index e7df5a92ae..8158f267c9 100644 --- a/include/mbgl/style/layers/symbol_layer.hpp +++ b/include/mbgl/style/layers/symbol_layer.hpp @@ -177,88 +177,88 @@ public: // Paint properties static DataDrivenPropertyValue getDefaultIconOpacity(); - DataDrivenPropertyValue getIconOpacity(const optional& klass = {}) const; - void setIconOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setIconOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getIconOpacity() const; + void setIconOpacity(DataDrivenPropertyValue); + void setIconOpacityTransition(const TransitionOptions&); + TransitionOptions getIconOpacityTransition() const; static DataDrivenPropertyValue getDefaultIconColor(); - DataDrivenPropertyValue getIconColor(const optional& klass = {}) const; - void setIconColor(DataDrivenPropertyValue, const optional& klass = {}); - void setIconColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getIconColor() const; + void setIconColor(DataDrivenPropertyValue); + void setIconColorTransition(const TransitionOptions&); + TransitionOptions getIconColorTransition() const; static DataDrivenPropertyValue getDefaultIconHaloColor(); - DataDrivenPropertyValue getIconHaloColor(const optional& klass = {}) const; - void setIconHaloColor(DataDrivenPropertyValue, const optional& klass = {}); - void setIconHaloColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconHaloColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getIconHaloColor() const; + void setIconHaloColor(DataDrivenPropertyValue); + void setIconHaloColorTransition(const TransitionOptions&); + TransitionOptions getIconHaloColorTransition() const; static DataDrivenPropertyValue getDefaultIconHaloWidth(); - DataDrivenPropertyValue getIconHaloWidth(const optional& klass = {}) const; - void setIconHaloWidth(DataDrivenPropertyValue, const optional& klass = {}); - void setIconHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconHaloWidthTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getIconHaloWidth() const; + void setIconHaloWidth(DataDrivenPropertyValue); + void setIconHaloWidthTransition(const TransitionOptions&); + TransitionOptions getIconHaloWidthTransition() const; static DataDrivenPropertyValue getDefaultIconHaloBlur(); - DataDrivenPropertyValue getIconHaloBlur(const optional& klass = {}) const; - void setIconHaloBlur(DataDrivenPropertyValue, const optional& klass = {}); - void setIconHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconHaloBlurTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getIconHaloBlur() const; + void setIconHaloBlur(DataDrivenPropertyValue); + void setIconHaloBlurTransition(const TransitionOptions&); + TransitionOptions getIconHaloBlurTransition() const; static PropertyValue> getDefaultIconTranslate(); - PropertyValue> getIconTranslate(const optional& klass = {}) const; - void setIconTranslate(PropertyValue>, const optional& klass = {}); - void setIconTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconTranslateTransition(const optional& klass = {}) const; + PropertyValue> getIconTranslate() const; + void setIconTranslate(PropertyValue>); + void setIconTranslateTransition(const TransitionOptions&); + TransitionOptions getIconTranslateTransition() const; static PropertyValue getDefaultIconTranslateAnchor(); - PropertyValue getIconTranslateAnchor(const optional& klass = {}) const; - void setIconTranslateAnchor(PropertyValue, const optional& klass = {}); - void setIconTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getIconTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getIconTranslateAnchor() const; + void setIconTranslateAnchor(PropertyValue); + void setIconTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getIconTranslateAnchorTransition() const; static DataDrivenPropertyValue getDefaultTextOpacity(); - DataDrivenPropertyValue getTextOpacity(const optional& klass = {}) const; - void setTextOpacity(DataDrivenPropertyValue, const optional& klass = {}); - void setTextOpacityTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextOpacityTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getTextOpacity() const; + void setTextOpacity(DataDrivenPropertyValue); + void setTextOpacityTransition(const TransitionOptions&); + TransitionOptions getTextOpacityTransition() const; static DataDrivenPropertyValue getDefaultTextColor(); - DataDrivenPropertyValue getTextColor(const optional& klass = {}) const; - void setTextColor(DataDrivenPropertyValue, const optional& klass = {}); - void setTextColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getTextColor() const; + void setTextColor(DataDrivenPropertyValue); + void setTextColorTransition(const TransitionOptions&); + TransitionOptions getTextColorTransition() const; static DataDrivenPropertyValue getDefaultTextHaloColor(); - DataDrivenPropertyValue getTextHaloColor(const optional& klass = {}) const; - void setTextHaloColor(DataDrivenPropertyValue, const optional& klass = {}); - void setTextHaloColorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextHaloColorTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getTextHaloColor() const; + void setTextHaloColor(DataDrivenPropertyValue); + void setTextHaloColorTransition(const TransitionOptions&); + TransitionOptions getTextHaloColorTransition() const; static DataDrivenPropertyValue getDefaultTextHaloWidth(); - DataDrivenPropertyValue getTextHaloWidth(const optional& klass = {}) const; - void setTextHaloWidth(DataDrivenPropertyValue, const optional& klass = {}); - void setTextHaloWidthTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextHaloWidthTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getTextHaloWidth() const; + void setTextHaloWidth(DataDrivenPropertyValue); + void setTextHaloWidthTransition(const TransitionOptions&); + TransitionOptions getTextHaloWidthTransition() const; static DataDrivenPropertyValue getDefaultTextHaloBlur(); - DataDrivenPropertyValue getTextHaloBlur(const optional& klass = {}) const; - void setTextHaloBlur(DataDrivenPropertyValue, const optional& klass = {}); - void setTextHaloBlurTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextHaloBlurTransition(const optional& klass = {}) const; + DataDrivenPropertyValue getTextHaloBlur() const; + void setTextHaloBlur(DataDrivenPropertyValue); + void setTextHaloBlurTransition(const TransitionOptions&); + TransitionOptions getTextHaloBlurTransition() const; static PropertyValue> getDefaultTextTranslate(); - PropertyValue> getTextTranslate(const optional& klass = {}) const; - void setTextTranslate(PropertyValue>, const optional& klass = {}); - void setTextTranslateTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextTranslateTransition(const optional& klass = {}) const; + PropertyValue> getTextTranslate() const; + void setTextTranslate(PropertyValue>); + void setTextTranslateTransition(const TransitionOptions&); + TransitionOptions getTextTranslateTransition() const; static PropertyValue getDefaultTextTranslateAnchor(); - PropertyValue getTextTranslateAnchor(const optional& klass = {}) const; - void setTextTranslateAnchor(PropertyValue, const optional& klass = {}); - void setTextTranslateAnchorTransition(const TransitionOptions&, const optional& klass = {}); - TransitionOptions getTextTranslateAnchorTransition(const optional& klass = {}) const; + PropertyValue getTextTranslateAnchor() const; + void setTextTranslateAnchor(PropertyValue); + void setTextTranslateAnchorTransition(const TransitionOptions&); + TransitionOptions getTextTranslateAnchorTransition() const; // Private implementation -- cgit v1.2.1