Merge branch 'master' of http://gitlab.ctune.cn/DMapServer/DMapServer4.1

@@ -310,14 +310,19 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     
                     boost::property_tree::read_json(stream, pt);                    
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
-                    
+                    path="/mnt/d/Code/tiles";
                     confcdipath=path+"/conf.cdi";
                     confxmlpath=path+"/conf.xml";
                     std::ifstream fread(confxmlpath, std::ifstream::binary);
                     if(!fread)
                     {
-                        context.response()->write("{\"status\":\"false\",\"message\":\"获取切片配置信息失败\"}");
-                        return;
+                        confxmlpath=confxmlpath=path+"/Conf.xml";
+                        std::ifstream fread(confxmlpath, std::ifstream::binary);
+                        if(!fread)
+                        {
+                            context.response()->write("{\"status\":\"false\",\"message\":\"获取切片配置信息失败\"}");
+                            return;
+                        }                        
                     }
                     //读取切片配置文件conf.cdi
                     boost::property_tree::ptree pt_confcdi;                    

@@ -135,7 +135,8 @@ DmpService* DmpTileServer::getService(const std::string &serviceType)
     ServiceMap::const_iterator iter = services_.find(serviceType);
     if (iter != services_.end())
     {
-        service = dynamic_cast<DmpWMTSService*>(iter->second);
+        //service = dynamic_cast<DmpWMTSService*>(iter->second);
+        service = iter->second;
     }
     return service;
 }

-/**************************************************************************
-* file:              dmpesribundlev2provider.cpp
-
-* Author:            wanzhongping
-* Date:              2021-06-02 11:29:16
-* Email:             zhongpingw@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#include "dmpesribundlev2provider.h"
-#include "dmpesribundlev1provider.h"
-#include "dmptileproviderfactory.h"
-#include "dmpwmtsutils.h"
-#include <cairo/cairo.h>
-#include "dmptilelayer.h"
-
-namespace tileserver
-{
-    DmpEsriBundleV2Provider::DmpEsriBundleV2Provider(const std::string& rootPath)
-        : DmpAbstractEsriBundleProvider(rootPath)
-    {
-        //rootPath_ ="/mnt/d/Code/tiles/SDYX_WEIP_2021_M07_FS2K/Layers/_alllayers";
-    }
-    void DmpEsriBundleV2Provider::WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response)
-    { 
-        int packSize = _packetSize;
-        int rGroup = (int)row/packSize;
-        rGroup = rGroup * packSize;
-        int cGroup = (int)col/packSize;
-        cGroup = cGroup*packSize;
-
-        std::string bundleBase = GetBundlePath(level,rGroup,cGroup);
-        std::string bundleFilePath = bundleBase + ".bundle";
-
-        int index = packSize * (row - rGroup) + (col - cGroup);
-
-        //读取bundle文件,计算偏移量
-        std::ifstream fread(bundleFilePath, std::ifstream::binary);
-        if(!fread)
-        {
-            response.sendError(500, "找不到瓦片:(");
-        }    
-        fread.seekg(64 + 8 * index, fread.beg);
-        char* buffer = new char[4];
-        fread.read(buffer,4);
-        long offset = (long)(buffer[0]&0xff) 
-                    + (long)(buffer[1]&0xff) * 256 
-                    + (long)(buffer[2]&0xff) * 65536
-                    + (long)(buffer[3]&0xff) * 16777216 
-                    -4;
-        delete [] buffer;
-        
-        //读取bundle文件获取切片  
-        fread.seekg(offset, fread.beg);
-        char* buff = new char[4];
-        fread.read(buff, 4);
-        long len = (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[len];
-        fread.read(imgBuffer, len);
-        fread.close();
-        if(len > 0)
-        {
-            response.removeHeader("Content-Type"); 
-            std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
-            response.setHeader("Content-Type", f);
-            response.writeContent(imgBuffer, len);
-        }
-        else
-        {
-            response.sendError(500, "找不到瓦片:(");
-        }
-        delete[] imgBuffer;
-    }
-    void DmpEsriBundleV2Provider::GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& response)
-    {
-        std::string tilePath=dmpTileLayer->getDataSource();
-        DmpRectangle rectangle=dmpTileLayer->extent();
-        std::string format=dmpTileLayer->getFormat();
-        // 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());
-        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymin());
-        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymax());
-        std::vector<DmpTileMatrixSet*> tileMatrixSets;
-        dmpTileLayer->getTileMatrixSets(tileMatrixSets); 
-        double resolution;
-        DmpPoint origin;
-        int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,buffLen;
-        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile))
-        {
-            response.sendError(500, "缩略图范围错误:(");
-            return;
-        }
-        
-        int imageLen=0;
-        int heigth=abs(yMaxTile-yMinTile);
-        int width=abs(xMaxTile-xMinTile);
-        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 strBuff;
-                GetTile(yMaxTile+j,xMinTile+i,iLevel,strBuff,buffLen);
-                
-                const char* buff=strBuff.c_str();
-                st_png_data pngData = {(unsigned char*)buff, 0};
-                cairo_surface_t *image = cairo_image_surface_create_from_png_stream(cairo_read_func,&pngData);
-                TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
-                //cairo_surface_write_to_png (surface, "./wmts.png");
-            }
-        }
-        std::string responseData;
-        cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
-        
-        response.removeHeader("Content-Type"); 
-        std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
-        response.setHeader("Content-Type", f);
-        response.write(responseData);  
-        //response.writeContent(&responseData,imageLen);  
-        cairo_destroy (cr);
-        cairo_surface_destroy (surface);   
-    }
-    bool DmpEsriBundleV2Provider::GetTile(int row, int col, int level,std::string& refbuff,int& length )
-    {
-        int packSize = _packetSize;
-        int rGroup = (int)row/packSize;
-        rGroup = rGroup * packSize;
-        int cGroup = (int)col/packSize;
-        cGroup = cGroup*packSize;
-
-        std::string bundleBase = GetBundlePath(level,rGroup,cGroup);
-        std::string bundleFilePath = bundleBase + ".bundle";
-
-        int index = packSize * (row - rGroup) + (col - cGroup);
-
-        //读取bundle文件,计算偏移量
-        std::ifstream fread(bundleFilePath, std::ifstream::binary);
-        if(!fread)
-        {
-            return false;
-        }    
-        fread.seekg(64 + 8 * index, fread.beg);
-        char* buffer = new char[4];
-        fread.read(buffer,4);
-        long offset = (long)(buffer[0]&0xff) 
-                    + (long)(buffer[1]&0xff) * 256 
-                    + (long)(buffer[2]&0xff) * 65536
-                    + (long)(buffer[3]&0xff) * 16777216 
-                    -4;
-        delete [] buffer;
-        
-        //读取bundle文件获取切片  
-        fread.seekg(offset, fread.beg);
-        char* buff = new char[4];
-        fread.read(buff, 4);
-        long len = (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[len];
-        fread.read(imgBuffer, len);
-        fread.close();   
-        if(len > 0)
-        {
-            refbuff.append(imgBuffer,len); 
-        }   
-        
-        delete[] imgBuffer;
-        return true;
-    }
-    cairo_status_t DmpEsriBundleV2Provider::cairo_read_func (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:              dmpesribundlev2provider.cpp
+
+* Author:            wanzhongping
+* Date:              2021-06-02 11:29:16
+* Email:             zhongpingw@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmpesribundlev2provider.h"
+#include "dmpesribundlev1provider.h"
+#include "dmptileproviderfactory.h"
+#include "dmpwmtsutils.h"
+#include <cairo/cairo.h>
+#include "dmptilelayer.h"
+
+namespace tileserver
+{
+    DmpEsriBundleV2Provider::DmpEsriBundleV2Provider(const std::string& rootPath)
+        : DmpAbstractEsriBundleProvider(rootPath)
+    {
+        //rootPath_ ="/mnt/d/Code/tiles/SDYX_WEIP_2021_M07_FS2K/Layers/_alllayers";
+    }
+    void DmpEsriBundleV2Provider::WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response)
+    { 
+        int packSize = _packetSize;
+        int rGroup = (int)row/packSize;
+        rGroup = rGroup * packSize;
+        int cGroup = (int)col/packSize;
+        cGroup = cGroup*packSize;
+
+        std::string bundleBase = GetBundlePath(level,rGroup,cGroup);
+        std::string bundleFilePath = bundleBase + ".bundle";
+
+        int index = packSize * (row - rGroup) + (col - cGroup);
+
+        //读取bundle文件,计算偏移量
+        std::ifstream fread(bundleFilePath, std::ifstream::binary);
+        if(!fread)
+        {
+            response.sendError(500, "找不到瓦片:(");
+        }    
+        fread.seekg(64 + 8 * index, fread.beg);
+        char* buffer = new char[4];
+        fread.read(buffer,4);
+        long offset = (long)(buffer[0]&0xff) 
+                    + (long)(buffer[1]&0xff) * 256 
+                    + (long)(buffer[2]&0xff) * 65536
+                    + (long)(buffer[3]&0xff) * 16777216 
+                    -4;
+        delete [] buffer;
+        
+        //读取bundle文件获取切片  
+        fread.seekg(offset, fread.beg);
+        char* buff = new char[4];
+        fread.read(buff, 4);
+        long len = (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[len];
+        fread.read(imgBuffer, len);
+        fread.close();
+        if(len > 0)
+        {
+            response.removeHeader("Content-Type"); 
+            std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
+            response.setHeader("Content-Type", f);
+            response.writeContent(imgBuffer, len);
+        }
+        else
+        {
+            response.sendError(500, "找不到瓦片:(");
+        }
+        delete[] imgBuffer;
+    }
+    void DmpEsriBundleV2Provider::GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& response)
+    {
+        std::string tilePath=dmpTileLayer->getDataSource();
+        DmpRectangle rectangle=dmpTileLayer->extent();
+        std::string format=dmpTileLayer->getFormat();
+        // 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());
+        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymin());
+        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymax());
+        std::vector<DmpTileMatrixSet*> tileMatrixSets;
+        dmpTileLayer->getTileMatrixSets(tileMatrixSets); 
+        double resolution;
+        DmpPoint origin;
+        int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,buffLen;
+        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile))
+        {
+            response.sendError(500, "缩略图范围错误:(");
+            return;
+        }
+        
+        int imageLen=0;
+        int heigth=abs(yMaxTile-yMinTile);
+        int width=abs(xMaxTile-xMinTile);
+        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 strBuff;
+                GetTile(yMaxTile+j,xMinTile+i,iLevel,strBuff,buffLen);
+                
+                const char* buff=strBuff.c_str();
+                st_png_data pngData = {(unsigned char*)buff, 0};
+                cairo_surface_t *image = cairo_image_surface_create_from_png_stream(cairo_read_func,&pngData);
+                TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
+                //cairo_surface_write_to_png (surface, "./wmts.png");
+
+            }
+            
+        }
+        
+        cairo_surface_t *newimage=cairo_image_surface_create_from_png ("/mnt/d/56.png");
+        
+        //cairo_arc (newcr, 128.0, 128.0, 76.8, 0, 2*3.14);      
+        int w,h;
+        w = cairo_image_surface_get_width (newimage);
+        h = cairo_image_surface_get_height (newimage);   
+
+        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w/2, h/2);
+        cairo_t *cr0 =cairo_create (surface0);
+        cairo_clip(cr0);
+        //cairo_scale (cr0,  w/2, h/2);
+        cairo_set_source_surface (cr0, newimage, 0, 0);
+       
+        
+        cairo_paint(cr0);
+        //cairo_surface_write_to_png (surface0, "./wmts.png");
+        cairo_surface_destroy (surface0);
+      
+        
+        std::string responseData;
+        cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
+        //cairo_surface_write_to_png_stream(newimage, TileProviderFactory::cairo_write_func, &responseData);
+        
+        response.removeHeader("Content-Type"); 
+        std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
+        response.setHeader("Content-Type", f);
+        response.write(responseData);  
+        //response.writeContent(&responseData,imageLen);  
+
+        
+        cairo_destroy (cr);
+        cairo_surface_destroy (surface);   
+    }
+    bool DmpEsriBundleV2Provider::GetTile(int row, int col, int level,std::string& refbuff,int& length )
+    {
+        int packSize = _packetSize;
+        int rGroup = (int)row/packSize;
+        rGroup = rGroup * packSize;
+        int cGroup = (int)col/packSize;
+        cGroup = cGroup*packSize;
+
+        std::string bundleBase = GetBundlePath(level,rGroup,cGroup);
+        std::string bundleFilePath = bundleBase + ".bundle";
+
+        int index = packSize * (row - rGroup) + (col - cGroup);
+
+        //读取bundle文件,计算偏移量
+        std::ifstream fread(bundleFilePath, std::ifstream::binary);
+        if(!fread)
+        {
+            return false;
+        }    
+        fread.seekg(64 + 8 * index, fread.beg);
+        char* buffer = new char[4];
+        fread.read(buffer,4);
+        long offset = (long)(buffer[0]&0xff) 
+                    + (long)(buffer[1]&0xff) * 256 
+                    + (long)(buffer[2]&0xff) * 65536
+                    + (long)(buffer[3]&0xff) * 16777216 
+                    -4;
+        delete [] buffer;
+        
+        //读取bundle文件获取切片  
+        fread.seekg(offset, fread.beg);
+        char* buff = new char[4];
+        fread.read(buff, 4);
+        long len = (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[len];
+        fread.read(imgBuffer, len);
+        fread.close();   
+        if(len > 0)
+        {
+            refbuff.append(imgBuffer,len); 
+        }   
+        
+        delete[] imgBuffer;
+        return true;
+    }
+    cairo_status_t DmpEsriBundleV2Provider::cairo_read_func (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;
+    }
 }
\ No newline at end of file

@@ -120,6 +120,15 @@ namespace tileserver
     }   
     return iLevel;
   }
+  int TileProviderFactory::screenTileMatrix2(DmpPoint& min,DmpPoint& max,std::vector<DmpTileMatrixSet*>& tileMatrixSets,double& resolution,DmpPoint& origin)
+  {
+    int iLevel=-1;
+    for(auto iter=tileMatrixSets.cbegin();iter!=tileMatrixSets.cend();iter++)
+    {
+
+    }
+    return iLevel;
+  }
   //点坐标转行列号
   void TileProviderFactory::PointToRowCol(DmpPoint& point,DmpPoint& origin,double resolution,int& xTile,int& yTile)
   {
@@ -143,6 +152,7 @@ namespace tileserver
         return false;
     }
     // int xMinTile,yMinTile,xMaxTile,yMaxTile;
+    //resolution=76.43718115577508*256;
     TileProviderFactory::PointToRowCol(min,origin,resolution,xMinTile,yMinTile);
     TileProviderFactory::PointToRowCol(max,origin,resolution,xMaxTile,yMaxTile);
     return true;

@@ -40,6 +40,7 @@ namespace tileserver
     static int StringToVector(std::string& strVector);
     static bool BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo,cairo_t *cr,int x,int y);
     static int screenTileMatrix(DmpPoint& min,DmpPoint& max,std::vector<DmpTileMatrixSet*>& tileMatrixSets,double& resolution,DmpPoint& origin);
+    static int screenTileMatrix2(DmpPoint& min,DmpPoint& max,std::vector<DmpTileMatrixSet*>& tileMatrixSets,double& resolution,DmpPoint& origin);
     static void PointToRowCol(DmpPoint& point,DmpPoint& origin,double resolution,int& xTile,int& yTile);
     static bool GetTileScale(DmpTileLayer* dmpTileLayer,int& iLevel,int& xMinTile,int& yMinTile,int& xMaxTile,int& yMaxTile);
     static cairo_status_t cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length);