Getting a constant layer filter fix

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java

@@ -4485,7 +4485,7 @@ public static Expression convert(@NonNull JsonArray jsonArray) {
      * @param jsonElement the json element to convert
      * @return the expression
      */
-    private static Expression convert(@NonNull JsonElement jsonElement) {
+    public static Expression convert(@NonNull JsonElement jsonElement) {
       if (jsonElement instanceof JsonArray) {
         return convert((JsonArray) jsonElement);
       } else if (jsonElement instanceof JsonPrimitive) {

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
@@ -120,12 +121,12 @@ public CircleLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
@@ -120,12 +121,12 @@ public FillExtrusionLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
@@ -120,12 +121,12 @@ public FillLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
@@ -120,12 +121,12 @@ public HeatmapLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java

@@ -104,7 +104,7 @@ public void setMaxZoom(float zoom) {
   @Keep
   protected native void nativeSetFilter(Object[] filter);
 
-  @NonNull
+  @Nullable
   @Keep
   protected native JsonElement nativeGetFilter();
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 
@@ -120,12 +121,12 @@ public LineLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java

@@ -11,6 +11,7 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 import com.mapbox.mapboxsdk.style.types.Formatted;
@@ -122,12 +123,12 @@ public SymbolLayer withFilter(@NonNull Expression filter) {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs

@@ -16,6 +16,7 @@ import android.support.annotation.UiThread;
 import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
 <% if (type === 'symbol') { -%>
@@ -148,12 +149,12 @@ public class <%- camelize(type) %>Layer extends Layer {
   @Nullable
   public Expression getFilter() {
     checkThread();
-    Expression expression = null;
-    JsonArray array = (JsonArray) nativeGetFilter();
-    if (array != null) {
-      expression = Expression.Converter.convert(array);
+    JsonElement jsonElement = nativeGetFilter();
+    if (jsonElement != null) {
+      return Expression.Converter.convert(jsonElement);
+    } else {
+      return null;
     }
-    return expression;
   }
 
 <% } -%>

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

@@ -112,6 +112,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -112,6 +112,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -112,6 +112,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -112,6 +112,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -112,6 +112,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -114,6 +114,11 @@ public void testFilter() {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }
 

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

@@ -130,6 +130,11 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
       Expression filter = eq(get("undefined"), literal(1.0));
       layer.setFilter(filter);
       assertEquals(layer.getFilter().toString(), filter.toString());
+
+      // Set constant
+      filter = literal(true);
+      layer.setFilter(filter);
+      assertEquals(layer.getFilter().toString(), filter.toString());
     });
   }