Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Cherry-picks changes for vanillashake v9.1.0 #311

Merged
merged 2 commits into from
Apr 7, 2020
Merged

Cherry-picks changes for vanillashake v9.1.0 #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
307517b
Fix Expression can't convert `within` json error (#305)
Apr 1, 2020
656bc46
fix proguard telemetry events rule (#306)
Guardiola31337 Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MapboxGLAndroidSDK/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down