[core] Enable property functions for text-{field,transform} (#7944)

This commit is contained in:
Anand Thakker
2017-02-17 16:16:25 -05:00
committed by John Firebaugh
parent d4c569a018
commit 062b18374d
23 changed files with 474 additions and 175 deletions

View File

@@ -1742,7 +1742,7 @@ public class PropertyFactory {
}
/**
* Value to use for a text label. Feature properties are specified using tokens like {field_name}.
* Value to use for a text label. Feature properties are specified using tokens like {field_name}. (Token replacement is only supported for literal `textField` values--not for property functions.)
*
* @param value a String value
* @return property wrapper around String
@@ -1754,13 +1754,13 @@ public class PropertyFactory {
/**
* Value to use for a text label. Feature properties are specified using tokens like {field_name}.
* Value to use for a text label. Feature properties are specified using tokens like {field_name}. (Token replacement is only supported for literal `textField` values--not for property functions.)
*
* @param <Z> the zoom parameter type
* @param function a wrapper {@link CameraFunction} for String
* @param <T> the function input type
* @param function a wrapper function for String
* @return property wrapper around a String function
*/
public static <Z extends Number> PropertyValue<CameraFunction<Z, String>> textField(CameraFunction<Z, String> function) {
public static <T> PropertyValue<Function<T, String>> textField(Function<T, String> function) {
return new LayoutPropertyValue<>("text-field", function);
}
@@ -2032,11 +2032,11 @@ public class PropertyFactory {
/**
* Specifies how to capitalize text, similar to the CSS {@link PropertyFactory#textTransform} property.
*
* @param <Z> the zoom parameter type
* @param function a wrapper {@link CameraFunction} for String
* @param <T> the function input type
* @param function a wrapper function for String
* @return property wrapper around a String function
*/
public static <Z extends Number> PropertyValue<CameraFunction<Z, String>> textTransform(CameraFunction<Z, String> function) {
public static <T> PropertyValue<Function<T, String>> textTransform(Function<T, String> function) {
return new LayoutPropertyValue<>("text-transform", function);
}

View File

@@ -886,6 +886,51 @@ public class SymbolLayerTest extends BaseStyleTest {
assertEquals(1, ((IntervalStops) layer.getTextField().getFunction().getStops()).size());
}
@Test
public void testTextFieldAsIdentitySourceFunction() {
checkViewIsDisplayed(R.id.mapView);
Timber.i("text-field");
assertNotNull(layer);
// Set
layer.setProperties(
textField(property("FeaturePropertyA", Stops.<String>identity()))
);
// Verify
assertNotNull(layer.getTextField());
assertNotNull(layer.getTextField().getFunction());
assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
assertEquals(IdentityStops.class, layer.getTextField().getFunction().getStops().getClass());
}
@Test
public void testTextFieldAsIntervalSourceFunction() {
checkViewIsDisplayed(R.id.mapView);
Timber.i("text-field");
assertNotNull(layer);
// Set
layer.setProperties(
textField(
property(
"FeaturePropertyA",
interval(
stop(1, textField(""))
)
)
)
);
// Verify
assertNotNull(layer.getTextField());
assertNotNull(layer.getTextField().getFunction());
assertEquals(SourceFunction.class, layer.getTextField().getFunction().getClass());
assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextField().getFunction()).getProperty());
assertEquals(IdentityStops.class, layer.getTextField().getFunction().getStops().getClass());
}
@Test
public void testTextFontAsConstant() {
checkViewIsDisplayed(R.id.mapView);
@@ -1325,6 +1370,51 @@ public class SymbolLayerTest extends BaseStyleTest {
assertEquals(1, ((IntervalStops) layer.getTextTransform().getFunction().getStops()).size());
}
@Test
public void testTextTransformAsIdentitySourceFunction() {
checkViewIsDisplayed(R.id.mapView);
Timber.i("text-transform");
assertNotNull(layer);
// Set
layer.setProperties(
textTransform(property("FeaturePropertyA", Stops.<String>identity()))
);
// Verify
assertNotNull(layer.getTextTransform());
assertNotNull(layer.getTextTransform().getFunction());
assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
assertEquals(IdentityStops.class, layer.getTextTransform().getFunction().getStops().getClass());
}
@Test
public void testTextTransformAsIntervalSourceFunction() {
checkViewIsDisplayed(R.id.mapView);
Timber.i("text-transform");
assertNotNull(layer);
// Set
layer.setProperties(
textTransform(
property(
"FeaturePropertyA",
interval(
stop(1, textTransform(TEXT_TRANSFORM_NONE))
)
)
)
);
// Verify
assertNotNull(layer.getTextTransform());
assertNotNull(layer.getTextTransform().getFunction());
assertEquals(SourceFunction.class, layer.getTextTransform().getFunction().getClass());
assertEquals("FeaturePropertyA", ((SourceFunction) layer.getTextTransform().getFunction()).getProperty());
assertEquals(IdentityStops.class, layer.getTextTransform().getFunction().getStops().getClass());
}
@Test
public void testTextOffsetAsConstant() {
checkViewIsDisplayed(R.id.mapView);

View File

@@ -177,9 +177,9 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
<% if (property.type == 'color') { -%>
stop(Color.RED, <%- camelizeWithLeadingLowercase(property.name) %>(Color.RED))
<% } else {-%>
1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
<% } -%>
stop(1, <%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>))
)
<% } -%>
)
)
);