remove unnecessary codes

5 files changed, 11 insertions, 7 deletions

diff --git a/include/mbgl/style/expression/dsl.hpp b/include/mbgl/style/expression/dsl.hpp
index 7aae02a05a..4abeac7989 100644
--- a/include/mbgl/style/expression/dsl.hpp
+++ b/include/mbgl/style/expression/dsl.hpp
@@ -14,8 +14,8 @@ namespace style {
 namespace expression {
 namespace dsl {
 
-// This convenience API does little to no expression validation or type-checking, and is intended
-// for use only by test and other non-production code.
+// This convenience API does little to no expression validation or type-checking, and is intended for
+// use only by test and other non-production code.
 
 template <class... Args>
 std::vector<std::unique_ptr<Expression>> vec(Args... args) {
@@ -23,6 +23,7 @@ std::vector<std::unique_ptr<Expression>> vec(Args... args) {
     util::ignore({ (result.push_back(std::move(args)), 0)... });
     return result;
 }
+
 std::unique_ptr<Expression> createExpression(const char* expr);
 std::unique_ptr<Expression> createExpression(const mbgl::style::conversion::Convertible& expr);
 std::unique_ptr<Expression> error(std::string);
@@ -84,6 +85,7 @@ std::unique_ptr<Expression> interpolate(Interpolator interpolator,
                                         double input3, std::unique_ptr<Expression> output3);
 
 std::unique_ptr<Expression> concat(std::vector<std::unique_ptr<Expression>> inputs);
+
 std::unique_ptr<Expression> format(const char* value);
 std::unique_ptr<Expression> format(std::unique_ptr<Expression>);
 
diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp
index 4baeb4facc..ad57748677 100644
--- a/include/mbgl/style/expression/expression.hpp
+++ b/include/mbgl/style/expression/expression.hpp
@@ -6,7 +6,6 @@
 #include <mbgl/style/expression/type.hpp>
 #include <mbgl/style/expression/value.hpp>
 #include <mbgl/style/expression/parsing_context.hpp>
-#include <mbgl/util/feature.hpp>
 
 #include <array>
 #include <vector>
diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp
index 447fd1f3b4..4aec1584a6 100644
--- a/include/mbgl/style/sources/geojson_source.hpp
+++ b/include/mbgl/style/sources/geojson_source.hpp
@@ -7,7 +7,6 @@
 #include <mbgl/util/optional.hpp>
 
 #include <memory>
-#include <string>
 #include <unordered_map>
 #include <utility>
 
diff --git a/src/mbgl/style/conversion/geojson_options.cpp b/src/mbgl/style/conversion/geojson_options.cpp
index 4591e2758b..a7cb2239e7 100644
--- a/src/mbgl/style/conversion/geojson_options.cpp
+++ b/src/mbgl/style/conversion/geojson_options.cpp
@@ -1,13 +1,15 @@
 #include <mbgl/style/conversion/geojson_options.hpp>
 #include <mbgl/style/conversion_impl.hpp>
 #include <mbgl/style/expression/dsl.hpp>
+
 #include <sstream>
 
 namespace mbgl {
 namespace style {
 namespace conversion {
 
-optional<GeoJSONOptions> Converter<GeoJSONOptions>::operator()(const Convertible& value, Error& error) const {
+optional<GeoJSONOptions> Converter<GeoJSONOptions>::operator()(const Convertible& value,
+                                                               Error& error) const {
     GeoJSONOptions options;
 
     const auto minzoomValue = objectMember(value, "minzoom");
@@ -121,6 +123,9 @@ optional<GeoJSONOptions> Converter<GeoJSONOptions>::operator()(const Convertible
                 auto reduce = expression::dsl::createExpression(ss.str().c_str());
                 if (map && reduce) {
                     result.emplace(k, std::make_pair(std::move(map), std::move(reduce)));
+                } else {
+                    error.message = "Failed to convert GeoJSON source clusterProperties";
+                    return {};
                 }
                 return {};
             });
diff --git a/src/mbgl/style/expression/dsl.cpp b/src/mbgl/style/expression/dsl.cpp
index b26bce3f6c..fac7dfbbd9 100644
--- a/src/mbgl/style/expression/dsl.cpp
+++ b/src/mbgl/style/expression/dsl.cpp
@@ -31,8 +31,7 @@ std::unique_ptr<Expression> createExpression(const char* expr) {
     rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> document;
     document.Parse<0>(expr);
     if (document.HasParseError()) return nullptr;
-    
-    //optional<expression::TypeAnnotationOption> typeAnnotationOption;
+
     const JSValue* expression = &document;
     expression::ParsingContext ctx;
     expression::ParseResult parsed =