Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Per-attribute transition properties on MGLStyleLayer #8225

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ios] Fixed layer space formatting
  • Loading branch information
fabian-guerra committed Mar 10, 2017
commit 967a19a2b6c523d86fdba795e239036701bd7618
2 changes: 2 additions & 0 deletions platform/darwin/src/MGLBackgroundStyleLayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ - (MGLTransition)backgroundColorTransition {

return transition;
}

- (void)setBackgroundOpacity:(MGLStyleValue<NSNumber *> *)backgroundOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -153,6 +154,7 @@ - (MGLTransition)backgroundOpacityTransition {

return transition;
}

- (void)setBackgroundPattern:(MGLStyleValue<NSString *> *)backgroundPattern {
MGLAssertStyleLayerIsValid();

Expand Down
12 changes: 12 additions & 0 deletions platform/darwin/src/MGLCircleStyleLayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ - (MGLTransition)circleBlurTransition {

return transition;
}

- (void)setCircleColor:(MGLStyleValue<MGLColor *> *)circleColor {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -203,6 +204,7 @@ - (MGLTransition)circleColorTransition {

return transition;
}

- (void)setCircleOpacity:(MGLStyleValue<NSNumber *> *)circleOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -237,6 +239,7 @@ - (MGLTransition)circleOpacityTransition {

return transition;
}

- (void)setCircleRadius:(MGLStyleValue<NSNumber *> *)circleRadius {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -271,6 +274,7 @@ - (MGLTransition)circleRadiusTransition {

return transition;
}

- (void)setCircleScaleAlignment:(MGLStyleValue<NSValue *> *)circleScaleAlignment {
MGLAssertStyleLayerIsValid();

Expand All @@ -287,12 +291,14 @@ - (void)setCircleScaleAlignment:(MGLStyleValue<NSValue *> *)circleScaleAlignment
}
return MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCircleScaleAlignment>().toEnumStyleValue(propertyValue);
}

- (void)setCirclePitchScale:(MGLStyleValue<NSValue *> *)circlePitchScale {
}

- (MGLStyleValue<NSValue *> *)circlePitchScale {
return self.circleScaleAlignment;
}

- (void)setCircleStrokeColor:(MGLStyleValue<MGLColor *> *)circleStrokeColor {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -327,6 +333,7 @@ - (MGLTransition)circleStrokeColorTransition {

return transition;
}

- (void)setCircleStrokeOpacity:(MGLStyleValue<NSNumber *> *)circleStrokeOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -361,6 +368,7 @@ - (MGLTransition)circleStrokeOpacityTransition {

return transition;
}

- (void)setCircleStrokeWidth:(MGLStyleValue<NSNumber *> *)circleStrokeWidth {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -395,6 +403,7 @@ - (MGLTransition)circleStrokeWidthTransition {

return transition;
}

- (void)setCircleTranslation:(MGLStyleValue<NSValue *> *)circleTranslation {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -429,12 +438,14 @@ - (MGLTransition)circleTranslationTransition {

return transition;
}

- (void)setCircleTranslate:(MGLStyleValue<NSValue *> *)circleTranslate {
}

- (MGLStyleValue<NSValue *> *)circleTranslate {
return self.circleTranslation;
}

- (void)setCircleTranslationAnchor:(MGLStyleValue<NSValue *> *)circleTranslationAnchor {
MGLAssertStyleLayerIsValid();

Expand All @@ -451,6 +462,7 @@ - (void)setCircleTranslationAnchor:(MGLStyleValue<NSValue *> *)circleTranslation
}
return MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLCircleTranslationAnchor>().toEnumStyleValue(propertyValue);
}

- (void)setCircleTranslateAnchor:(MGLStyleValue<NSValue *> *)circleTranslateAnchor {
}

Expand Down
9 changes: 9 additions & 0 deletions platform/darwin/src/MGLFillStyleLayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,14 @@ - (void)setFillAntialiased:(MGLStyleValue<NSNumber *> *)fillAntialiased {
}
return MGLStyleValueTransformer<bool, NSNumber *>().toStyleValue(propertyValue);
}

- (void)setFillAntialias:(MGLStyleValue<NSNumber *> *)fillAntialias {
}

- (MGLStyleValue<NSNumber *> *)fillAntialias {
return self.isFillAntialiased;
}

- (void)setFillColor:(MGLStyleValue<MGLColor *> *)fillColor {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -186,6 +188,7 @@ - (MGLTransition)fillColorTransition {

return transition;
}

- (void)setFillOpacity:(MGLStyleValue<NSNumber *> *)fillOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -220,6 +223,7 @@ - (MGLTransition)fillOpacityTransition {

return transition;
}

- (void)setFillOutlineColor:(MGLStyleValue<MGLColor *> *)fillOutlineColor {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -254,6 +258,7 @@ - (MGLTransition)fillOutlineColorTransition {

return transition;
}

- (void)setFillPattern:(MGLStyleValue<NSString *> *)fillPattern {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -288,6 +293,7 @@ - (MGLTransition)fillPatternTransition {

return transition;
}

- (void)setFillTranslation:(MGLStyleValue<NSValue *> *)fillTranslation {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -322,12 +328,14 @@ - (MGLTransition)fillTranslationTransition {

return transition;
}

- (void)setFillTranslate:(MGLStyleValue<NSValue *> *)fillTranslate {
}

- (MGLStyleValue<NSValue *> *)fillTranslate {
return self.fillTranslation;
}

- (void)setFillTranslationAnchor:(MGLStyleValue<NSValue *> *)fillTranslationAnchor {
MGLAssertStyleLayerIsValid();

Expand All @@ -344,6 +352,7 @@ - (void)setFillTranslationAnchor:(MGLStyleValue<NSValue *> *)fillTranslationAnch
}
return MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLFillTranslationAnchor>().toEnumStyleValue(propertyValue);
}

- (void)setFillTranslateAnchor:(MGLStyleValue<NSValue *> *)fillTranslateAnchor {
}

Expand Down
12 changes: 12 additions & 0 deletions platform/darwin/src/MGLLineStyleLayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ - (MGLTransition)lineBlurTransition {

return transition;
}

- (void)setLineColor:(MGLStyleValue<MGLColor *> *)lineColor {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -280,6 +281,7 @@ - (MGLTransition)lineColorTransition {

return transition;
}

- (void)setLineDashPattern:(MGLStyleValue<NSArray<NSNumber *> *> *)lineDashPattern {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -314,12 +316,14 @@ - (MGLTransition)lineDashPatternTransition {

return transition;
}

- (void)setLineDasharray:(MGLStyleValue<NSArray<NSNumber *> *> *)lineDasharray {
}

- (MGLStyleValue<NSArray<NSNumber *> *> *)lineDasharray {
return self.lineDashPattern;
}

- (void)setLineGapWidth:(MGLStyleValue<NSNumber *> *)lineGapWidth {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -354,6 +358,7 @@ - (MGLTransition)lineGapWidthTransition {

return transition;
}

- (void)setLineOffset:(MGLStyleValue<NSNumber *> *)lineOffset {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -388,6 +393,7 @@ - (MGLTransition)lineOffsetTransition {

return transition;
}

- (void)setLineOpacity:(MGLStyleValue<NSNumber *> *)lineOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -422,6 +428,7 @@ - (MGLTransition)lineOpacityTransition {

return transition;
}

- (void)setLinePattern:(MGLStyleValue<NSString *> *)linePattern {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -456,6 +463,7 @@ - (MGLTransition)linePatternTransition {

return transition;
}

- (void)setLineTranslation:(MGLStyleValue<NSValue *> *)lineTranslation {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -490,12 +498,14 @@ - (MGLTransition)lineTranslationTransition {

return transition;
}

- (void)setLineTranslate:(MGLStyleValue<NSValue *> *)lineTranslate {
}

- (MGLStyleValue<NSValue *> *)lineTranslate {
return self.lineTranslation;
}

- (void)setLineTranslationAnchor:(MGLStyleValue<NSValue *> *)lineTranslationAnchor {
MGLAssertStyleLayerIsValid();

Expand All @@ -512,12 +522,14 @@ - (void)setLineTranslationAnchor:(MGLStyleValue<NSValue *> *)lineTranslationAnch
}
return MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLLineTranslationAnchor>().toEnumStyleValue(propertyValue);
}

- (void)setLineTranslateAnchor:(MGLStyleValue<NSValue *> *)lineTranslateAnchor {
}

- (MGLStyleValue<NSValue *> *)lineTranslateAnchor {
return self.lineTranslationAnchor;
}

- (void)setLineWidth:(MGLStyleValue<NSNumber *> *)lineWidth {
MGLAssertStyleLayerIsValid();

Expand Down
9 changes: 9 additions & 0 deletions platform/darwin/src/MGLRasterStyleLayer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,14 @@ - (MGLTransition)maximumRasterBrightnessTransition {

return transition;
}

- (void)setRasterBrightnessMax:(MGLStyleValue<NSNumber *> *)rasterBrightnessMax {
}

- (MGLStyleValue<NSNumber *> *)rasterBrightnessMax {
return self.maximumRasterBrightness;
}

- (void)setMinimumRasterBrightness:(MGLStyleValue<NSNumber *> *)minimumRasterBrightness {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -166,12 +168,14 @@ - (MGLTransition)minimumRasterBrightnessTransition {

return transition;
}

- (void)setRasterBrightnessMin:(MGLStyleValue<NSNumber *> *)rasterBrightnessMin {
}

- (MGLStyleValue<NSNumber *> *)rasterBrightnessMin {
return self.minimumRasterBrightness;
}

- (void)setRasterContrast:(MGLStyleValue<NSNumber *> *)rasterContrast {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -206,6 +210,7 @@ - (MGLTransition)rasterContrastTransition {

return transition;
}

- (void)setRasterFadeDuration:(MGLStyleValue<NSNumber *> *)rasterFadeDuration {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -240,6 +245,7 @@ - (MGLTransition)rasterFadeDurationTransition {

return transition;
}

- (void)setRasterHueRotation:(MGLStyleValue<NSNumber *> *)rasterHueRotation {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -274,12 +280,14 @@ - (MGLTransition)rasterHueRotationTransition {

return transition;
}

- (void)setRasterHueRotate:(MGLStyleValue<NSNumber *> *)rasterHueRotate {
}

- (MGLStyleValue<NSNumber *> *)rasterHueRotate {
return self.rasterHueRotation;
}

- (void)setRasterOpacity:(MGLStyleValue<NSNumber *> *)rasterOpacity {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -314,6 +322,7 @@ - (MGLTransition)rasterOpacityTransition {

return transition;
}

- (void)setRasterSaturation:(MGLStyleValue<NSNumber *> *)rasterSaturation {
MGLAssertStyleLayerIsValid();

Expand Down
3 changes: 2 additions & 1 deletion platform/darwin/src/MGLStyleLayer.mm.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ namespace mbgl {
<% } -%>
<% if (paintProperties.length) { -%>
#pragma mark - Accessing the Paint Attributes

<% for (const property of paintProperties) { -%>

- (void)set<%- camelize(property.name) %>:(MGLStyleValue<<%- propertyType(property, true) %>> *)<%- objCName(property) %> {
MGLAssertStyleLayerIsValid();

Expand Down Expand Up @@ -292,6 +292,7 @@ namespace mbgl {
}
<% } -%>
<% if (property.original) { -%>

- (void)set<%- camelize(originalPropertyName(property)) %>:(MGLStyleValue<<%- propertyType(property, true) %>> *)<%- camelizeWithLeadingLowercase(originalPropertyName(property)) %> {
}

Expand Down
Loading