[core] Implement CrossFadedDataDrivenProperty to add support for feature expressions in *-pattern properties

This commit is contained in:
Molly Lloyd
2018-06-14 14:35:39 -07:00
committed by Molly Lloyd
parent ec62e32153
commit 4a5dc37245
122 changed files with 3012 additions and 2108 deletions

View File

@@ -265,6 +265,22 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
});
}
@Test
public void testFillExtrusionPatternAsExpression() {
validateTestSetup();
setupLayer();
Timber.i("fill-extrusion-pattern-expression");
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(layer);
// Set and Get
Expression expression = string(Expression.get("undefined"));
layer.setProperties(fillExtrusionPattern(expression));
assertEquals(layer.getFillExtrusionPattern().getExpression(), expression);
});
}
@Test
public void testFillExtrusionHeightTransition() {
validateTestSetup();

View File

@@ -353,4 +353,20 @@ public class FillLayerTest extends BaseActivityTest {
assertEquals((String) layer.getFillPattern().getValue(), (String) "pedestrian-polygon");
});
}
@Test
public void testFillPatternAsExpression() {
validateTestSetup();
setupLayer();
Timber.i("fill-pattern-expression");
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(layer);
// Set and Get
Expression expression = string(Expression.get("undefined"));
layer.setProperties(fillPattern(expression));
assertEquals(layer.getFillPattern().getExpression(), expression);
});
}
}

View File

@@ -545,4 +545,20 @@ public class LineLayerTest extends BaseActivityTest {
assertEquals((String) layer.getLinePattern().getValue(), (String) "pedestrian-polygon");
});
}
@Test
public void testLinePatternAsExpression() {
validateTestSetup();
setupLayer();
Timber.i("line-pattern-expression");
invoke(mapboxMap, (uiController, mapboxMap) -> {
assertNotNull(layer);
// Set and Get
Expression expression = string(Expression.get("undefined"));
layer.setProperties(linePattern(expression));
assertEquals(layer.getLinePattern().getExpression(), expression);
});
}
}