From 67fa80f5e98505e781b8afc0d965edb699a1910c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 24 Mar 2015 10:49:21 +0100
Subject: [PATCH] move MapContext to its own file

---
 src/mbgl/map/map.cpp         | 25 +------------------------
 src/mbgl/map/map_context.cpp | 27 +++++++++++++++++++++++++++
 src/mbgl/map/map_context.hpp | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 src/mbgl/map/map_context.cpp
 create mode 100644 src/mbgl/map/map_context.hpp

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index ba9527785..62ed60f3b 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/environment.hpp>
+#include <mbgl/map/map_context.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/still_image.hpp>
@@ -60,30 +61,6 @@ const static bool uvVersionCheck = []() {
 
 namespace mbgl {
 
-class MapContext {
-public:
-    MapContext(Environment& env) :
-      glyphStore(util::make_unique<GlyphStore>(env)),
-      glyphAtlas(util::make_unique<GlyphAtlas>(1024, 1024)),
-      spriteAtlas(util::make_unique<SpriteAtlas>(512, 512)),
-      lineAtlas(util::make_unique<LineAtlas>(512, 512)),
-      texturePool(util::make_unique<TexturePool>()),
-      painter(util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas))
-    {
-
-    }
-
-public:
-    const std::unique_ptr<GlyphStore> glyphStore;
-    const std::unique_ptr<GlyphAtlas> glyphAtlas;
-    const std::unique_ptr<SpriteAtlas> spriteAtlas;
-    const std::unique_ptr<LineAtlas> lineAtlas;
-    const std::unique_ptr<TexturePool> texturePool;
-    const std::unique_ptr<Painter> painter;
-    util::ptr<Sprite> sprite;
-};
-
-
 Map::Map(View& view_, FileSource& fileSource_)
     : env(util::make_unique<Environment>(fileSource_)),
       scope(util::make_unique<EnvironmentScope>(*env, ThreadType::Main, "Main")),
diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
new file mode 100644
index 000000000..258c4ab4c
--- /dev/null
+++ b/src/mbgl/map/map_context.cpp
@@ -0,0 +1,27 @@
+#include <mbgl/map/map_context.hpp>
+#include <mbgl/map/environment.hpp>
+
+#include <mbgl/renderer/painter.hpp>
+
+#include <mbgl/text/glyph_store.hpp>
+
+#include <mbgl/geometry/glyph_atlas.hpp>
+#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/geometry/line_atlas.hpp>
+
+#include <mbgl/util/std.hpp>
+#include <mbgl/util/uv_detail.hpp>
+#include <mbgl/util/texture_pool.hpp>
+
+namespace mbgl {
+
+MapContext::MapContext(Environment& env)
+    : glyphStore(util::make_unique<GlyphStore>(env)),
+      glyphAtlas(util::make_unique<GlyphAtlas>(1024, 1024)),
+      spriteAtlas(util::make_unique<SpriteAtlas>(512, 512)),
+      lineAtlas(util::make_unique<LineAtlas>(512, 512)),
+      texturePool(util::make_unique<TexturePool>()),
+      painter(util::make_unique<Painter>(*spriteAtlas, *glyphAtlas, *lineAtlas)) {
+}
+
+}
\ No newline at end of file
diff --git a/src/mbgl/map/map_context.hpp b/src/mbgl/map/map_context.hpp
new file mode 100644
index 000000000..694b82f43
--- /dev/null
+++ b/src/mbgl/map/map_context.hpp
@@ -0,0 +1,36 @@
+#ifndef MBGL_MAP_MAP_CONTEXT
+#define MBGL_MAP_MAP_CONTEXT
+
+#include <mbgl/util/ptr.hpp>
+
+#include <set>
+
+namespace mbgl {
+
+class Environment;
+class GlyphStore;
+class GlyphAtlas;
+class SpriteAtlas;
+class LineAtlas;
+class TexturePool;
+class Painter;
+class Sprite;
+class StyleSource;
+class StyleLayerGroup;
+
+class MapContext {
+public:
+    MapContext(Environment&);
+
+public:
+    const std::unique_ptr<GlyphStore> glyphStore;
+    const std::unique_ptr<GlyphAtlas> glyphAtlas;
+    const std::unique_ptr<SpriteAtlas> spriteAtlas;
+    const std::unique_ptr<LineAtlas> lineAtlas;
+    const std::unique_ptr<TexturePool> texturePool;
+    const std::unique_ptr<Painter> painter;
+    util::ptr<Sprite> sprite;
+};
+
+}
+#endif
\ No newline at end of file