[core] Distance expression: Remove code and comments related to unit argumentupstream/zmiao-distance-expression-clean-up

3 files changed, 9 insertions, 11 deletions

diff --git a/src/mbgl/style/expression/distance.cpp b/src/mbgl/style/expression/distance.cpp
index 9992ef5394..5ab1206340 100644
--- a/src/mbgl/style/expression/distance.cpp
+++ b/src/mbgl/style/expression/distance.cpp
@@ -394,28 +394,26 @@ double calculateDistance(const GeometryTileFeature& feature,
 
 optional<GeoJSON> parseValue(const style::conversion::Convertible& value, style::expression::ParsingContext& ctx) {
     if (isArray(value)) {
-        // object value, quoted with ["Distance", GeoJSONObj, "unit(optional)"]
+        // object value, quoted with ["Distance", GeoJSONObj]
         auto length = arrayLength(value);
-        if (length != 2 && length != 3) {
-            ctx.error("'distance' expression requires either one argument or two arguments, but found " +
+        if (length != 2) {
+            ctx.error("'distance' expression requires one argument, but found " +
                       util::toString(arrayLength(value) - 1) + " instead.");
             return nullopt;
         }
 
         // Parse geometry info
-        const auto& argument1 = arrayMember(value, 1);
-        if (isObject(argument1)) {
+        const auto& argument = arrayMember(value, 1);
+        if (isObject(argument)) {
             style::conversion::Error error;
-            auto geojson = toGeoJSON(argument1, error);
+            auto geojson = toGeoJSON(argument, error);
             if (geojson && error.message.empty()) {
                 return *geojson;
             }
             ctx.error(error.message);
         }
     }
-    ctx.error(
-        "'distance' expression needs to be an array with format [\"Distance\", GeoJSONObj, \"units\"(\"units\" is an "
-        "optional argument, 'meters' will be used by default)].");
+    ctx.error("'distance' expression needs to be an array with format [\"Distance\", GeoJSONObj].");
     return nullopt;
 }
 
diff --git a/test/fixtures/expression_equality/distance.a.json b/test/fixtures/expression_equality/distance.a.json
index 25079db719..5deaf2c8f2 100644
--- a/test/fixtures/expression_equality/distance.a.json
+++ b/test/fixtures/expression_equality/distance.a.json
@@ -1,5 +1,5 @@
 ["distance", {
     "type": "LineString",
     "coordinates": [[0, 0], [0, 5], [5, 5], [5, 0]]
-  }, "meters"
+  }
 ]
\ No newline at end of file
diff --git a/test/fixtures/expression_equality/distance.b.json b/test/fixtures/expression_equality/distance.b.json
index cac710cb92..4a4714354e 100644
--- a/test/fixtures/expression_equality/distance.b.json
+++ b/test/fixtures/expression_equality/distance.b.json
@@ -1,5 +1,5 @@
 ["distance", {
     "type": "LineString",
     "coordinates": [[0, 0], [0, 6], [5, 5], [5, 0]]
-  }, "meters"
+  }
 ]
\ No newline at end of file