diff --git a/mapviz/launch/mapviz.launch b/mapviz/launch/mapviz.launch
index 89076c0c..224048d5 100644
--- a/mapviz/launch/mapviz.launch
+++ b/mapviz/launch/mapviz.launch
@@ -2,7 +2,7 @@
-
+
diff --git a/tile_map/CMakeLists.txt b/tile_map/CMakeLists.txt
index 62825b38..c1de3542 100644
--- a/tile_map/CMakeLists.txt
+++ b/tile_map/CMakeLists.txt
@@ -41,15 +41,18 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
file (GLOB TILE_SRC_FILES
- src/image_cache.cpp
- src/texture_cache.cpp
- src/tile_map_view.cpp)
+ src/image_cache.cpp
+ src/texture_cache.cpp
+ src/tile_map_view.cpp)
QT4_WRAP_CPP(TILE_SRC_FILES include/tile_map/image_cache.h)
add_library(${PROJECT_NAME} ${TILE_SRC_FILES})
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${GLU_LIBRARY} ${catkin_LIBRARIES})
-file (GLOB PLUGIN_SRC_FILES src/tile_map_plugin.cpp)
-file (GLOB PLUGIN_UI_FILES src/*.ui)
+file (GLOB PLUGIN_SRC_FILES
+ src/tile_map_plugin.cpp
+ src/tile_source.cpp)
+file (GLOB PLUGIN_UI_FILES
+ src/tile_map_config.ui)
QT4_WRAP_UI(PLUGIN_SRC_FILES ${PLUGIN_UI_FILES})
QT4_WRAP_CPP(PLUGIN_SRC_FILES include/tile_map/tile_map_plugin.h)
diff --git a/tile_map/include/tile_map/image_cache.h b/tile_map/include/tile_map/image_cache.h
index 932a6eb7..ba25b7e5 100644
--- a/tile_map/include/tile_map/image_cache.h
+++ b/tile_map/include/tile_map/image_cache.h
@@ -99,6 +99,7 @@ namespace tile_map
void ProcessRequest(QString uri);
void ProcessReply(QNetworkReply* reply);
void NetworkError(QNetworkReply::NetworkError error);
+ void Clear();
private:
QNetworkAccessManager network_manager_;
diff --git a/tile_map/include/tile_map/texture_cache.h b/tile_map/include/tile_map/texture_cache.h
index bccbcbc7..9bb4b1a1 100644
--- a/tile_map/include/tile_map/texture_cache.h
+++ b/tile_map/include/tile_map/texture_cache.h
@@ -56,6 +56,8 @@ namespace tile_map
TexturePtr GetTexture(size_t url_hash, const std::string& url, bool& failed);
void AddTexture(const TexturePtr& texture);
+
+ void Clear();
private:
QCache cache_;
diff --git a/tile_map/include/tile_map/tile_map_plugin.h b/tile_map/include/tile_map/tile_map_plugin.h
index 7d632a88..36ac74c2 100644
--- a/tile_map/include/tile_map/tile_map_plugin.h
+++ b/tile_map/include/tile_map/tile_map_plugin.h
@@ -32,6 +32,7 @@
// C++ standard libraries
#include
+#include