tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Distance expression: Remove code and comments related to unit argument

Browse Source
This commit is contained in:
zmiao
2020-04-28 20:33:37 +03:00
parent af14e1d510
commit 4a54da881f
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mbgl/style/expression/distance.cpp
View File

@@ -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;
}

2
test/fixtures/expression_equality/distance.a.json vendored
View File

@@ -1,5 +1,5 @@
["distance", {
"type": "LineString",
"coordinates": [[0, 0], [0, 5], [5, 5], [5, 0]]
}, "meters"
}
]

2
test/fixtures/expression_equality/distance.b.json vendored
View File

@@ -1,5 +1,5 @@
["distance", {
"type": "LineString",
"coordinates": [[0, 0], [0, 6], [5, 5], [5, 0]]
}, "meters"
}
]