Code Review Feedback

5 files changed, 9 insertions, 9 deletions

diff --git a/include/mbgl/style/conversion/coordinate.hpp b/include/mbgl/style/conversion/coordinate.hpp
index 988e2b02f6..736f5e94a2 100644
--- a/include/mbgl/style/conversion/coordinate.hpp
+++ b/include/mbgl/style/conversion/coordinate.hpp
@@ -8,10 +8,10 @@ namespace style {
 namespace conversion {
             
 template<>
-struct Converter<std::unique_ptr<LatLng>> {
+struct Converter<LatLng> {
 public:
     template <class V>
-    optional<std::unique_ptr<LatLng>> operator() (const V& value, Error& error) const {
+    optional<LatLng> operator() (const V& value, Error& error) const {
         if (!isArray(value) || arrayLength(value) < 2 ) {
             error = { "coordinate array must contain numeric longtitude and latitude values" };
             return {};
@@ -28,7 +28,7 @@ public:
             error = { "coordinate latitude must be between -90 and 90" };
             return {};
         }
-        return { std::make_unique<LatLng>(*latitude, *longitude) };
+        return LatLng(*latitude, *longitude);
     }
 };
 
diff --git a/include/mbgl/style/conversion/source.hpp b/include/mbgl/style/conversion/source.hpp
index 681d01c054..a67c3e6b17 100644
--- a/include/mbgl/style/conversion/source.hpp
+++ b/include/mbgl/style/conversion/source.hpp
@@ -173,11 +173,11 @@ private:
         std::vector<LatLng> coordinates;
         coordinates.reserve(4);
         for( std::size_t i=0; i < arrayLength(*coordinatesValue); i++) {
-            auto latLng = conversion::convert<std::unique_ptr<LatLng>>(arrayMember(*coordinatesValue,i), error);
+            auto latLng = conversion::convert<LatLng>(arrayMember(*coordinatesValue,i), error);
             if (!latLng) {
                 return {};
             }
-            coordinates.push_back(std::move(**latLng));
+            coordinates.push_back(*latLng);
         }
         auto result = std::make_unique<ImageSource>(id, *urlString, coordinates);
 
diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp
index e9e7c86d0b..6d725b102b 100644
--- a/include/mbgl/util/geo.hpp
+++ b/include/mbgl/util/geo.hpp
@@ -47,7 +47,7 @@ public:
             wrap();
         }
     }
-    
+
     double latitude() const { return lat; }
     double longitude() const { return lon; }
 
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp
index b0494882bb..99b4447711 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/mbgl/storage/offline_download.cpp
@@ -199,7 +199,7 @@ void OfflineDownload::activateDownload() {
             case SourceType::Video:
             case SourceType::Annotations:
             case SourceType::Image:
-                    break;
+                break;
             }
         }
 
diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index 0a472b602d..725feb3fc2 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -57,9 +57,9 @@ StyleParseResult Parser::parse(const std::string& json) {
     if (document.HasMember("center")) {
         const JSValue& value = document["center"];
         conversion::Error error;
-        auto convertedLatLng = conversion::convert<std::unique_ptr<LatLng>>(value, error);
+        auto convertedLatLng = conversion::convert<LatLng>(value, error);
         if (convertedLatLng) {
-            latLng = LatLng((*convertedLatLng)->latitude(), (*convertedLatLng)->longitude());
+            latLng = *convertedLatLng;
         } else {
             Log::Warning(Event::ParseStyle, "center coordinate must be a longitude, latitude pair");
         }