From d25e2c772daeb44f3933a0114f41c86b9679e8c1 Mon Sep 17 00:00:00 2001 From: Jesse Bounds Date: Thu, 16 Feb 2017 19:46:00 -0800 Subject: [ios, macos] Rename MGLStyleConstantValue to MGLConstantStyleValue --- platform/darwin/src/MGLCircleStyleLayer.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'platform/darwin/src/MGLCircleStyleLayer.h') diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index b3e9ee7161..7a64c25a23 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -91,7 +91,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -117,7 +117,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -142,7 +142,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -168,7 +168,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -195,7 +195,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -224,7 +224,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of `MGLInterpolationModeInterval` */ @@ -242,7 +242,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -267,7 +267,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -293,7 +293,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -321,7 +321,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -353,7 +353,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -375,7 +375,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of: * `MGLInterpolationModeExponential` * `MGLInterpolationModeInterval` @@ -401,7 +401,7 @@ MGL_EXPORT You can set this property to an instance of: - * `MGLStyleConstantValue` + * `MGLConstantStyleValue` * `MGLCameraStyleFunction` with an interpolation mode of `MGLInterpolationModeInterval` */ -- cgit v1.2.1 From 20712b7c84bd91bcf658d74bf25f3460354b5fd6 Mon Sep 17 00:00:00 2001 From: Fabian Guerra Soto Date: Fri, 10 Mar 2017 11:33:31 -0800 Subject: Per-attribute transition properties on MGLStyleLayer (#8225) * [ios, macos] new struct MGLTransition * [ios] MGLTransition struct moved to MGLTypes.h * [ios] MGLTransition implemented for style layer properties * [ios, macos] added support for getting property transitions * [ios, macos] updated to MGLDurationFromTimeInterval and MGLTimeIntervalFromDuration * [ios, macos] added transition properties test * [ios, macos] modified key strings imp * [ios, macos] The impl for transition properties were changed to public methods * [ios, macos] Changelog update * [ios] Fixed layer space formatting * [core] The name space was fixed for getters that returned TransitionOptions * [ios, macos] Added rawLayer transition property tests * [ios] Added a factory method for MGLTransition and transition-related methods to NSValue(MGLAdditions) * [ios, macos] Copyedited changelog blurbs about transition properties --- platform/darwin/src/MGLCircleStyleLayer.h | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'platform/darwin/src/MGLCircleStyleLayer.h') diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index 7a64c25a23..d1d48d65c6 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -107,6 +107,13 @@ MGL_EXPORT */ @property (nonatomic, null_resettable) MGLStyleValue *circleBlur; +/** + The transition affecting any changes to this layer’s `circleBlur` property. + + This property corresponds to the `circle-blur-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleBlurTransition; + #if TARGET_OS_IPHONE /** The fill color of the circle. @@ -159,6 +166,13 @@ MGL_EXPORT @property (nonatomic, null_resettable) MGLStyleValue *circleColor; #endif +/** + The transition affecting any changes to this layer’s `circleColor` property. + + This property corresponds to the `circle-color-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleColorTransition; + /** The opacity at which the circle will be drawn. @@ -184,6 +198,13 @@ MGL_EXPORT */ @property (nonatomic, null_resettable) MGLStyleValue *circleOpacity; +/** + The transition affecting any changes to this layer’s `circleOpacity` property. + + This property corresponds to the `circle-opacity-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleOpacityTransition; + /** Circle radius. @@ -211,6 +232,13 @@ MGL_EXPORT */ @property (nonatomic, null_resettable) MGLStyleValue *circleRadius; +/** + The transition affecting any changes to this layer’s `circleRadius` property. + + This property corresponds to the `circle-radius-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleRadiusTransition; + /** Controls the scaling behavior of the circle when the map is pitched. @@ -284,6 +312,13 @@ MGL_EXPORT @property (nonatomic, null_resettable) MGLStyleValue *circleStrokeColor; #endif +/** + The transition affecting any changes to this layer’s `circleStrokeColor` property. + + This property corresponds to the `circle-stroke-color-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleStrokeColorTransition; + /** The opacity of the circle's stroke. @@ -309,6 +344,13 @@ MGL_EXPORT */ @property (nonatomic, null_resettable) MGLStyleValue *circleStrokeOpacity; +/** + The transition affecting any changes to this layer’s `circleStrokeOpacity` property. + + This property corresponds to the `circle-stroke-opacity-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleStrokeOpacityTransition; + /** The width of the circle's stroke. Strokes are placed outside of the `circleRadius`. @@ -337,6 +379,13 @@ MGL_EXPORT */ @property (nonatomic, null_resettable) MGLStyleValue *circleStrokeWidth; +/** + The transition affecting any changes to this layer’s `circleStrokeWidth` property. + + This property corresponds to the `circle-stroke-width-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleStrokeWidthTransition; + #if TARGET_OS_IPHONE /** The geometry's offset. @@ -383,6 +432,13 @@ MGL_EXPORT @property (nonatomic, null_resettable) MGLStyleValue *circleTranslation; #endif +/** + The transition affecting any changes to this layer’s `circleTranslation` property. + + This property corresponds to the `circle-translate-transition` property in the style JSON file format. +*/ +@property (nonatomic) MGLTransition circleTranslationTransition; + @property (nonatomic, null_resettable) MGLStyleValue *circleTranslate __attribute__((unavailable("Use circleTranslation instead."))); /** -- cgit v1.2.1 From e8f6c758965fb18845f27948906e8a766ed8ba12 Mon Sep 17 00:00:00 2001 From: Jordan Kiley Date: Tue, 14 Mar 2017 12:31:31 -0700 Subject: [ios, macos] API doc revisions (#8396) - Changed `make style-code-darwin` to `make darwin-style-code` in relevant files - Added some doc clarifications: - `MGLInterpolationModeExponential` and `MGLInterpolationModeInterval` can be used with `MGLCameraStyleFunction` (I am not sure how to accurately reflect this in the documentation for `MGLCompositeStyleFunction`) - Do not add a style layer to the style property on a map view before the style has finished loading - Create individual style layers from a `MGLShapeCollectionFeature` --- platform/darwin/src/MGLCircleStyleLayer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/darwin/src/MGLCircleStyleLayer.h') diff --git a/platform/darwin/src/MGLCircleStyleLayer.h b/platform/darwin/src/MGLCircleStyleLayer.h index d1d48d65c6..69c823a868 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.h +++ b/platform/darwin/src/MGLCircleStyleLayer.h @@ -1,5 +1,5 @@ // This file is generated. -// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`. +// Edit platform/darwin/scripts/generate-style-code.js, then run `make darwin-style-code`. #import "MGLFoundation.h" #import "MGLStyleValue.h" -- cgit v1.2.1