tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add array support for icon-padding (#2845)

Browse Source
This commit is contained in:
Alexey Kon
2024-09-20 17:17:33 -07:00
committed by GitHub
parent 58dd529790
commit 9d553c2843
56 changed files with 902 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/ExpressionTest.java
View File

@@ -55,11 +55,13 @@ import static org.maplibre.android.style.expressions.Expression.stop;
import static org.maplibre.android.style.expressions.Expression.string;
import static org.maplibre.android.style.expressions.Expression.switchCase;
import static org.maplibre.android.style.expressions.Expression.toColor;
import static org.maplibre.android.style.expressions.Expression.toPadding;
import static org.maplibre.android.style.expressions.Expression.zoom;
import static org.maplibre.android.style.layers.PropertyFactory.circleColor;
import static org.maplibre.android.style.layers.PropertyFactory.fillAntialias;
import static org.maplibre.android.style.layers.PropertyFactory.fillColor;
import static org.maplibre.android.style.layers.PropertyFactory.fillOutlineColor;
import static org.maplibre.android.style.layers.PropertyFactory.iconPadding;
import static org.maplibre.android.style.layers.PropertyFactory.textColor;
import static org.maplibre.android.style.layers.PropertyFactory.textField;
import static org.maplibre.android.testapp.action.MapLibreMapAction.invoke;
@@ -779,6 +781,93 @@ public class ExpressionTest extends EspressoTest {
});
}
@Test
public void testToPaddingExpression() {
validateTestSetup();
invoke(maplibreMap, (uiController, maplibreMap) -> {
LatLng latLng = new LatLng(51, 17);
maplibreMap.getStyle().addSource(
new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()))
);
SymbolLayer layer = new SymbolLayer("layer", "source");
maplibreMap.getStyle().addLayer(layer);
// Automatic usage with iconPadding property, analogous to testGetExpressionWrapping()
{
Expression input = get("value");
layer.setProperties(iconPadding(input));
Expression expectedOuput = toPadding(input);
Expression output = layer.getIconPadding().getExpression();
assertNotNull(output);
assertArrayEquals("Expression should match", expectedOuput.toArray(), output.toArray());
}
// Same within interpolate expression
{
Expression input = interpolate(
exponential(0.5f), zoom(),
stop(-0.1, get("value")),
stop(0, get("value"))
);
layer.setProperties(iconPadding(input));
Expression expectedOutput = interpolate(
exponential(0.5f), zoom(),
stop(-0.1, toPadding(get("value"))),
stop(0, toPadding(get("value")))
);
Expression output = layer.getIconPadding().getExpression();
assertNotNull(output);
assertArrayEquals("Expression should match", expectedOutput.toArray(), output.toArray());
}
});
}
@Test
public void testToPaddingResult() {
validateTestSetup();
invoke(maplibreMap, (uiController, maplibreMap) -> {
LatLng latLng = new LatLng(51, 17);
maplibreMap.getStyle().addSource(
new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()))
);
SymbolLayer layer = new SymbolLayer("layer", "source");
maplibreMap.getStyle().addLayer(layer);
Expression input = Expression.toPadding(Expression.literal(new Float[] { 7.5f, 10.0f, 1.0f}));
layer.setProperties(iconPadding(input));
assertNull("Expression should be null", layer.getIconPadding().getExpression());
assertArrayEquals(
"Padding value should match",
new Float[] { 7.5f, 10.0f, 1.0f, 10.0f },
layer.getIconPadding().getValue());
});
}
@Test
public void testToPaddingError() {
validateTestSetup();
invoke(maplibreMap, (uiController, maplibreMap) -> {
LatLng latLng = new LatLng(51, 17);
maplibreMap.getStyle().addSource(
new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()))
);
SymbolLayer layer = new SymbolLayer("layer", "source");
maplibreMap.getStyle().addLayer(layer);
Expression input = toPadding(literal("invalid"));
layer.setProperties(iconPadding(input));
assertNull("Expression should be null", layer.getIconPadding().getExpression());
assertNull("Padding value should be null", layer.getIconPadding().getValue());
});
}
private void setupStyle() {
invoke(maplibreMap, (uiController, maplibreMap) -> {
// Add a source

15
platform/android/MapLibreAndroidTestApp/src/androidTest/java/org/maplibre/android/testapp/style/SymbolLayerTest.java
View File

@@ -422,11 +422,24 @@ public class SymbolLayerTest extends BaseLayerTest {
assertNull(layer.getIconPadding().getValue());
// Set and Get
Float propertyValue = 0.3f;
Float[] propertyValue = {2.0f, 2.0f, 2.0f, 2.0f};
layer.setProperties(iconPadding(propertyValue));
assertEquals(layer.getIconPadding().getValue(), propertyValue);
}
@Test
@UiThreadTest
public void testIconPaddingAsExpression() {
Timber.i("icon-padding-expression");
assertNotNull(layer);
assertNull(layer.getIconPadding().getExpression());
// Set and Get
Expression expression = toPadding(Expression.get("undefined"));
layer.setProperties(iconPadding(expression));
assertEquals(layer.getIconPadding().getExpression(), expression);
}
@Test
@UiThreadTest
public void testIconKeepUprightAsConstant() {