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

qingxiongf
src/server/dmap_spserv.cpp
src/server/services/managerapi/dmpmanagerapihandler.cpp
src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
src/server/services/tileserver/wmts/dmpesribundlev2provider.h
src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
src/server/services/tileserver/wmts/dmpwmts.cpp
--- a/src/server/dmap_spserv.cpp
查看文件 @e128555
+++ b/src/server/dmap_spserv.cpp
查看文件 @e128555
@@ -45,6 +45,14 @@ public:
 	virtual void handle(SP_HttpRequest *request, SP_HttpResponse *response)
 	{
 		char *szRequest = (char *)(request->getURL());
+		if(!szRequest){
+			// response->setStatusCode( 500 );
+			// response->appendContent( "<html><head>"
+		    // "<title>dmap server</title>"
+		    // "</head><body>");
+		    // response->appendContent( "error</body></html>\n" );
+			return;
+		}
 		if (strcmp("/favicon.ico", szRequest) == 0)
 		{
 			return;
--- a/src/server/services/managerapi/dmpmanagerapihandler.cpp
查看文件 @e128555
+++ b/src/server/services/managerapi/dmpmanagerapihandler.cpp
查看文件 @e128555
@@ -310,6 +310,7 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     boost::property_tree::read_json(stream, pt);                    
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
+                    
                     confcdipath=path+"/conf.cdi";
                     confxmlpath=path+"/conf.xml";
                     std::ifstream fread(confxmlpath, std::ifstream::binary);
@@ -334,7 +335,7 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     boost::property_tree::ptree pt_confxml;
                     boost::property_tree::read_xml(confxmlpath,pt_confxml);
                     std::string strWKT=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.SpatialReference.WKT");
-                    std::string wkid=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.SpatialReference.WKID");
+                    //std::string wkid=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.SpatialReference.WKID");
                     std::string top=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.TileOrigin.X");
                     std::string left=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.TileOrigin.Y");
                     std::string tileCols=pt_confxml.get<std::string>("CacheInfo.TileCacheInfo.TileCols");
@@ -343,7 +344,7 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     std::string storageFormat=pt_confxml.get<std::string>("CacheInfo.CacheStorageInfo.StorageFormat");
                     pt.put("vendor",storageFormat);
                     pt.put("projectCrs.spatialrefsys.wkt",strWKT);
-                    pt.put("projectCrs.spatialrefsys.srid",wkid);
+                    //pt.put("projectCrs.spatialrefsys.srid",wkid);
                     boost::property_tree::ptree pt_tileMatrixSets=pt.get_child("tileMatrixSets");
                     BOOST_FOREACH(boost::property_tree::ptree::value_type &v1,pt_tileMatrixSets)
@@ -367,7 +368,7 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                         } 
                         std::string id_=v1.second.get<std::string>("tileMatrixSet.id"); 
                         pt_tileMatrixSet.add("id",id_); 
-                        pt_tileMatrixSet.add("crs","EPSG::"+wkid);
+                        //pt_tileMatrixSet.add("crs","EPSG::"+wkid);
                         pt_tileMatrixSet.add("tileCols",tileCols);
                         pt_tileMatrixSet.add("tileRows",tileRows);
                         pt_tileMatrixSet.add("dpi",dpi);
--- a/src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
查看文件 @e128555
+++ b/src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
查看文件 @e128555
@@ -7,14 +7,18 @@
 * 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/Data/SDZT_DIANZDT_2016_FS2K/Layers/_alllayers";
+        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)
     { 
@@ -70,8 +74,111 @@ namespace tileserver
         }
         delete[] imgBuffer;
     }
-    void DmpEsriBundleV2Provider::GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& respons)
+    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;
     }
 }
--- a/src/server/services/tileserver/wmts/dmpesribundlev2provider.h
查看文件 @e128555
+++ b/src/server/services/tileserver/wmts/dmpesribundlev2provider.h
查看文件 @e128555
@@ -13,6 +13,7 @@
 #include "dmpabstractesribundleprovider.h"
 #include "dmptilelayer.h"
+
 namespace tileserver
 {
     class DmpEsriBundleV2Provider : public DmpAbstractEsriBundleProvider
@@ -20,8 +21,11 @@ namespace tileserver
       public:
         DmpEsriBundleV2Provider(const std::string& rootPath);
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
-        void GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& respons) override;
+        void GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& response) override;
+        bool GetTile(const int row,const int col,const int level,std::string& rebuff,int& length);
+        static cairo_status_t cairo_read_func (void *closure, unsigned char *data, unsigned int length);
     };
+  
 }
 #endif //__dmpesribundlev2provider_h__
--- a/src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
查看文件 @e128555
+++ b/src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
查看文件 @e128555
@@ -27,6 +27,10 @@ namespace tileserver
   std::shared_ptr<DmpTileProvider> TileProviderFactory::GetProvider(DmpTileLayer* dmpTileLayer)
   {
     std::shared_ptr<DmpTileProvider> provider;
+    if(!dmpTileLayer)
+    {
+      return provider;
+    }
     try
     {
       std::string tileVersion= dmpTileLayer->getVendor();
@@ -94,13 +98,13 @@ namespace tileserver
           int id=(*leviter)->id;
           double relus = (*leviter)->resolution;
           relus=relus*256;
-          origin=DmpPoint(pOrigin->y(),pOrigin->x());
+          origin=DmpPoint(pOrigin->x(),pOrigin->y());
           int xMinTile,yMinTile,xMaxTile,yMaxTile;
           TileProviderFactory::PointToRowCol(min,origin,relus,xMinTile,yMinTile);
           TileProviderFactory::PointToRowCol(max,origin,relus,xMaxTile,yMaxTile);
           int heigth=abs(yMaxTile-yMinTile);
           int width=abs(xMaxTile-xMinTile);
-          if((heigth+1)*(width+1)<9 && (heigth+2)*(width+2)>10)
+          if((heigth+1)*(width+1)<9 && (heigth+2)*(width+2)>=9)
           {
             iLevel=id;
             resolution=relus;
--- a/src/server/services/tileserver/wmts/dmpwmts.cpp
查看文件 @e128555
+++ b/src/server/services/tileserver/wmts/dmpwmts.cpp
查看文件 @e128555
@@ -75,6 +75,11 @@ namespace tileserver
     {
       string f = (format == DmpWmtsParameters::Format::JPG) ? "jpg" : "png";
       std::shared_ptr<DmpTileProvider> provider = TileProviderFactory::GetProvider(tileLayer);
+      if(!provider)
+      {
+        context.response()->writeHtml("wmts,layer is error");
+        return ;
+      }
       provider->WriteTile(tileRow, tileCol, tileMatrix, f, *context.response());
     }
     else if(boost::iequals(req, "GetThumbnail"))