fix indentation

3 files changed, 59 insertions, 40 deletions

diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
index df917cbea3..3de7735ad1 100644
--- a/src/mbgl/layout/symbol_layout.cpp
+++ b/src/mbgl/layout/symbol_layout.cpp
@@ -807,7 +807,6 @@ size_t SymbolLayout::addSymbol(SymbolBucket::Buffer& buffer,
 }
 
 void SymbolLayout::addToDebugBuffers(SymbolBucket& bucket) {
-    
     if (!hasSymbolInstances()) {
         return;
     }
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index b12f257ce1..c4f009a5f2 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -168,7 +168,8 @@ void SymbolBucket::upload(gfx::UploadPass& uploadPass) {
 }
 
 bool SymbolBucket::hasData() const {
-    return hasTextData() || hasIconData() || hasSdfIconData() || hasIconCollisionBoxData() || hasTextCollisionBoxData();
+    return hasTextData() || hasIconData() || hasSdfIconData() || hasIconCollisionBoxData() ||
+           hasTextCollisionBoxData() || hasIconCollisionCircleData() || hasTextCollisionCircleData();
 }
 
 bool SymbolBucket::hasTextData() const {
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 16283565d9..4c4d7fb5de 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -394,60 +394,79 @@ void RenderSymbolLayer::render(PaintParameters& parameters) {
 
         const auto drawCollisonData = [&](const bool isText, const bool hasCollisionBox, const bool hasCollisionCircle) {
             if (!hasCollisionBox && !hasCollisionCircle) return;
-            
-            static const style::Properties<>::PossiblyEvaluated properties {};
+
+            static const style::Properties<>::PossiblyEvaluated properties{};
             static const CollisionBoxProgram::Binders paintAttributeData(properties, 0);
             auto pixelRatio = tile.id.pixelsToTileUnits(1, parameters.state.getZoom());
             const float scale = std::pow(2, parameters.state.getZoom() - tile.getOverscaledTileID().overscaledZ);
-            std::array<float,2> extrudeScale =
-            {{
-                parameters.pixelsToGLUnits[0] / (pixelRatio * scale),
-                parameters.pixelsToGLUnits[1] / (pixelRatio * scale)
-            }};
+            std::array<float, 2> extrudeScale = {
+                { parameters.pixelsToGLUnits[0] / (pixelRatio * scale),
+                  parameters.pixelsToGLUnits[1] / (pixelRatio * scale) }
+            };
             const auto& evaluated = getEvaluated<SymbolLayerProperties>(renderData->layerProperties);
             const auto& layout = *bucket.layout;
-            const auto values = isText ? textPropertyValues(evaluated, layout) : iconPropertyValues(evaluated, layout);
+            const auto values = isText ? textPropertyValues(evaluated, layout): iconPropertyValues(evaluated, layout);
             const bool needTranslate = values.translate[0] != 0 || values.translate[1] != 0;
-            
+
             if (hasCollisionBox) {
                 const auto& collisionBox = isText ? bucket.textCollisionBox : bucket.iconCollisionBox;
                 parameters.programs.getSymbolLayerPrograms().collisionBox.draw(
-                   parameters.context, *parameters.renderPass, gfx::Lines{ 1.0f },
-                   gfx::DepthMode::disabled(), gfx::StencilMode::disabled(),
-                   parameters.colorModeForRenderPass(), gfx::CullFaceMode::disabled(),
-                   CollisionBoxProgram::LayoutUniformValues{
-                       uniforms::matrix::Value((needTranslate
-                                                ? tile.translatedMatrix(values.translate, values.translateAnchor, parameters.state)
-                                                : tile.matrix)),
-                       uniforms::extrude_scale::Value(extrudeScale),
-                       uniforms::camera_to_center_distance::Value(parameters.state.getCameraToCenterDistance()) },
-                   *collisionBox->vertexBuffer, *collisionBox->dynamicVertexBuffer,
-                   *collisionBox->indexBuffer, collisionBox->segments, paintAttributeData, properties,
-                   CollisionBoxProgram::TextureBindings{}, parameters.state.getZoom(), getID());
+                    parameters.context,
+                    *parameters.renderPass,
+                    gfx::Lines{ 1.0f },
+                    gfx::DepthMode::disabled(),
+                    gfx::StencilMode::disabled(),
+                    parameters.colorModeForRenderPass(),
+                    gfx::CullFaceMode::disabled(),
+                    CollisionBoxProgram::LayoutUniformValues {
+                        uniforms::matrix::Value((needTranslate
+                                 ? tile.translatedMatrix(values.translate, values.translateAnchor, parameters.state)
+                                 : tile.matrix)),
+                        uniforms::extrude_scale::Value(extrudeScale),
+                        uniforms::camera_to_center_distance::Value(parameters.state.getCameraToCenterDistance())
+                    },
+                    *collisionBox->vertexBuffer,
+                    *collisionBox->dynamicVertexBuffer,
+                    *collisionBox->indexBuffer,
+                    collisionBox->segments,
+                    paintAttributeData,
+                    properties,
+                    CollisionBoxProgram::TextureBindings{},
+                    parameters.state.getZoom(),
+                    getID());
             }
             if (hasCollisionCircle) {
                 const auto& collisionCircle = isText ? bucket.textCollisionCircle : bucket.iconCollisionCircle;
                 parameters.programs.getSymbolLayerPrograms().collisionCircle.draw(
-                    parameters.context, *parameters.renderPass, gfx::Triangles(),
-                    gfx::DepthMode::disabled(), gfx::StencilMode::disabled(),
-                    parameters.colorModeForRenderPass(), gfx::CullFaceMode::disabled(),
-                    CollisionCircleProgram::LayoutUniformValues{
-                      uniforms::matrix::Value((needTranslate
-                                               ? tile.translatedMatrix(values.translate, values.translateAnchor, parameters.state)
-                                               : tile.matrix)),
-                      uniforms::extrude_scale::Value(extrudeScale),
-                      uniforms::overscale_factor::Value(float(tile.getOverscaledTileID().overscaleFactor())),
-                      uniforms::camera_to_center_distance::Value(parameters.state.getCameraToCenterDistance()) },
-                    *collisionCircle->vertexBuffer, *collisionCircle->dynamicVertexBuffer,
-                    *collisionCircle->indexBuffer, collisionCircle->segments, paintAttributeData,
-                    properties, CollisionCircleProgram::TextureBindings{}, parameters.state.getZoom(),
+                    parameters.context,
+                    *parameters.renderPass,
+                    gfx::Triangles(),
+                    gfx::DepthMode::disabled(),
+                    gfx::StencilMode::disabled(),
+                    parameters.colorModeForRenderPass(),
+                    gfx::CullFaceMode::disabled(),
+                    CollisionCircleProgram::LayoutUniformValues {
+                        uniforms::matrix::Value(
+                            (needTranslate
+                                 ? tile.translatedMatrix(values.translate, values.translateAnchor, parameters.state)
+                                 : tile.matrix)),
+                        uniforms::extrude_scale::Value(extrudeScale),
+                        uniforms::overscale_factor::Value(float(tile.getOverscaledTileID().overscaleFactor())),
+                        uniforms::camera_to_center_distance::Value(parameters.state.getCameraToCenterDistance())
+                    },
+                    *collisionCircle->vertexBuffer,
+                    *collisionCircle->dynamicVertexBuffer,
+                    *collisionCircle->indexBuffer, 
+                    collisionCircle->segments,
+                    paintAttributeData,
+                    properties,
+                    CollisionCircleProgram::TextureBindings{},
+                    parameters.state.getZoom(),
                     getID());
             }
         };
-        drawCollisonData( false /*isText*/, bucket.hasIconCollisionBoxData(), bucket.hasIconCollisionCircleData());
-   
-        drawCollisonData( true /*isText*/, bucket.hasTextCollisionBoxData(), bucket.hasTextCollisionCircleData());
-
+        drawCollisonData(false /*isText*/, bucket.hasIconCollisionBoxData(), bucket.hasIconCollisionCircleData());
+        drawCollisonData(true /*isText*/, bucket.hasTextCollisionBoxData(), bucket.hasTextCollisionCircleData());
     }
 
     if (sortFeaturesByKey) {