--no commit message

@@ -37,8 +37,13 @@ SET (DMAP_SERVER_SRCS
   dmpserverregistry.cpp
   python/dmppythonutils.cpp
   python/dmpserverwrapper.cpp
+<<<<<<< Updated upstream
+=======
+  #dmppgsqlutils.cpp
+>>>>>>> Stashed changes
   dmphttpbase.cpp
   dmphttputils.cpp
+  dmptilethumbnail.cpp
 )
 
 SET (DMAP_SERVER_HDRS
@@ -70,6 +75,7 @@ SET (DMAP_SERVER_HDRS
   python/dmppythonutils.h
   dmphttpbase.h
   dmphttputils.h
+  dmptilethumbnail.h
 )
 
 #############################################################

@@ -54,25 +54,25 @@ if (temp_data.find(http_) == 0) {
 int DmpHttp::DmpHttpBase::buildPostRequest(const std::string& server, const std::string& path,
 	std::ostream& out_request) {
 	// 分割path中的json数据
-	std::string temp_path(path), temp_json;
-	int json_pos_begin = temp_path.find(HTTP_JSON_BEGIN) + 1;
-	int json_pos_end = temp_path.find(HTTP_JSON_END);
-	if (json_pos_begin != std::string::npos) {
-		// 计算json的长度
-		int temp_json_lenth = std::string::npos;
-		if (json_pos_end != temp_json_lenth) {
-			temp_json_lenth = (json_pos_end - json_pos_begin); 
-		}
-		temp_json = temp_path.substr(json_pos_begin, temp_json_lenth);
-		temp_path = temp_path.substr(0, (json_pos_begin - 1));
-	}
-	out_request << "POST " << temp_path.c_str() << " HTTP/1.0\r\n";
-	out_request << "Host: " << server.c_str() << "\r\n"; 
-	out_request << "Content-Length: " << temp_json.length() << "\r\n";
-	out_request << "Content-Type: application/x-www-form-urlencoded\r\n";
-	out_request << "Accept: */*\r\n";
-	out_request << "Connection: close\r\n\r\n";
-	out_request << temp_json.c_str();
+	// std::string temp_path(path), temp_json;
+	// int json_pos_begin = temp_path.find(HTTP_JSON_BEGIN) + 1;
+	// int json_pos_end = temp_path.find(HTTP_JSON_END);
+	// if (json_pos_begin != std::string::npos) {
+	// 	// 计算json的长度
+	// 	int temp_json_lenth = std::string::npos;
+	// 	if (json_pos_end != temp_json_lenth) {
+	// 		temp_json_lenth = (json_pos_end - json_pos_begin); 
+	// 	}
+	// 	temp_json = temp_path.substr(json_pos_begin, temp_json_lenth);
+	// 	temp_path = temp_path.substr(0, (json_pos_begin - 1));
+	// }
+	// out_request << "POST " << temp_path.c_str() << " HTTP/1.0\r\n";
+	// out_request << "Host: " << server.c_str() << "\r\n"; 
+	// out_request << "Content-Length: " << temp_json.length() << "\r\n";
+	// out_request << "Content-Type: application/x-www-form-urlencoded\r\n";
+	// out_request << "Accept: */*\r\n";
+	// out_request << "Connection: close\r\n\r\n";
+	// out_request << temp_json.c_str();
 	return HTTP_SUCCESS;
 }
 

@@ -15,15 +15,15 @@ DmpHttp::DmpHttpUtils::~DmpHttpUtils() {}
 
 int DmpHttp::DmpHttpUtils::post(const std::string& url) 
 {
-	handle_request_resolve(url, DmpHttpBase::buildPostRequest);
+	handleRequestResolve(url, DmpHttpBase::buildPostRequest);
 	return HTTP_SUCCESS;
 }
 int DmpHttp::DmpHttpUtils::get(const std::string& url) 
 {
-	handle_request_resolve(url, DmpHttpBase::buildGetRequest);
+	handleRequestResolve(url, DmpHttpBase::buildGetRequest);
 	return HTTP_SUCCESS;
 }
-void DmpHttp::DmpHttpUtils::handle_request_resolve(const std::string& url, pBuildRequest func) {
+void DmpHttp::DmpHttpUtils::handleRequestResolve(const std::string& url, pBuildRequest func) {
 	try {
 		responseData_.clear();
 		// 解析URL
@@ -37,7 +37,7 @@ void DmpHttp::DmpHttpUtils::handle_request_resolve(const std::string& url, pBuil
 		// 解析服务地址\端口
 		boost::asio::ip::tcp::resolver::query query(server, port);
 		resolver_.async_resolve(query,
-			boost::bind(&DmpHttpUtils::handle_resolve, this,
+			boost::bind(&DmpHttpUtils::handleResolve, this,
 			boost::asio::placeholders::error,
 			boost::asio::placeholders::iterator));
 	}
@@ -47,7 +47,7 @@ void DmpHttp::DmpHttpUtils::handle_request_resolve(const std::string& url, pBuil
 	}	
 	return;
 }
-void DmpHttp::DmpHttpUtils::handle_resolve(const boost::system::error_code& err,
+void DmpHttp::DmpHttpUtils::handleResolve(const boost::system::error_code& err,
 	boost::asio::ip::tcp::resolver::iterator endpoint_iterator) {
 	if (err) {
 		std::cout << "Error: " << err << "\n";
@@ -55,30 +55,30 @@ void DmpHttp::DmpHttpUtils::handle_resolve(const boost::system::error_code& err,
 	} 
 	// 尝试连接
 	boost::asio::async_connect(socket_, endpoint_iterator,
-		boost::bind(&DmpHttpUtils::handle_connect, this,
+		boost::bind(&DmpHttpUtils::handleConnect, this,
 		boost::asio::placeholders::error));
 }
-void DmpHttp::DmpHttpUtils::handle_connect(const boost::system::error_code& err) {
+void DmpHttp::DmpHttpUtils::handleConnect(const boost::system::error_code& err) {
 	if (err) {
 		std::cout << "Error: " << err << "\n";
 		return;
 	}
 	// 发送request请求
 	boost::asio::async_write(socket_, request_,
-		boost::bind(&DmpHttpUtils::handle_write_request, this,
+		boost::bind(&DmpHttpUtils::handleWriteRequest, this,
 		boost::asio::placeholders::error));
 }
-void DmpHttp::DmpHttpUtils::handle_write_request(const boost::system::error_code& err) {
+void DmpHttp::DmpHttpUtils::handleWriteRequest(const boost::system::error_code& err) {
 	if (err) {
 		std::cout << "Error: " << err << "\n";
 		return;
 	}
 	// 异步持续读数据到response_，直到接收协议符号 \r\n 为止
 	boost::asio::async_read_until(socket_, response_, "\r\n",
-		boost::bind(&DmpHttpUtils::handle_read_status_line, this,
+		boost::bind(&DmpHttpUtils::handleReadStatusLine, this,
 		boost::asio::placeholders::error));
 }
-void DmpHttp::DmpHttpUtils::handle_read_status_line(const boost::system::error_code& err) {
+void DmpHttp::DmpHttpUtils::handleReadStatusLine(const boost::system::error_code& err) {
 	if (err) {
 		std::cout << "Error: " << err << "\n";
 		return;
@@ -102,11 +102,11 @@ void DmpHttp::DmpHttpUtils::handle_read_status_line(const boost::system::error_c
 	}
 	// 读取响应头,直到接收协议符号 \r\n\r\n 为止
 	boost::asio::async_read_until(socket_, response_, "\r\n\r\n",
-		boost::bind(&DmpHttpUtils::handle_read_headers, this,
+		boost::bind(&DmpHttpUtils::handleReadHeaders, this,
 		boost::asio::placeholders::error));
 }
 
-void DmpHttp::DmpHttpUtils::handle_read_headers(const boost::system::error_code& err) {
+void DmpHttp::DmpHttpUtils::handleReadHeaders(const boost::system::error_code& err) {
 	if (err) {
 		std::cout << "Error: " << err << "\n";
 		return;
@@ -135,10 +135,10 @@ void DmpHttp::DmpHttpUtils::handle_read_headers(const boost::system::error_code&
 	// 开始读取剩余所有内容
 	boost::asio::async_read(socket_, response_,
 		boost::asio::transfer_at_least(1),
-		boost::bind(&DmpHttpUtils::handle_read_content, this,
+		boost::bind(&DmpHttpUtils::handleReadContent, this,
 		boost::asio::placeholders::error));
 }
-void DmpHttp::DmpHttpUtils::handle_read_content(const boost::system::error_code& err) {
+void DmpHttp::DmpHttpUtils::handleReadContent(const boost::system::error_code& err) {
 	if (!err) {
 	
 		// 输出读到的数据
@@ -152,7 +152,7 @@ void DmpHttp::DmpHttpUtils::handle_read_content(const boost::system::error_code&
 		// 继续读取剩余内容，直到读到EOF
 	boost::asio::async_read(socket_, response_,
 			boost::asio::transfer_at_least(1),
-			boost::bind(&DmpHttpUtils::handle_read_content, this,
+			boost::bind(&DmpHttpUtils::handleReadContent, this,
 			boost::asio::placeholders::error));
 			
 	}

@@ -25,20 +25,20 @@ namespace DmpHttp
         virtual std::string getResponse(void) {return responseData_;}
         private:
         // 建立请求
-	    void handle_request_resolve(const std::string& url, pBuildRequest func);
+	    void handleRequestResolve(const std::string& url, pBuildRequest func);
 	    // 解析后
-	    void handle_resolve(const boost::system::error_code& err,
+	    void handleResolve(const boost::system::error_code& err,
 		    boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 	    // 连接后
-	    void handle_connect(const boost::system::error_code& err);
+	    void handleConnect(const boost::system::error_code& err);
 	    // 发送请求后
-	    void handle_write_request(const boost::system::error_code& err);
+	    void handleWriteRequest(const boost::system::error_code& err);
 	    // 读取响应后
-	    void handle_read_status_line(const boost::system::error_code& err);
+	    void handleReadStatusLine(const boost::system::error_code& err);
 	    // 读取响应头后
-	    void handle_read_headers(const boost::system::error_code& err);
+	    void handleReadHeaders(const boost::system::error_code& err);
 	    // 读取正文数据后
-	    void handle_read_content(const boost::system::error_code& err);
+	    void handleReadContent(const boost::system::error_code& err);
         private:   
         // 解析器
 	    boost::asio::ip::tcp::resolver resolver_;

@@ -16,9 +16,22 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <sstream>
 #include <fstream>
+#include <math.h>
+#include "dmptilethumbnail.h"
+#include "dmptilelayer.h"
+
+<<<<<<< Updated upstream
+
 #include <iostream>
 #include "dmplogger.h"
 
+#include <math.h>
+#include "dmptilethumbnail.h"
+#include "dmptilelayer.h"
+=======
+>>>>>>> Stashed changes
+
+
 
 DmpServerManager::DmpServerManager()
 {
@@ -49,12 +62,13 @@ DmpServerManager::~DmpServerManager()
 void DmpServerManager::init(const boost::filesystem::path &modulePath)
 {
     serverRegistry_->init(modulePath);
-
-    if(!LoadServices())
+<<<<<<< Updated upstream
+    if(!loadServices())
     {
         std::cout << "加载服务失败!" << std::endl;
         LOGGER_ERROR("加载服务失败!");
     }
+    //LoadDmpServices();
 }
 
 std::string DmpServerManager::getCapabilities()
@@ -125,6 +139,13 @@ bool DmpServerManager::publish(const std::string& serverName, const std::string&
         return false;
     }
     projects_[serviceName] = project;
+    //增加缩略图处理
+    if(serverName=="tileserver")
+    {
+        DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer());
+        DmpTileThumbnail::ctreatWmtsThumbnail(tileLayer);
+    }
+    
     return true;
 }
 
@@ -149,7 +170,7 @@ bool DmpServerManager::stopService(const std::string &serverName, const std::str
 {
     return serverRegistry_->getServer(serverName)->stop(serviceName);
 }
-bool DmpServerManager::LoadServices()
+bool DmpServerManager::loadServices()
 {
     boost::property_tree::ptree pt,ptList;
     std::string conn = DmpServerConfig::Instance()->getMetaUrl();
@@ -159,15 +180,6 @@ bool DmpServerManager::LoadServices()
     {
         return false;
     }
-
-    ////测试响应内容写入文本
-    // std::ofstream examplefile ("/mnt/d/example.txt");
-    // if (examplefile.is_open()) {
-    // examplefile << DmpHttp::get(url_);
-    // examplefile.close();
-    // }
-    //boost::property_tree::read_json("./example.txt", pt_);
-    
     std::stringstream ssData;
     ssData<<strContent.c_str();
     boost::property_tree::read_json(ssData, pt);
@@ -182,8 +194,31 @@ bool DmpServerManager::LoadServices()
             std::string type = e.second.get<std::string>("type");
             int capabilities =e.second.get<int>("capabilities");
             std::string project = e.second.get<std::string>("project");
-            this->publish(type,name,title,capabilities,project);
+            this->initServices(type,name,title,capabilities,project);
         }
     }
     return true;
+}
+bool DmpServerManager::initServices(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData)
+{
+    //project
+    std::string projData;
+    if (!DmpServerUtils::Base64Decode(projectData, &projData))
+    {
+        return false;
+    }
+    DmpProject *project = new DmpProject();
+    if (!project->Read(projData))
+    {
+        delete project;
+        return false;
+    }
+
+    if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
+    {
+        delete project;
+        return false;
+    }
+    projects_[serviceName] = project;  
+    return true;
 }
\ No newline at end of file

@@ -19,6 +19,7 @@
 #include "dmpserverrequest.h"
 #include "dmpserverregistry.h"
 
+
 #define URI_RELOAD    ("/API/Service/TileService/Reload")       //加载已注册服务接口     
 class SERVER_EXPORT DmpServerManager
 {
@@ -37,7 +38,12 @@ public:
     DmpProject* getProject(const std::string& serviceName);
     bool removeProject(const std::string& serviceName);
     std::string getCapabilities();
-    bool LoadServices();
+    bool loadServices();
+    //初始化加载服务
+    bool initServices(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData);
+    // bool ctreatTmsThumbnail() ;
+    // bool ctreatWmtsThumbnail() ;
+    // bool BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo,cairo_t *cr,int x,int y);
 
 private:
     typedef std::map<std::string, DmpProject*, ci_less> ProjectMap;
@@ -54,4 +60,5 @@ struct ServicesData
     std::string project;
 };
 
+
 #endif // __dmpservermanager_h__

+/**************************************************************************
+* file:              dmptilethumbnail.cpp
+
+* Author:            lijiahuan
+* Date:              2021-12-23 15:33:50
+* Email:             jiahuanl@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmptilethumbnail.h"
+#include <iostream>
+#include <string>
+#include <map>
+#include <memory>
+#include <math.h>
+
+
+bool DmpTileThumbnail::ctreatWmtsThumbnail(DmpTileLayer *tileLayer)
+{
+   
+   std::string path = tileLayer->getDataSource();
+   path="/mnt/d/Code/tiles/qgis";
+   std::string vendor=tileLayer->getVendor();
+   std::string format=tileLayer->getFormat();
+
+   DmpRectangle rectangle=tileLayer->extent();
+   std::string lowerPoint=std::to_string(rectangle.xmin())+" "+std::to_string(rectangle.ymin());
+   std::string upperPoint=std::to_string(rectangle.xmax())+" "+std::to_string(rectangle.ymax());
+   Point minPoin{.x=107.78981494180618,.y=18.870480519260582};
+   Point maxPoin{.x=120.43553603935675,.y=25.999868757737033};
+
+   int tileMatrix=6;
+   Point origin{.x=-400,.y=400};
+   double resolution=0.02197265625009295*256;
+   int minCol=floor(abs(origin.x-minPoin.x)/resolution);
+   int minRow=floor(abs(origin.y-minPoin.y)/resolution);
+   int maxCol=floor(abs(origin.x-maxPoin.x)/resolution);
+   int maxRow=floor(abs(origin.y-maxPoin.y)/resolution);
+   int width=maxCol-minCol;
+   int heigth=minRow-maxRow;
+   cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 256*(width+1), 256*(heigth+1));
+   cairo_t *cr =cairo_create (surface);
+   
+   for( int i = 0 ; i <= width ; i++ )
+   {
+       for(int j=0;j<=heigth;j++)
+       {  
+           char* buff;
+           int length;
+           getTile(maxRow+j,minCol+i,tileMatrix,format,buff,length);        
+        //    std::string filepath=path+"/"+std::to_string(tileMatrix)+"/"+std::to_string(minCol+i)+"/"+std::to_string(maxRow+j)+".png";          
+        //    cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
+
+           st_png_data* pPngData;
+           pPngData->pdata=(unsigned char*)buff;
+           pPngData->length=length;
+           cairo_surface_t*  image1 = cairo_image_surface_create_from_png_stream(cairo_read_func_mine,&pPngData);
+
+           BufferCopy(image1,surface,cr,0,0);
+           cairo_surface_write_to_png (surface, "./wmts1.png");
+           BufferCopy(image1,surface,cr,i*256,j*256);
+       }
+   }
+ 
+   cairo_destroy (cr);
+   cairo_surface_write_to_png (surface, "./wmts.png");
+   cairo_surface_destroy (surface);
+   return true;
+}
+bool DmpTileThumbnail::ctreatTmsThumbnail()
+{
+   std::string path="/mnt/d/Code/tiles/qgis";
+   std::string vendor="QGIS";
+   Point origin{.x=-400,.y=400};
+   Point minPoin{.x=107.78981494180618,.y=18.870480519260582};
+   Point maxPoin{.x=120.43553603935675,.y=25.999868757737033};
+   double resolution=0.02197265625009295*256;
+   //    int minCol=floor(abs(origin.x-minPoin.x)/resolution);
+   //    int minRow=floor(abs(origin.y-minPoin.y)/resolution);
+   //    int maxCol=floor(abs(origin.x-maxPoin.x)/resolution);
+   //    int maxRow=floor(abs(origin.y-maxPoin.y)/resolution);
+   int minCol=51;
+   int minRow=28;
+   int maxCol=53;
+   int maxRow=27;
+   int width=maxCol-minCol;
+   int heigth=minRow-maxRow;
+   cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 256*(width+1), 256*(heigth+1));
+   cairo_t *cr =cairo_create (surface);
+   for( int i = 0 ; i <= width ; i++ )
+   {
+       for(int j=0;j<=heigth;j++)
+       {          
+           std::string filepath=path+"/6/"+std::to_string(minCol+i)+"/"+std::to_string(maxRow+j)+".png";
+           cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
+           
+           BufferCopy(image,surface,cr,i*256,j*256);
+       }
+   }
+   cairo_destroy (cr);
+   cairo_surface_write_to_png (surface, "./tms.png");
+   cairo_surface_destroy (surface);
+   return true;
+}
+bool DmpTileThumbnail::BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo, cairo_t *cr,int x,int y)
+{
+    if (pClsCSFrom == NULL||pClsCSTo == NULL)
+    {
+        return false;
+    }
+    if(cr==NULL)
+    {
+        cr =  cairo_create (pClsCSTo);
+    }
+    cairo_set_source_surface(cr, pClsCSFrom, x, y); 
+    cairo_paint(cr);
+   
+    return true;
+}
+void DmpTileThumbnail::getTile(int row, int col, int level,  std::string& format,char* refbuff,int length)
+{
+    int packSize = 128;
+    int rGroup = (int)row/packSize;
+    rGroup = rGroup * packSize;
+    int cGroup = (int)col/packSize;
+    cGroup = cGroup*packSize;
+    std::string path="/mnt/d/Code/tiles/gdmap/_alllayers";
+    std::string bundleBase =GetBundlePath(level,rGroup,cGroup);
+    std::string bundleFilePath = path+bundleBase + ".bundle";
+    std::string bundlxFilePath = path+bundleBase + ".bundlx";
+    
+    int index = packSize * (col - cGroup) + (row - rGroup);
+
+    //读取bundlx文件存储该切片的位置,计算偏移量
+    std::ifstream freadx(bundlxFilePath,  std::ifstream::binary); 
+    if(!freadx)   
+    {
+        
+        return;
+    }
+    freadx.seekg(16+5*index, freadx.beg);
+    char* buffer = new char[5];
+    freadx.read(buffer,5);
+    freadx.close();
+    
+    long offset = (long)(buffer[0]&0xff) 
+                    + (long)(buffer[1]&0xff) * 256 
+                    + (long)(buffer[2]&0xff) * 65536
+                    + (long)(buffer[3]&0xff) * 16777216
+                    + (long)(buffer[4]&0xff) * 4294967296L;
+    delete [] buffer;
+    //读取bundle文件获取切片
+    std::ifstream fread(bundleFilePath, std::ifstream::binary); 
+    if(!fread)   
+    {
+       
+        return;
+    }  
+    fread.seekg(offset, fread.beg);
+    char* buff = new char[4];
+    fread.read(buff, 4);
+    length = (long)(buff[0]&0xff) 
+                 + (long)(buff[1]&0xff) * 256 
+                 + (long)(buff[2]&0xff) * 65536
+                 + (long)(buff[3]&0xff) * 16777216;
+    delete[] buff;
+    char* imgBuffer = new char[length];
+    fread.read(imgBuffer, length);
+    fread.close();
+    refbuff=imgBuffer;
+    delete[] imgBuffer;
+}
+std::string DmpTileThumbnail::GetBundlePath(int level, int rGroup, int cGroup)
+{
+    std::string l = std::to_string(level);
+    int len = l.length();
+    if (len < 2)
+    {
+        for (int i = 0; i < 2 - len; i++)
+        {
+            l = "0" + l;
+        }
+    }
+    l = "L" + l;
+    std::string r =IntToHexStr(rGroup);
+    
+    int rLength = r.length();
+    if (rLength < 4)
+    {
+        for (int i = 0; i < 4 - rLength; i++)
+        {
+            r = "0" + r;
+        }
+    }
+    r = "R" + r;
+
+    std::string c = IntToHexStr(cGroup);
+    int cLength = c.length();
+    if (cLength < 4)
+    {
+        for (int i = 0; i < 4 - cLength; i++)
+        {
+            c = "0" + c;
+        }
+    }
+    c = "C" + c;
+    std::string rootPath;
+    std::string bundlePath = rootPath + "/"+l+"/"+r+c;
+    return bundlePath;
+}
+std::string DmpTileThumbnail::IntToFormatStr(const int num)
+    {
+        std::string str = std::to_string(num);    
+        if(num>=0 && num<10)
+        {
+            str = "0"+str;
+        }
+	    return str;
+    }
+
+std::string DmpTileThumbnail::IntToHexStr(const int num)
+    {
+        char* buffer = new char[8];
+        sprintf(buffer,"%x",num);
+        std::string str = std::string(buffer);
+        delete[] buffer;
+        return str;
+    }
+
+
+cairo_status_t DmpTileThumbnail::cairo_read_func_mine (void *closure, unsigned char *data, unsigned int length)
+{
+	st_png_data* pPngData = (st_png_data*)closure;
+	memcpy(data, pPngData->pdata + pPngData->length, length);
+	pPngData->length += length;
+	return CAIRO_STATUS_SUCCESS;
+}

+/**************************************************************************
+* file:              dmptilethumbnail.h
+
+* Author:            lijiahuan
+* Date:              2021-12-23 15:34:29
+* Email:             jiahuanl@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmptilethumbnail_h__
+#define __dmptilethumbnail_h__
+#include <cairo/cairo.h>
+#include "dmptilelayer.h"
+// namespace tileserver 
+// { 
+    class  DmpTileThumbnail
+    {
+    public:
+       
+       static bool ctreatTmsThumbnail() ;
+       static bool ctreatWmtsThumbnail(DmpTileLayer *tileLayer);
+       static bool BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo,cairo_t *cr,int x,int y);
+       static void getTile(int row, int col, int level, std::string& format,char* refbuff,int length); 
+       static std::string GetBundlePath(int level, int rGroup, int cGroup);
+       static std::string IntToFormatStr(const int num);
+       static std::string IntToHexStr(const int num);
+       static cairo_status_t cairo_read_func_mine (void *closure, unsigned char *data, unsigned int length);
+       const int _packetSize = 128;
+       
+    };  
+    struct Point
+    {
+        double x;
+        double y;   
+    };
+    
+    struct st_png_data
+    {
+	    unsigned char* pdata;
+	    unsigned int length;
+    };
+// }    
+
+#endif // __dmptilethumbnail_h__

@@ -3,6 +3,7 @@
 
 SET (TILESERVER_SRCS
   dmptileserver.cpp
+  #dmptilethumbnail.cpp
   wmts/dmpwmts.cpp
   wmts/dmpwmtsparameters.cpp
   wmts/dmptileproviderfactory.cpp
@@ -19,6 +20,7 @@ SET (TILESERVER_SRCS
 
 SET (TILESERVER_HDRS
   dmptileserver.h
+  #dmptilethumbnail.h
   wmts/dmpwmtsparameters.h
   wmts/dmptileprovider.h
   wmts/dmptileproviderfactory.h

@@ -12,6 +12,7 @@
 #include "wmts/dmpwmts.h"
 #include "tms/dmptms.h"
 #include "dmpserverresponse.h"
+#include "dmptilethumbnail.h"
 
 namespace tileserver 
 {

@@ -23,6 +23,7 @@
 #include "dmpservice.h"
 #include "dmpserverutils.h"
 #include "dmpserverproject.h"
+#include<cairo/cairo.h>
 
 namespace tileserver 
 {

@@ -52,15 +52,21 @@ namespace DmpWmts
         return;
       }
    }
-   void DmpCapabiliTilesOperation::WriteCapabilities(boost::property_tree::ptree& pt,const std::string& host,const std::string& servicename,DmpServerResponse& response)
+   void DmpCapabiliTilesOperation::WriteCapabilities(boost::property_tree::ptree& pt,const std::string& host,const std::string& servicename,const std::string& title,DmpServerResponse& response)
    {
       //构建能力文档
       boost::property_tree::ptree pt_root,pt_TileMatrix;
-      CreateGetCapabilitiesDocument(host,servicename,pt_root);
+      //CreateGetCapabilitiesDocument(host,servicename,pt_root);
+      CreateGetCapabilitiesDocument(host,title,pt_root);
       pt_root.add("Capabilities.Contents.Layer.ows:Title",pt.get<std::string>("Layer.ows:Title"));
       pt_root.add("Capabilities.Contents.Layer.ows:Abstract",pt.get<std::string>("Layer.ows:Abstract"));
       pt_root.add("Capabilities.Contents.Layer.ows:Identifier",pt.get<std::string>("Layer.ows:Identifier"));
       //pt_root_.add("Capabilities.Contents.Layer.Style.<xmlattr>.isDefault",pt_.get<std::string>("Layer.Style.<xmlattr>.isDefault"));
+      
+      
+      pt_root.add("Capabilities.Contents.Layer.ows:BoundingBox.ows:LowerCorner",pt.get<std::string>("Layer.ows:BoundingBox.ows:LowerCorner"));
+      pt_root.add("Capabilities.Contents.Layer.ows:BoundingBox.ows:UpperCorner",pt.get<std::string>("Layer.ows:BoundingBox.ows:UpperCorner"));
+
       pt_root.add("Capabilities.Contents.Layer.Style",pt.get<std::string>("Layer.Style"));
       pt_root.add("Capabilities.Contents.Layer.Format",pt.get<std::string>("Layer.Format"));
       pt_root.add("Capabilities.Contents.Layer.TileMatrixSetLink.TileMatrixSet",pt.get<std::string>("Layer.TileMatrixSetLink.TileMatrixSet"));

@@ -35,7 +35,7 @@ namespace DmpWmts
         public:
         DmpCapabiliTilesOperation();     
         void WriteCapabilities(DmpServerResponse& response);
-        void WriteCapabilities(boost::property_tree::ptree& pt ,const std::string& host ,const std::string& servicename,DmpServerResponse& response);
+        void WriteCapabilities(boost::property_tree::ptree& pt ,const std::string& host ,const std::string& servicename,const std::string& title,DmpServerResponse& response);
         void GetCapabilitiesDocument(DmpServerResponse& response);
         void CreateGetCapabilitiesDocument(const std::string& host,const std::string& servicename,boost::property_tree::ptree& pt);
         void GetServiceIdentificationElement(const std::string& servicename,boost::property_tree::ptree& pt);

@@ -67,7 +67,7 @@ namespace DmpWmts
     const DmpServerProject *serverProject = context.serverProject();
     const DmpProject *project = serverProject->project();
     DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer(layerName));
-  
+
     if (req.empty())
     {
       context.response()->writeHtml("wmts,Operation is null");
@@ -80,11 +80,11 @@ namespace DmpWmts
     }
     else if(boost::iequals(req, "GetThumbnail"))
     {
-       
     }
     else if (boost::iequals(req, "GetCapabilities"))
     {
       const std::string host=context.request()->domain()+":"+context.request()->port();;
+      const std::string title=serverProject->title();
       const std::string servicename=serverProject->name();
       
       boost::property_tree::ptree pt;
@@ -93,6 +93,11 @@ namespace DmpWmts
       pt.add("Layer.ows:Identifier","");
       pt.add("Layer.Style",tileLayer->getStyle());
       pt.add("Layer.Format",tileLayer->getFormat());
+      DmpRectangle rectangle=tileLayer->extent();
+      std::string lowerPoint=std::to_string(rectangle.xmin())+" "+std::to_string(rectangle.ymin());
+      std::string upperPoint=std::to_string(rectangle.xmax())+" "+std::to_string(rectangle.ymax());
+      pt.add("Layer.ows:BoundingBox.ows:LowerCorner",lowerPoint);
+      pt.add("Layer.ows:BoundingBox.ows:UpperCorner",upperPoint);
       
       std::vector<DmpTileMatrixSet*> tileMatrixSets;
       tileLayer->getTileMatrixSets(tileMatrixSets);
@@ -120,11 +125,12 @@ namespace DmpWmts
         pt.add("TileMatrixSet.TileHeight",(*iter)->tileRows());
         pt.add("TileMatrixSet.TopLeftCorner",std::to_string((*iter)->tileOrigin()->x())+","+std::to_string((*iter)->tileOrigin()->y()));
         pt.add("TileMatrixSet.DPI",(*iter)->dpi());       
+        
       }
       //boost::property_tree::write_json("/mnt/d/json.txt",pt);
 
       DmpCapabiliTilesOperation capOper;
-      capOper.WriteCapabilities(pt,host,servicename,*context.response());
+      capOper.WriteCapabilities(pt,host,servicename,title,*context.response());
 
     }
   }