diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-01-24 15:05:28 -0800 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-01-24 15:41:22 -0800 |
commit | 2502a3ab2bf793dcb3a41deb5c93290b3c6ce5fd (patch) | |
tree | 5c52e96803ae64279a02eb4a00857b75490a9279 /platform/darwin | |
parent | 7159a14b35ee380450589d69b1e844282030c19f (diff) | |
download | qtlocation-mapboxgl-2502a3ab2bf793dcb3a41deb5c93290b3c6ce5fd.tar.gz |
[core] update mapbox-gl-js submodule pin
* disables transition render test (transitions are not supported with Still image rendering in Node.js)
* removes support for hillshade-illumniation-direction-transition
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/src/MGLHillshadeStyleLayer.h | 7 | ||||
-rw-r--r-- | platform/darwin/src/MGLHillshadeStyleLayer.mm | 18 | ||||
-rw-r--r-- | platform/darwin/test/MGLHillshadeStyleLayerTests.mm | 9 |
3 files changed, 0 insertions, 34 deletions
diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.h b/platform/darwin/src/MGLHillshadeStyleLayer.h index c1fa069844..199bf214c2 100644 --- a/platform/darwin/src/MGLHillshadeStyleLayer.h +++ b/platform/darwin/src/MGLHillshadeStyleLayer.h @@ -186,13 +186,6 @@ MGL_EXPORT @property (nonatomic, null_resettable) NSExpression *hillshadeIlluminationDirection; /** - The transition affecting any changes to this layer’s `hillshadeIlluminationDirection` property. - - This property corresponds to the `hillshade-illumination-direction-transition` property in the style JSON file format. -*/ -@property (nonatomic) MGLTransition hillshadeIlluminationDirectionTransition; - -/** The shading color of areas that face away from the light source. The default value of this property is an expression that evaluates to diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/darwin/src/MGLHillshadeStyleLayer.mm index ac12b52506..538a99daf6 100644 --- a/platform/darwin/src/MGLHillshadeStyleLayer.mm +++ b/platform/darwin/src/MGLHillshadeStyleLayer.mm @@ -216,24 +216,6 @@ namespace mbgl { return MGLStyleValueTransformer<float, NSNumber *>().toExpression(propertyValue); } -- (void)setHillshadeIlluminationDirectionTransition:(MGLTransition )transition { - MGLAssertStyleLayerIsValid(); - - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHillshadeIlluminationDirectionTransition(options); -} - -- (MGLTransition)hillshadeIlluminationDirectionTransition { - MGLAssertStyleLayerIsValid(); - - mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHillshadeIlluminationDirectionTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - - return transition; -} - - (void)setHillshadeShadowColor:(NSExpression *)hillshadeShadowColor { MGLAssertStyleLayerIsValid(); diff --git a/platform/darwin/test/MGLHillshadeStyleLayerTests.mm b/platform/darwin/test/MGLHillshadeStyleLayerTests.mm index 87950e4f24..8f37b52790 100644 --- a/platform/darwin/test/MGLHillshadeStyleLayerTests.mm +++ b/platform/darwin/test/MGLHillshadeStyleLayerTests.mm @@ -293,15 +293,6 @@ functionExpression = [NSExpression expressionWithFormat:@"FUNCTION(bogus, 'mgl_stepWithMinimum:stops:', %@, %@)", constantExpression, @{@18: constantExpression}]; functionExpression = [NSExpression expressionWithFormat:@"FUNCTION($zoomLevel, 'mgl_interpolateWithCurveType:parameters:stops:', 'linear', nil, %@)", @{@10: functionExpression}]; XCTAssertThrowsSpecificNamed(layer.hillshadeIlluminationDirection = functionExpression, NSException, NSInvalidArgumentException, @"MGLHillshadeLayer should raise an exception if a camera-data expression is applied to a property that does not support key paths to feature attributes."); - // Transition property test - layer.hillshadeIlluminationDirectionTransition = transitionTest; - auto toptions = rawLayer->getHillshadeIlluminationDirectionTransition(); - XCTAssert(toptions.delay && MGLTimeIntervalFromDuration(*toptions.delay) == transitionTest.delay); - XCTAssert(toptions.duration && MGLTimeIntervalFromDuration(*toptions.duration) == transitionTest.duration); - - MGLTransition hillshadeIlluminationDirectionTransition = layer.hillshadeIlluminationDirectionTransition; - XCTAssertEqual(hillshadeIlluminationDirectionTransition.delay, transitionTest.delay); - XCTAssertEqual(hillshadeIlluminationDirectionTransition.duration, transitionTest.duration); } // hillshade-shadow-color |