From 1268fafe0bab09816d2373db8ca9abbcdb702fc3 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 10 Jul 2014 11:46:10 -0700
Subject: [PATCH] move sprite class to map directory

---
 include/llmr/{style => map}/sprite.hpp | 0
 src/geometry/sprite_atlas.cpp          | 2 +-
 src/map/map.cpp                        | 2 +-
 src/{style => map}/sprite.cpp          | 2 +-
 src/renderer/icon_bucket.cpp           | 2 +-
 src/renderer/painter_fill.cpp          | 2 +-
 src/renderer/painter_icon.cpp          | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename include/llmr/{style => map}/sprite.hpp (100%)
 rename src/{style => map}/sprite.cpp (99%)

diff --git a/include/llmr/style/sprite.hpp b/include/llmr/map/sprite.hpp
similarity index 100%
rename from include/llmr/style/sprite.hpp
rename to include/llmr/map/sprite.hpp
diff --git a/src/geometry/sprite_atlas.cpp b/src/geometry/sprite_atlas.cpp
index bb514502b..d76f24ebd 100644
--- a/src/geometry/sprite_atlas.cpp
+++ b/src/geometry/sprite_atlas.cpp
@@ -5,7 +5,7 @@
 #include <llmr/util/std.hpp>
 #include <llmr/util/constants.hpp>
 
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 
 #include <cassert>
 #include <cmath>
diff --git a/src/map/map.cpp b/src/map/map.cpp
index fd13c340f..69bee92dc 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1,7 +1,7 @@
 #include <llmr/map/map.hpp>
 #include <llmr/map/source.hpp>
 #include <llmr/platform/platform.hpp>
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 #include <llmr/util/transition.hpp>
 #include <llmr/util/time.hpp>
 #include <llmr/util/math.hpp>
diff --git a/src/style/sprite.cpp b/src/map/sprite.cpp
similarity index 99%
rename from src/style/sprite.cpp
rename to src/map/sprite.cpp
index fecfb7a15..4b23b120c 100644
--- a/src/style/sprite.cpp
+++ b/src/map/sprite.cpp
@@ -1,4 +1,4 @@
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 #include <llmr/map/map.hpp>
 #include <llmr/util/raster.hpp>
 
diff --git a/src/renderer/icon_bucket.cpp b/src/renderer/icon_bucket.cpp
index 9cc1407e6..646634a45 100644
--- a/src/renderer/icon_bucket.cpp
+++ b/src/renderer/icon_bucket.cpp
@@ -6,7 +6,7 @@
 
 #include <llmr/renderer/painter.hpp>
 #include <llmr/style/style.hpp>
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 #include <llmr/map/vector_tile.hpp>
 
 #include <llmr/platform/gl.hpp>
diff --git a/src/renderer/painter_fill.cpp b/src/renderer/painter_fill.cpp
index f43ceed9f..9cec72af7 100644
--- a/src/renderer/painter_fill.cpp
+++ b/src/renderer/painter_fill.cpp
@@ -2,7 +2,7 @@
 #include <llmr/renderer/fill_bucket.hpp>
 #include <llmr/style/style_layer.hpp>
 #include <llmr/map/map.hpp>
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 #include <llmr/geometry/sprite_atlas.hpp>
 #include <llmr/util/std.hpp>
 
diff --git a/src/renderer/painter_icon.cpp b/src/renderer/painter_icon.cpp
index 59ae67746..46813fd73 100644
--- a/src/renderer/painter_icon.cpp
+++ b/src/renderer/painter_icon.cpp
@@ -1,7 +1,7 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/renderer/icon_bucket.hpp>
 #include <llmr/map/map.hpp>
-#include <llmr/style/sprite.hpp>
+#include <llmr/map/sprite.hpp>
 #include <llmr/style/style_layer.hpp>
 #include <llmr/geometry/sprite_atlas.hpp>
 #include <llmr/util/math.hpp>