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

@@ -102,8 +102,8 @@ void DmpManagerApiHandler::regService(const DmpServerApiContext &context) const
                     LOGGER_INFO("服务发布成功");
                     LOGGER_INFO("服务发布成功");
                     std::string url;
                     std::string url;
                     std::string http="http://"+context.request()->domain()+":"+context.request()->port();
                     std::string http="http://"+context.request()->domain()+":"+context.request()->port();
-
-                    url=http+"/DMap/Services/"+name+"/TileServer/tmsService?REQUEST=GetThumbnail";
+                    
+                    url=http+"/DMap/Services/"+name+"/"+serverType+"/tmsService?REQUEST=GetThumbnail";
                     context.response()->write("{\"status\":\""+std::to_string(flag)+"\",\"url\":\""+url+"\",\"message\":\"Pulish service successful!\"}");
                     context.response()->write("{\"status\":\""+std::to_string(flag)+"\",\"url\":\""+url+"\",\"message\":\"Pulish service successful!\"}");
                     // std::string projData;
                     // std::string projData;
                     // DmpServerUtils::Base64Decode(project, &projData);
                     // DmpServerUtils::Base64Decode(project, &projData);

@@ -72,7 +72,7 @@ namespace DmpTms
                cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
                cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
                this->BufferCopy(image,surface,cr,i*256,j*256);
                this->BufferCopy(image,surface,cr,i*256,j*256);
                //cairo_surface_write_to_png (surface, "./tms.png");
                //cairo_surface_write_to_png (surface, "./tms.png");
-               LOGGER_DEBUG(filepath);
+               //LOGGER_DEBUG(filepath);
            }
            }
        }       
        }       
        //cairo_surface_write_to_png (surface, "./tms.png");      
        //cairo_surface_write_to_png (surface, "./tms.png");      

@@ -53,7 +53,7 @@ namespace DmpWmts
         }
         }
       }
       }
       c = "C" + c;
       c = "C" + c;
-    
+      
       string bundlePath = rootPath_ + "/"+l+"/"+r+c;
       string bundlePath = rootPath_ + "/"+l+"/"+r+c;
       return bundlePath;
       return bundlePath;
     }
     }

@@ -103,12 +103,34 @@ namespace DmpWmts
             response.sendError(500, "缩略图范围错误:(");
             response.sendError(500, "缩略图范围错误:(");
             return;
             return;
         }
         }
-        std::string buff;
-        GetTile(yMinTile,xMinTile,iLevel,buff,buffLen);
-         response.removeHeader("Content-Type"); 
-         std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
-         response.setHeader("Content-Type", f);
-        response.write(buff);                 
+        
+        
+        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);    
+        cairo_destroy (cr);
+        cairo_surface_destroy (surface);              
     }
     }
     
     
     bool DmpEsriBundleV1Provider::GetTile(int row, int col, int level,std::string& refbuff,int& length )
     bool DmpEsriBundleV1Provider::GetTile(int row, int col, int level,std::string& refbuff,int& length )
@@ -118,7 +140,7 @@ namespace DmpWmts
         rGroup = rGroup * packSize;
         rGroup = rGroup * packSize;
         int cGroup = (int)col/packSize;
         int cGroup = (int)col/packSize;
         cGroup = cGroup*packSize;
         cGroup = cGroup*packSize;
-        rootPath_="/mnt/d/Code/tiles/gdmap/_alllayers";
+        //rootPath_="/mnt/d/Code/tiles/gdmap/_alllayers";
         std::string bundleBase =GetBundlePath(level,rGroup,cGroup);
         std::string bundleBase =GetBundlePath(level,rGroup,cGroup);
         std::string bundleFilePath = bundleBase + ".bundle";
         std::string bundleFilePath = bundleBase + ".bundle";
         std::string bundlxFilePath = bundleBase + ".bundlx";
         std::string bundlxFilePath = bundleBase + ".bundlx";
@@ -157,14 +179,14 @@ namespace DmpWmts
                  + (long)(buff[3]&0xff) * 16777216;
                  + (long)(buff[3]&0xff) * 16777216;
         delete[] buff;
         delete[] buff;
         char *imgBuffer = new char[length];
         char *imgBuffer = new char[length];
-        fread.read(imgBuffer, length);       
+        fread.read(imgBuffer, length);               
         fread.close();
         fread.close();
+        refbuff.append(imgBuffer,length);
+        // const char* test=refbuff.c_str();
         // cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 256, 256);
         // cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 256, 256);
-        // cairo_t *cr =cairo_create (surface);
-        // st_png_data* pPngData;
-        // pPngData->pdata=(unsigned char*)buff;
-        // pPngData->length=length;
-        // cairo_surface_t *image = cairo_image_surface_create_from_png_stream (cairo_read_func,&pPngData);
+        // cairo_t *cr =cairo_create (surface);         
+        // st_png_data pngData = {(unsigned char*)test, 0};
+        // cairo_surface_t *image = cairo_image_surface_create_from_png_stream(cairo_read_func,&pngData);
         
         
         // TileProviderFactory::BufferCopy(image,surface,cr,0,0);
         // TileProviderFactory::BufferCopy(image,surface,cr,0,0);
         // cairo_surface_write_to_png (surface, "./wmts.png");
         // cairo_surface_write_to_png (surface, "./wmts.png");
@@ -174,11 +196,11 @@ namespace DmpWmts
         return true;
         return true;
         
         
     }
     }
-    // cairo_status_t cairo_read_func (void *closure, unsigned char *data, unsigned int length,DmpServerResponse& response)
-    // {
-    //     st_png_data* pPngData = (st_png_data*)closure;
-	//     memcpy(data, pPngData->pdata + pPngData->length, length);
-	//     pPngData->length += length;
-	//     return CAIRO_STATUS_SUCCESS;
-    // }
+    cairo_status_t DmpEsriBundleV1Provider::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;
+    }
 }
 }

@@ -22,13 +22,13 @@ namespace DmpWmts
         DmpEsriBundleV1Provider(const std::string& rootPath);
         DmpEsriBundleV1Provider(const std::string& rootPath);
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
         void WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response) override;
         void GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& response) override;
         void GetTileThumbnail(DmpTileLayer* dmpTileLayer,DmpServerResponse& response) override;
-        bool GetTile(const int row,const int col,const int level,std::string& refbuff,int& length);
-        //static cairo_status_t cairo_read_func (void *closure, unsigned char *data, unsigned int length);
+        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);
     };
     };
-    // struct st_png_data
-    // {
-    //   unsigned char* pdata;
-	  //   unsigned int length;
-    // };
+  struct st_png_data
+  {
+    unsigned char* pdata;
+	  unsigned int length;
+  }; 
 }
 }
 #endif //__dmpesribundlev1provider_h__
 #endif //__dmpesribundlev1provider_h__

@@ -31,7 +31,7 @@ namespace DmpWmts
     {
     {
       std::string tileVersion= dmpTileLayer->getVendor();
       std::string tileVersion= dmpTileLayer->getVendor();
       std::string tilePath=dmpTileLayer->getDataSource();
       std::string tilePath=dmpTileLayer->getDataSource();
-      //std::string tilePath_ = "/mnt/d/Code/tiles/gdmap/_alllayers";
+      //tilePath = "/mnt/d/Code/tiles/gdmap/_alllayers";
       //std::string tileVersion_ = "ESRI_V1";
       //std::string tileVersion_ = "ESRI_V1";
       int iver=StringToVector(tileVersion);    
       int iver=StringToVector(tileVersion);    
       Vendor version = (Vendor)boost::lexical_cast<int>(iver);
       Vendor version = (Vendor)boost::lexical_cast<int>(iver);
@@ -151,4 +151,11 @@ namespace DmpWmts
         cairo_paint(cr);
         cairo_paint(cr);
         return true;
         return true;
     }
     }
+    cairo_status_t TileProviderFactory::cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length)
+    {
+        std::string *responseData = (std::string *)pbuff;
+        responseData->append((char *)data, length);
+        return CAIRO_STATUS_SUCCESS;
+    }
+    
 }
 }

@@ -42,11 +42,12 @@ namespace DmpWmts
     static int screenTileMatrix(DmpPoint& min,DmpPoint& max,std::vector<DmpTileMatrixSet*>& tileMatrixSets,double& resolution,DmpPoint& origin);
     static int screenTileMatrix(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 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 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);
     
     
   private:
   private:
     TileProviderFactory();
     TileProviderFactory();
   };
   };
-    
+   
   
   
 }
 }
 #endif //__dmptileproviderfactory_h__
 #endif //__dmptileproviderfactory_h__