format codes

19 files changed, 140 insertions, 125 deletions

diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index b1eeb9fc2a..ddb2e2c3b9 100644
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -934,7 +934,9 @@ void NativeMapView::addLayer(JNIEnv& env, jlong nativeLayerPtr, const jni::Strin
 
     Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
     try {
-        layer->addToStyle(map->getStyle(), before ? mbgl::optional<std::string>(jni::Make<std::string>(env, before)) : mbgl::optional<std::string>());
+        layer->addToStyle(
+            map->getStyle(),
+            before ? mbgl::optional<std::string>(jni::Make<std::string>(env, before)) : mbgl::optional<std::string>());
     } catch (const std::runtime_error& error) {
         jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
     }
@@ -1017,7 +1019,7 @@ jni::jboolean NativeMapView::removeLayerAt(JNIEnv& env, jni::jint index) {
     std::unique_ptr<mbgl::style::Layer> coreLayer = map->getStyle().removeLayer(layers.at(index)->getID());
     if (coreLayer) {
         jni::Local<jni::Object<Layer>> layerObj =
-                LayerManagerAndroid::get()->createJavaLayerPeer(env, std::move(coreLayer));
+            LayerManagerAndroid::get()->createJavaLayerPeer(env, std::move(coreLayer));
         return jni::jni_true;
     }
     return jni::jni_false;
diff --git a/platform/android/src/snapshotter/map_snapshotter.cpp b/platform/android/src/snapshotter/map_snapshotter.cpp
index 62ee5ff67e..ec60ea1f60 100644
--- a/platform/android/src/snapshotter/map_snapshotter.cpp
+++ b/platform/android/src/snapshotter/map_snapshotter.cpp
@@ -146,7 +146,7 @@ void MapSnapshotter::onDidFailLoadingStyle(const std::string& error) {
     MBGL_VERIFY_THREAD(tid);
     android::UniqueEnv _env = android::AttachEnv();
     static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onDidFailLoadingStyle = javaClass.GetMethod<void (jni::String)>(*_env, "onDidFailLoadingStyle");
+    static auto onDidFailLoadingStyle = javaClass.GetMethod<void(jni::String)>(*_env, "onDidFailLoadingStyle");
     auto weakReference = javaPeer.get(*_env);
     if (weakReference) {
         weakReference.Call(*_env, onDidFailLoadingStyle, jni::Make<jni::String>(*_env, error));
@@ -158,7 +158,7 @@ void MapSnapshotter::onDidFinishLoadingStyle() {
     android::UniqueEnv _env = android::AttachEnv();
 
     static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onDidFinishLoadingStyle = javaClass.GetMethod<void ()>(*_env, "onDidFinishLoadingStyle");
+    static auto onDidFinishLoadingStyle = javaClass.GetMethod<void()>(*_env, "onDidFinishLoadingStyle");
     auto weakReference = javaPeer.get(*_env);
     if (weakReference) {
         weakReference.Call(*_env, onDidFinishLoadingStyle);
@@ -169,7 +169,7 @@ void MapSnapshotter::onStyleImageMissing(const std::string& imageName) {
     MBGL_VERIFY_THREAD(tid);
     android::UniqueEnv _env = android::AttachEnv();
     static auto& javaClass = jni::Class<MapSnapshotter>::Singleton(*_env);
-    static auto onStyleImageMissing = javaClass.GetMethod<void (jni::String)>(*_env, "onStyleImageMissing");
+    static auto onStyleImageMissing = javaClass.GetMethod<void(jni::String)>(*_env, "onStyleImageMissing");
     auto weakReference = javaPeer.get(*_env);
     if (weakReference) {
         weakReference.Call(*_env, onStyleImageMissing, jni::Make<jni::String>(*_env, imageName));
@@ -179,36 +179,41 @@ void MapSnapshotter::onStyleImageMissing(const std::string& imageName) {
 void MapSnapshotter::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint index) {
     assert(nativeLayerPtr != 0);
     auto layers = snapshotter->getStyle().getLayers();
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
+    Layer* layer = reinterpret_cast<Layer*>(nativeLayerPtr);
     // Check index
     int numLayers = layers.size() - 1;
     if (index > numLayers || index < 0) {
         Log::Error(Event::JNI, "Index out of range: %i", index);
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
+        jni::ThrowNew(env,
+                      jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
                       std::string("Invalid index").c_str());
     }
     // Insert it below the current at that index
     try {
-        layer->addToStyle(snapshotter->getStyle(),  layers.at(index)->getID());
+        layer->addToStyle(snapshotter->getStyle(), layers.at(index)->getID());
     } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
+        jni::ThrowNew(
+            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
     }
 }
 
-void MapSnapshotter::addLayerBelow(JNIEnv& env, jlong nativeLayerPtr, const jni::String& below){
+void MapSnapshotter::addLayerBelow(JNIEnv& env, jlong nativeLayerPtr, const jni::String& below) {
     assert(nativeLayerPtr != 0);
 
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
+    Layer* layer = reinterpret_cast<Layer*>(nativeLayerPtr);
     try {
-        layer->addToStyle(snapshotter->getStyle(), below ? mbgl::optional<std::string>(jni::Make<std::string>(env, below)) : mbgl::optional<std::string>());
+        layer->addToStyle(
+            snapshotter->getStyle(),
+            below ? mbgl::optional<std::string>(jni::Make<std::string>(env, below)) : mbgl::optional<std::string>());
     } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
+        jni::ThrowNew(
+            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
     }
 }
 
 void MapSnapshotter::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni::String& above) {
     assert(nativeLayerPtr != 0);
-    Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr);
+    Layer* layer = reinterpret_cast<Layer*>(nativeLayerPtr);
 
     // Find the sibling
     auto layers = snapshotter->getStyle().getLayers();
@@ -226,30 +231,33 @@ void MapSnapshotter::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni:
     mbgl::optional<std::string> before;
     if (index + 1 > layers.size()) {
         // Not found
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
+        jni::ThrowNew(env,
+                      jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
                       std::string("Could not find layer: ").append(siblingId).c_str());
         return;
     } else if (index + 1 < layers.size()) {
         // Place before the sibling
-        before = { layers.at(index + 1)->getID() };
+        before = {layers.at(index + 1)->getID()};
     }
 
     // Add the layer
     try {
         layer->addToStyle(snapshotter->getStyle(), before);
     } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
+        jni::ThrowNew(
+            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
     }
 }
 
 void MapSnapshotter::addSource(JNIEnv& env, const jni::Object<Source>& obj, jlong sourcePtr) {
     assert(sourcePtr != 0);
 
-    Source *source = reinterpret_cast<Source *>(sourcePtr);
+    Source* source = reinterpret_cast<Source*>(sourcePtr);
     try {
         source->addToStyle(env, obj, snapshotter->getStyle());
     } catch (const std::runtime_error& error) {
-        jni::ThrowNew(env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
+        jni::ThrowNew(
+            env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
     }
 }
 
diff --git a/platform/android/src/snapshotter/map_snapshotter.hpp b/platform/android/src/snapshotter/map_snapshotter.hpp
index 87bc470272..ac84339a62 100644
--- a/platform/android/src/snapshotter/map_snapshotter.hpp
+++ b/platform/android/src/snapshotter/map_snapshotter.hpp
@@ -51,7 +51,7 @@ public:
 
     void cancel(JNIEnv&);
 
-    void addLayerAt(JNIEnv&, jlong,  jni::jint);
+    void addLayerAt(JNIEnv&, jlong, jni::jint);
     void addLayerBelow(JNIEnv&, jlong, const jni::String&);
     void addLayerAbove(JNIEnv&, jlong, const jni::String&);
     void addSource(JNIEnv&, const jni::Object<Source>&, jlong nativePtr);
diff --git a/platform/android/src/style/layers/background_layer.cpp b/platform/android/src/style/layers/background_layer.cpp
index d0084dc2de..3eae30677f 100644
--- a/platform/android/src/style/layers/background_layer.cpp
+++ b/platform/android/src/style/layers/background_layer.cpp
@@ -26,16 +26,13 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
     BackgroundLayer::BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+        : Layer(std::move(coreLayer)) {}
 
     BackgroundLayer::~BackgroundLayer() = default;
 
@@ -108,14 +105,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                       mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new BackgroundLayer(toBackgroundLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>(static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>(
+                                  static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
     }
 
     void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/circle_layer.cpp b/platform/android/src/style/layers/circle_layer.cpp
index 54267e819a..a7fae5e233 100644
--- a/platform/android/src/style/layers/circle_layer.cpp
+++ b/platform/android/src/style/layers/circle_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    CircleLayer::CircleLayer(mbgl::style::CircleLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    CircleLayer::CircleLayer(mbgl::style::CircleLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    CircleLayer::CircleLayer(std::unique_ptr<mbgl::style::CircleLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    CircleLayer::CircleLayer(std::unique_ptr<mbgl::style::CircleLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     CircleLayer::~CircleLayer() = default;
 
@@ -213,14 +209,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                   mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new CircleLayer(toCircleLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>(static_cast<mbgl::style::CircleLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>(
+                                  static_cast<mbgl::style::CircleLayer*>(layer.release()))));
     }
 
     void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/custom_layer.cpp b/platform/android/src/style/layers/custom_layer.cpp
index 329e7285e2..5a8b239a8d 100644
--- a/platform/android/src/style/layers/custom_layer.cpp
+++ b/platform/android/src/style/layers/custom_layer.cpp
@@ -14,13 +14,9 @@ namespace android {
                 ) {
     }
 
-    CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer) : Layer(coreLayer) {}
 
-    CustomLayer::CustomLayer(std::unique_ptr<mbgl::style::CustomLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    CustomLayer::CustomLayer(std::unique_ptr<mbgl::style::CustomLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     CustomLayer::~CustomLayer() = default;
 
@@ -34,12 +30,16 @@ namespace android {
 
     CustomJavaLayerPeerFactory::~CustomJavaLayerPeerFactory() = default;
 
-    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                   mbgl::style::Layer& layer) {
         return createJavaPeer(env, new CustomLayer(static_cast<mbgl::style::CustomLayer&>(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
-        return createJavaPeer(env, new CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>(static_cast<mbgl::style::CustomLayer*>(layer.release()))));
+    jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+        return createJavaPeer(env,
+                              new CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>(
+                                  static_cast<mbgl::style::CustomLayer*>(layer.release()))));
     }
 
     void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -49,11 +49,12 @@ namespace android {
         #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
 
         // Register the peer
-        jni::RegisterNativePeer<CustomLayer>(
-            env, javaClass, "nativePtr",
-            jni::MakePeer<CustomLayer, const jni::String&, jni::jlong>,
-            "initialize",
-            "finalize");
+        jni::RegisterNativePeer<CustomLayer>(env,
+                                             javaClass,
+                                             "nativePtr",
+                                             jni::MakePeer<CustomLayer, const jni::String&, jni::jlong>,
+                                             "initialize",
+                                             "finalize");
     }
 
 } // namespace android
diff --git a/platform/android/src/style/layers/fill_extrusion_layer.cpp b/platform/android/src/style/layers/fill_extrusion_layer.cpp
index 9b7c66a0a5..55c3d20282 100644
--- a/platform/android/src/style/layers/fill_extrusion_layer.cpp
+++ b/platform/android/src/style/layers/fill_extrusion_layer.cpp
@@ -26,16 +26,13 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
     FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+        : Layer(std::move(coreLayer)) {}
 
     FillExtrusionLayer::~FillExtrusionLayer() = default;
 
@@ -172,14 +169,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                          mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new FillExtrusionLayer(toFillExtrusionLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>(static_cast<mbgl::style::FillExtrusionLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>(
+                                  static_cast<mbgl::style::FillExtrusionLayer*>(layer.release()))));
     }
 
     void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -202,8 +203,10 @@ namespace android {
             METHOD(&FillExtrusionLayer::getFillExtrusionColorTransition, "nativeGetFillExtrusionColorTransition"),
             METHOD(&FillExtrusionLayer::setFillExtrusionColorTransition, "nativeSetFillExtrusionColorTransition"),
             METHOD(&FillExtrusionLayer::getFillExtrusionColor, "nativeGetFillExtrusionColor"),
-            METHOD(&FillExtrusionLayer::getFillExtrusionTranslateTransition, "nativeGetFillExtrusionTranslateTransition"),
-            METHOD(&FillExtrusionLayer::setFillExtrusionTranslateTransition, "nativeSetFillExtrusionTranslateTransition"),
+            METHOD(&FillExtrusionLayer::getFillExtrusionTranslateTransition,
+                   "nativeGetFillExtrusionTranslateTransition"),
+            METHOD(&FillExtrusionLayer::setFillExtrusionTranslateTransition,
+                   "nativeSetFillExtrusionTranslateTransition"),
             METHOD(&FillExtrusionLayer::getFillExtrusionTranslate, "nativeGetFillExtrusionTranslate"),
             METHOD(&FillExtrusionLayer::getFillExtrusionTranslateAnchor, "nativeGetFillExtrusionTranslateAnchor"),
             METHOD(&FillExtrusionLayer::getFillExtrusionPatternTransition, "nativeGetFillExtrusionPatternTransition"),
diff --git a/platform/android/src/style/layers/fill_layer.cpp b/platform/android/src/style/layers/fill_layer.cpp
index ba6ed21791..6a646fdc7d 100644
--- a/platform/android/src/style/layers/fill_layer.cpp
+++ b/platform/android/src/style/layers/fill_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    FillLayer::FillLayer(mbgl::style::FillLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    FillLayer::FillLayer(mbgl::style::FillLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    FillLayer::FillLayer(std::unique_ptr<mbgl::style::FillLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    FillLayer::FillLayer(std::unique_ptr<mbgl::style::FillLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     FillLayer::~FillLayer() = default;
 
@@ -159,14 +155,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                 mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new FillLayer(toFillLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new FillLayer(std::unique_ptr<mbgl::style::FillLayer>(static_cast<mbgl::style::FillLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new FillLayer(std::unique_ptr<mbgl::style::FillLayer>(
+                                  static_cast<mbgl::style::FillLayer*>(layer.release()))));
     }
 
     void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/heatmap_layer.cpp b/platform/android/src/style/layers/heatmap_layer.cpp
index dfb8bbb4b3..dad3d25e6c 100644
--- a/platform/android/src/style/layers/heatmap_layer.cpp
+++ b/platform/android/src/style/layers/heatmap_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    HeatmapLayer::HeatmapLayer(mbgl::style::HeatmapLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    HeatmapLayer::HeatmapLayer(mbgl::style::HeatmapLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    HeatmapLayer::HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    HeatmapLayer::HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     HeatmapLayer::~HeatmapLayer() = default;
 
@@ -122,14 +118,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                    mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new HeatmapLayer(toHeatmapLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>(static_cast<mbgl::style::HeatmapLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>(
+                                  static_cast<mbgl::style::HeatmapLayer*>(layer.release()))));
     }
 
     void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/hillshade_layer.cpp b/platform/android/src/style/layers/hillshade_layer.cpp
index 3c72b503b7..1f5fe1912f 100644
--- a/platform/android/src/style/layers/hillshade_layer.cpp
+++ b/platform/android/src/style/layers/hillshade_layer.cpp
@@ -26,16 +26,13 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
     HillshadeLayer::HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+        : Layer(std::move(coreLayer)) {}
 
     HillshadeLayer::~HillshadeLayer() = default;
 
@@ -136,14 +133,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                      mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new HillshadeLayer(toHillshadeLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>(static_cast<mbgl::style::HillshadeLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>(
+                                  static_cast<mbgl::style::HillshadeLayer*>(layer.release()))));
     }
 
     void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp
index 839a7b91c4..bc87a9d9ba 100644
--- a/platform/android/src/style/layers/layer.cpp
+++ b/platform/android/src/style/layers/layer.cpp
@@ -45,9 +45,7 @@ namespace android {
     /**
      * Takes a non-owning reference. For lookup methods
      */
-    Layer::Layer(mbgl::style::Layer& coreLayer) : layer(coreLayer) {
-    }
-
+    Layer::Layer(mbgl::style::Layer& coreLayer) : layer(coreLayer) {}
 
     Layer::~Layer() {
     }
diff --git a/platform/android/src/style/layers/layer.hpp b/platform/android/src/style/layers/layer.hpp
index aff77ef113..557990844c 100644
--- a/platform/android/src/style/layers/layer.hpp
+++ b/platform/android/src/style/layers/layer.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <mbgl/layermanager/layer_factory.hpp>
-#include <mbgl/style/style.hpp>
 #include <mbgl/style/layer.hpp>
+#include <mbgl/style/style.hpp>
 #include "../../gson/json_array.hpp"
-#include "../value.hpp"
 #include "../../gson/json_element.hpp"
+#include "../value.hpp"
 
 #include <jni/jni.hpp>
 
@@ -75,7 +75,6 @@ protected:
      */
     Layer(std::unique_ptr<mbgl::style::Layer>);
 
-
     // Owned layer is set when creating a new layer, before adding it to the map
     std::unique_ptr<mbgl::style::Layer> ownedLayer;
 
@@ -97,7 +96,8 @@ public:
     /**
      * @brief Create an owning peer.
      */
-    virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) = 0;
+    virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env,
+                                                               std::unique_ptr<mbgl::style::Layer>) = 0;
 
     /**
      * @brief Register peer methods.
diff --git a/platform/android/src/style/layers/layer_manager.cpp b/platform/android/src/style/layers/layer_manager.cpp
index e3fc1b874e..2d4172a235 100644
--- a/platform/android/src/style/layers/layer_manager.cpp
+++ b/platform/android/src/style/layers/layer_manager.cpp
@@ -84,7 +84,8 @@ jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNI
     return jni::Local<jni::Object<Layer>>();
 }
 
-jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                        std::unique_ptr<mbgl::style::Layer> layer) {
     if (JavaLayerPeerFactory* factory = getPeerFactory(layer->getTypeInfo())) {
         return factory->createJavaLayerPeer(env, std::move(layer));
     }
diff --git a/platform/android/src/style/layers/layer_manager.hpp b/platform/android/src/style/layers/layer_manager.hpp
index 43bdd1d1e1..f7379f6de6 100644
--- a/platform/android/src/style/layers/layer_manager.hpp
+++ b/platform/android/src/style/layers/layer_manager.hpp
@@ -21,7 +21,7 @@ class LayerManagerAndroid final : public mbgl::LayerManager {
 public:
     ~LayerManagerAndroid() final;
     static LayerManagerAndroid* get() noexcept;
-    
+
     jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&);
     jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>);
 
diff --git a/platform/android/src/style/layers/line_layer.cpp b/platform/android/src/style/layers/line_layer.cpp
index bf3a403b66..89c6cb5323 100644
--- a/platform/android/src/style/layers/line_layer.cpp
+++ b/platform/android/src/style/layers/line_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    LineLayer::LineLayer(mbgl::style::LineLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    LineLayer::LineLayer(mbgl::style::LineLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    LineLayer::LineLayer(std::unique_ptr<mbgl::style::LineLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    LineLayer::LineLayer(std::unique_ptr<mbgl::style::LineLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     LineLayer::~LineLayer() = default;
 
@@ -251,14 +247,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                 mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new LineLayer(toLineLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new LineLayer(std::unique_ptr<mbgl::style::LineLayer>(static_cast<mbgl::style::LineLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new LineLayer(std::unique_ptr<mbgl::style::LineLayer>(
+                                  static_cast<mbgl::style::LineLayer*>(layer.release()))));
     }
 
     void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/raster_layer.cpp b/platform/android/src/style/layers/raster_layer.cpp
index 53442c0a94..d9cce949c2 100644
--- a/platform/android/src/style/layers/raster_layer.cpp
+++ b/platform/android/src/style/layers/raster_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    RasterLayer::RasterLayer(std::unique_ptr<mbgl::style::RasterLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    RasterLayer::RasterLayer(std::unique_ptr<mbgl::style::RasterLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     RasterLayer::~RasterLayer() = default;
 
@@ -172,14 +168,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                   mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new RasterLayer(toRasterLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>(static_cast<mbgl::style::RasterLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>(
+                                  static_cast<mbgl::style::RasterLayer*>(layer.release()))));
     }
 
     void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/layers/symbol_layer.cpp b/platform/android/src/style/layers/symbol_layer.cpp
index 198dbe635f..f24fb35425 100644
--- a/platform/android/src/style/layers/symbol_layer.cpp
+++ b/platform/android/src/style/layers/symbol_layer.cpp
@@ -26,16 +26,12 @@ namespace android {
     /**
      * Creates a non-owning peer object (for layers currently attached to the map)
      */
-    SymbolLayer::SymbolLayer(mbgl::style::SymbolLayer& coreLayer)
-        : Layer(coreLayer) {
-    }
+    SymbolLayer::SymbolLayer(mbgl::style::SymbolLayer& coreLayer) : Layer(coreLayer) {}
 
     /**
      * Creates an owning peer object (for layers not attached to the map)
      */
-    SymbolLayer::SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer> coreLayer)
-        : Layer(std::move(coreLayer)) {
-    }
+    SymbolLayer::SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer> coreLayer) : Layer(std::move(coreLayer)) {}
 
     SymbolLayer::~SymbolLayer() = default;
 
@@ -485,14 +481,18 @@ namespace android {
         }
     }  // namespace
 
-    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
+    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
+                                                                                   mbgl::style::Layer& layer) {
         assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
         return createJavaPeer(env, new SymbolLayer(toSymbolLayer(layer)));
     }
 
-    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
+    jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(
+        jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
         assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
-        return createJavaPeer(env, new SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>(static_cast<mbgl::style::SymbolLayer*>(layer.release()))));
+        return createJavaPeer(env,
+                              new SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>(
+                                  static_cast<mbgl::style::SymbolLayer*>(layer.release()))));
     }
 
     void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
diff --git a/platform/android/src/style/sources/source.cpp b/platform/android/src/style/sources/source.cpp
index d16dd592fb..f4040a5718 100644
--- a/platform/android/src/style/sources/source.cpp
+++ b/platform/android/src/style/sources/source.cpp
@@ -109,7 +109,7 @@ namespace android {
         return jni::Local<jni::Integer>(env, nullptr);
     }
 
-    void Source::addToStyle(JNIEnv &env, const jni::Object<Source> &obj, mbgl::style::Style& style) {
+    void Source::addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style) {
         if (!ownedSource) {
             throw std::runtime_error("Cannot add source twice");
         }
diff --git a/platform/android/src/style/sources/source.hpp b/platform/android/src/style/sources/source.hpp
index 723d4740b0..a87972ce79 100644
--- a/platform/android/src/style/sources/source.hpp
+++ b/platform/android/src/style/sources/source.hpp
@@ -47,7 +47,7 @@ public:
 
     jni::Local<jni::Integer> getPrefetchZoomDelta(jni::JNIEnv&);
 
-    void addToStyle(JNIEnv &env, const jni::Object<Source> &obj, mbgl::style::Style& style);
+    void addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style);
 
 protected:
     // Set on newly created sources until added to the map.