Cherry-picks changes for vanillashake v9.1.0 (#311)

* Fix Expression can't convert `within` json error (#305) (cherry picked from commit dceba08) * fix proguard telemetry events rule (#306) (cherry picked from commit 620bda3) Co-authored-by: Pablo Guardiola <pablo.guardiola@mapbox.com>
mapbox · Apr 7, 2020 · 8b2480f · 8b2480f
1 parent f12a30a
commit 8b2480f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/MapboxGLAndroidSDK/proguard-rules.pro b/MapboxGLAndroidSDK/proguard-rules.pro
@@ -28,7 +28,7 @@
 -dontwarn com.google.auto.value.**
 
 # config for telemetry events
--keep class com.mapbox.mapboxsdk.module.telemetry.**
+-keep class com.mapbox.mapboxsdk.module.telemetry.** { *; }
 
 # config for additional notes
 -dontnote org.robolectric.Robolectric

diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
@@ -4746,7 +4746,9 @@ public static Expression convert(@NonNull JsonArray jsonArray) {
 
       final String operator = jsonArray.get(0).getAsString();
       final List<Expression> arguments = new ArrayList<>();
-
+      if (operator.equals("within")) {
+        return within(Polygon.fromJson(jsonArray.get(1).toString()));
+      }
       for (int i = 1; i < jsonArray.size(); i++) {
         JsonElement jsonElement = jsonArray.get(i);
         if (operator.equals("literal") && jsonElement instanceof JsonArray) {