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

Expression filters (#11429)

Browse Source 
* [android] - add expression filter integration
This commit is contained in:
Tobrun
2018-03-19 15:11:17 +01:00
committed by GitHub
parent c5075e33ec
commit f011035017
36 changed files with 436 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
View File

@@ -85,6 +85,26 @@ public class CircleLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testCircleRadiusTransition() {
validateTestSetup();

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java
View File

@@ -85,6 +85,26 @@ public class FillExtrusionLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testFillExtrusionOpacityTransition() {
validateTestSetup();

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
View File

@@ -85,6 +85,26 @@ public class FillLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testFillAntialiasAsConstant() {
validateTestSetup();

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/HeatmapLayerTest.java
View File

@@ -85,6 +85,26 @@ public class HeatmapLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testHeatmapRadiusTransition() {
validateTestSetup();

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
View File

@@ -24,7 +24,7 @@ import org.junit.runner.RunWith;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static com.mapbox.mapboxsdk.style.layers.Filter.eq;
import static com.mapbox.mapboxsdk.style.expressions.Expression.eq;
import static com.mapbox.mapboxsdk.style.layers.Property.ANCHOR_MAP;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBase;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
View File

@@ -85,6 +85,26 @@ public class LineLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testLineCapAsConstant() {
validateTestSetup();

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
View File

@@ -85,6 +85,26 @@ public class SymbolLayerTest extends BaseActivityTest {
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
@Test
public void testSymbolPlacementAsConstant() {
validateTestSetup();

20
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
View File

@@ -96,6 +96,26 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
assertEquals(layer.getSourceLayer(), sourceLayer);
});
}
@Test
public void testFilter() {
validateTestSetup();
setupLayer();
Timber.i("Filter");
invoke(mapboxMap, (uiController, mapboxMap1) -> {
assertNotNull(layer);
// Get initial
assertEquals(layer.getFilter(), null);
// Set
Expression filter = eq(get("undefined"), literal(1.0));
layer.setFilter(filter);
assertEquals(layer.getFilter().toString(), filter.toString());
});
}
<% } -%>
<% for (const property of properties) { -%>
<% if (property.name != 'heatmap-color') { -%>

2
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
View File

@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static com.mapbox.mapboxsdk.style.layers.Filter.eq;
import static com.mapbox.mapboxsdk.style.expressions.Expression.eq;
import static com.mapbox.mapboxsdk.style.layers.Property.ANCHOR_MAP;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionBase;
import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.fillExtrusionColor;