From 859f64f97ee7165bcacce82f31c2da9be1e3a0ba Mon Sep 17 00:00:00 2001
From: Kevin Li <kevin.li@mapbox.com>
Date: Wed, 29 Apr 2020 15:57:25 +0800
Subject: [PATCH] Remove unit param for expression distance. (#352)

---
 .../style/expressions/Expression.java          | 18 ------------------
 .../style/expressions/ExpressionTest.java      |  4 ----
 .../style/DistanceExpressionActivity.kt        |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

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
index ba1048879..860261b65 100644
--- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
+++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
@@ -1575,24 +1575,6 @@ public class Expression {
     return new Expression("in", literal(needle), haystack);
   }
 
-  /**
-   * Retrieves the shortest distance between two geometries.
-   * The returned value can be consumed as an input into another expression for changing a paint or layout property
-   * or filtering features by distance.
-   *
-   * @param geoJson the target feature geoJso.
-   *                Currently supports `Point`, `MultiPoint`, `LineString`, `MultiLineString` geometry types
-   * @param unit    the unit for the returned value.
-   *                Currently supports `metres`, `kilometers`, `miles`, `nauticalmiles`, "yards"，"feet"，"inches"。
-   * @return the distance in the unit that is provided.
-   * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-distance">Style specification</a>
-   */
-  public static Expression distance(@NonNull GeoJson geoJson, String unit) {
-    Map<String, Expression> map = new HashMap<>();
-    map.put("json", literal(geoJson.toJson()));
-    return new Expression("distance", new ExpressionMap(map), literal(unit));
-  }
-
   /**
    * Retrieves the shortest distance between two geometries.
    * The returned value can be consumed as an input into another expression for changing a paint or layout property
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
index 6ca50a510..729b58def 100644
--- a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
+++ b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java
@@ -497,10 +497,6 @@ public class ExpressionTest {
     Object[] expected = new Object[] {"distance", map};
     Object[] actual = distance(point).toArray();
     assertTrue("expression should match", Arrays.deepEquals(expected, actual));
-
-    Object[] expectedWithUnit = new Object[] {"distance", map, "meters"};
-    Object[] actualWithUnit = distance(point, "meters").toArray();
-    assertTrue("expression should match", Arrays.deepEquals(expectedWithUnit, actualWithUnit));
   }
 
 
diff --git a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt b/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
index 6d23b5324..e212f765c 100644
--- a/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
+++ b/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/DistanceExpressionActivity.kt
@@ -74,7 +74,7 @@ class DistanceExpressionActivity : AppCompatActivity() {
       val symbolLayer = style.getLayer("poi-label") as SymbolLayer
       symbolLayer.setFilter(lt(
         distance(
-          Point.fromLngLat(lon, lat), "meters"
+          Point.fromLngLat(lon, lat)
         ), 150)
       )