From 4407033b3bcd22becffce4bfa7a4b92abe7f7782 Mon Sep 17 00:00:00 2001
From: "Justin R. Miller" <incanus@codesorcery.net>
Date: Mon, 2 Mar 2015 17:08:50 -0800
Subject: [PATCH] clean up members, arguments, and formatting

---
 src/mbgl/map/tile_parser.cpp | 19 ++++++++++---------
 src/mbgl/map/tile_parser.hpp | 25 +++++++++++++------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp
index c2833e5c9..db8022926 100644
--- a/src/mbgl/map/tile_parser.cpp
+++ b/src/mbgl/map/tile_parser.cpp
@@ -29,13 +29,14 @@ namespace mbgl {
 // its header file.
 TileParser::~TileParser() = default;
 
-TileParser::TileParser(const std::string &data, VectorTileData &tile_,
-                       const util::ptr<const Style> &style_,
-                       GlyphAtlas & glyphAtlas_,
-                       GlyphStore & glyphStore_,
-                       SpriteAtlas & spriteAtlas_,
-                       const util::ptr<Sprite> &sprite_)
-    : vector_data(pbf((const uint8_t *)data.data(), data.size())),
+TileParser::TileParser(const std::string& raw_data_,
+                       VectorTileData& tile_,
+                       const util::ptr<const Style>& style_,
+                       GlyphAtlas& glyphAtlas_,
+                       GlyphStore& glyphStore_,
+                       SpriteAtlas& spriteAtlas_,
+                       const util::ptr<Sprite>& sprite_)
+    : vector_tile(pbf((const uint8_t *)raw_data_.data(), raw_data_.size())),
       tile(tile_),
       style(style_),
       glyphAtlas(glyphAtlas_),
@@ -186,8 +187,8 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucket_desc)
     if (tile.id.z >= std::ceil(bucket_desc.max_zoom)) return nullptr;
     if (bucket_desc.visibility == mbgl::VisibilityType::None) return nullptr;
 
-    auto layer_it = vector_data.layers.find(bucket_desc.source_layer);
-    if (layer_it != vector_data.layers.end()) {
+    auto layer_it = vector_tile.layers.find(bucket_desc.source_layer);
+    if (layer_it != vector_tile.layers.end()) {
         const VectorTileLayer &layer = layer_it->second;
         if (bucket_desc.type == StyleLayerType::Fill) {
             return createFillBucket(layer, bucket_desc);
diff --git a/src/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp
index 0cf5b20d8..28150cbd4 100644
--- a/src/mbgl/map/tile_parser.hpp
+++ b/src/mbgl/map/tile_parser.hpp
@@ -35,12 +35,13 @@ class TexturePool;
 class TileParser : private util::noncopyable
 {
 public:
-    TileParser(const std::string &data, VectorTileData &tile,
-               const util::ptr<const Style> &style,
-               GlyphAtlas & glyphAtlas,
-               GlyphStore & glyphStore,
-               SpriteAtlas & spriteAtlas,
-               const util::ptr<Sprite> &sprite);
+    TileParser(const std::string& raw_data,
+               VectorTileData& tile,
+               const util::ptr<const Style>& style,
+               GlyphAtlas& glyphAtlas,
+               GlyphStore& glyphStore,
+               SpriteAtlas& spriteAtlas,
+               const util::ptr<Sprite>& sprite);
     ~TileParser();
 
 public:
@@ -50,15 +51,15 @@ private:
     bool obsolete() const;
     void parseStyleLayers(util::ptr<const StyleLayerGroup> group);
 
-    std::unique_ptr<Bucket> createBucket(const StyleBucket &bucket_desc);
-    std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer &layer, const StyleBucket &bucket_desc);
-    std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket &bucket_desc);
-    std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket &bucket_desc);
+    std::unique_ptr<Bucket> createBucket(const StyleBucket& bucket_desc);
+    std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
+    std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
+    std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const StyleBucket& bucket_desc);
 
-    template <class Bucket> void addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression &filter);
+    template <class Bucket> void addBucketGeometries(Bucket& bucket, const VectorTileLayer& layer, const FilterExpression& filter);
 
 private:
-    const VectorTile vector_data;
+    const VectorTile vector_tile;
     VectorTileData& tile;
 
     // Cross-thread shared data.