From 2502a3ab2bf793dcb3a41deb5c93290b3c6ce5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 24 Jan 2018 15:05:28 -0800 Subject: [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 --- mapbox-gl-js | 2 +- .../mapboxsdk/style/layers/HillshadeLayer.java | 22 ---------------------- .../testapp/style/HillshadeLayerTest.java | 18 ------------------ .../android/src/style/layers/hillshade_layer.cpp | 15 --------------- .../android/src/style/layers/hillshade_layer.hpp | 2 -- platform/darwin/src/MGLHillshadeStyleLayer.h | 7 ------- platform/darwin/src/MGLHillshadeStyleLayer.mm | 18 ------------------ .../darwin/test/MGLHillshadeStyleLayerTests.mm | 9 --------- platform/node/test/ignores.json | 1 + scripts/generate-shaders.js | 2 -- 10 files changed, 2 insertions(+), 94 deletions(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index 5e44e625cc..579abbad9f 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 5e44e625ccf6e9d5e6d48011bb11281d1a4a197a +Subproject commit 579abbad9fc8b83a2a2c1de114b2a77472bee52d diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index be0df6c145..dc65cb5081 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -82,24 +82,6 @@ public class HillshadeLayer extends Layer { return (PropertyValue) new PropertyValue("hillshade-illumination-direction", nativeGetHillshadeIlluminationDirection()); } - /** - * Get the HillshadeIlluminationDirection property transition options - * - * @return transition options for Float - */ - public TransitionOptions getHillshadeIlluminationDirectionTransition() { - return nativeGetHillshadeIlluminationDirectionTransition(); - } - - /** - * Set the HillshadeIlluminationDirection property transition options - * - * @param options transition options for Float - */ - public void setHillshadeIlluminationDirectionTransition(TransitionOptions options) { - nativeSetHillshadeIlluminationDirectionTransition(options.getDuration(), options.getDelay()); - } - /** * Get the HillshadeIlluminationAnchor property * @@ -272,10 +254,6 @@ public class HillshadeLayer extends Layer { private native Object nativeGetHillshadeIlluminationDirection(); - private native TransitionOptions nativeGetHillshadeIlluminationDirectionTransition(); - - private native void nativeSetHillshadeIlluminationDirectionTransition(long duration, long delay); - private native Object nativeGetHillshadeIlluminationAnchor(); private native Object nativeGetHillshadeExaggeration(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java index c76dccdedb..1cb7b575be 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HillshadeLayerTest.java @@ -86,24 +86,6 @@ public class HillshadeLayerTest extends BaseActivityTest { }); } - @Test - public void testHillshadeIlluminationDirectionTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("hillshade-illumination-directionTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setHillshadeIlluminationDirectionTransition(options); - assertEquals(layer.getHillshadeIlluminationDirectionTransition(), options); - } - }); - } - @Test public void testHillshadeIlluminationDirectionAsConstant() { validateTestSetup(); diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp index b58bc3b947..d98e3ee074 100644 --- a/platform/android/src/style/layers/hillshade_layer.cpp +++ b/platform/android/src/style/layers/hillshade_layer.cpp @@ -41,19 +41,6 @@ namespace android { return jni::Object(*converted); } - jni::Object HillshadeLayer::getHillshadeIlluminationDirectionTransition(jni::JNIEnv& env) { - using namespace mbgl::android::conversion; - mbgl::style::TransitionOptions options = layer.as()->HillshadeLayer::getHillshadeIlluminationDirectionTransition(); - return *convert>(env, options); - } - - void HillshadeLayer::setHillshadeIlluminationDirectionTransition(jni::JNIEnv&, jlong duration, jlong delay) { - mbgl::style::TransitionOptions options; - options.duration.emplace(mbgl::Milliseconds(duration)); - options.delay.emplace(mbgl::Milliseconds(delay)); - layer.as()->HillshadeLayer::setHillshadeIlluminationDirectionTransition(options); - } - jni::Object HillshadeLayer::getHillshadeIlluminationAnchor(jni::JNIEnv& env) { using namespace mbgl::android::conversion; Result converted = convert(env, layer.as()->HillshadeLayer::getHillshadeIlluminationAnchor()); @@ -156,8 +143,6 @@ namespace android { std::make_unique, "initialize", "finalize", - METHOD(&HillshadeLayer::getHillshadeIlluminationDirectionTransition, "nativeGetHillshadeIlluminationDirectionTransition"), - METHOD(&HillshadeLayer::setHillshadeIlluminationDirectionTransition, "nativeSetHillshadeIlluminationDirectionTransition"), METHOD(&HillshadeLayer::getHillshadeIlluminationDirection, "nativeGetHillshadeIlluminationDirection"), METHOD(&HillshadeLayer::getHillshadeIlluminationAnchor, "nativeGetHillshadeIlluminationAnchor"), METHOD(&HillshadeLayer::getHillshadeExaggerationTransition, "nativeGetHillshadeExaggerationTransition"), diff --git a/platform/android/src/style/layers/hillshade_layer.hpp b/platform/android/src/style/layers/hillshade_layer.hpp index 101febb228..4b68251775 100644 --- a/platform/android/src/style/layers/hillshade_layer.hpp +++ b/platform/android/src/style/layers/hillshade_layer.hpp @@ -30,8 +30,6 @@ public: // Properties jni::Object getHillshadeIlluminationDirection(jni::JNIEnv&); - void setHillshadeIlluminationDirectionTransition(jni::JNIEnv&, jlong duration, jlong delay); - jni::Object getHillshadeIlluminationDirectionTransition(jni::JNIEnv&); jni::Object getHillshadeIlluminationAnchor(jni::JNIEnv&); 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 @@ -185,13 +185,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. 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().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 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 1341fc86a1..ab187a86b3 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -50,6 +50,7 @@ "render-tests/regressions/mapbox-gl-js#5370": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/regressions/mapbox-gl-js#5599": "https://github.com/mapbox/mapbox-gl-native/issues/10399", "render-tests/regressions/mapbox-gl-js#5740": "https://github.com/mapbox/mapbox-gl-native/issues/10619", + "render-tests/regressions/mapbox-gl-js#5982": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index b4d1033d45..46c097d51a 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -7,8 +7,6 @@ const outputPath = 'src/mbgl/shaders'; var shaders = require('../mapbox-gl-js/src/shaders'); -delete shaders.hillshade; -delete shaders.hillshadePrepare; delete shaders.heatmap; delete shaders.heatmapTexture; -- cgit v1.2.1