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

qingxiongf
src/server/services/tileserver/wmts/dmpesribundlev1provider.cpp
src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
src/server/services/tileserver/wmts/dmpesritileprovider.cpp
src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
src/server/services/tileserver/wmts/dmptileproviderfactory.h
--- a/src/server/services/tileserver/wmts/dmpesribundlev1provider.cpp
查看文件 @93c4271
+++ b/src/server/services/tileserver/wmts/dmpesribundlev1provider.cpp
查看文件 @93c4271
@@ -19,7 +19,7 @@ namespace tileserver
     DmpEsriBundleV1Provider:: DmpEsriBundleV1Provider(const std::string& rootPath)
         : DmpAbstractEsriBundleProvider(rootPath)
     {
-        // _rootPath ="/mnt/d/Data/tile/GDMap/_alllayers";
+        //rootPath_ ="/mnt/d/Code/tiles/GDMap/_alllayers";
     }
     void DmpEsriBundleV1Provider::WriteTile(const int row, const int col, const int level, const std::string& format, DmpServerResponse& response)
     { 
@@ -91,14 +91,14 @@ namespace tileserver
         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());
+        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymax());
+        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymin());
         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))
+        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,origin,resolution))
         {
             response.sendError(500, "缩略图范围错误:(");
             return;
@@ -122,13 +122,45 @@ namespace tileserver
                 //cairo_surface_write_to_png (surface, "./wmts.png");
             }
         }
+
+        cairo_surface_t* newimage=surface;
+        
+        int w,h;
+        w = cairo_image_surface_get_width (newimage);
+        h = cairo_image_surface_get_height (newimage);   
+        DmpPoint topLeft;
+        // yMinTile=190;
+        // xMinTile=143;
+        TileProviderFactory::RowColToPoint(origin,xMinTile,yMaxTile,resolution,topLeft);
+        DmpPoint botRight;
+        // yMaxTile=191;
+        // xMaxTile=144;
+        //TileProviderFactory::RowColToPoint(origin,xMaxTile+1,yMinTile+1,resolution,botRight);
+
+        DmpPoint clipPoint;
+        int wClip,hClip;
+        TileProviderFactory::GetClipBox(topLeft,min,max,resolution,clipPoint,wClip,hClip);
+
+        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,wClip, hClip);
+        cairo_t *cr0 =cairo_create (surface0);
+
+        //cairo_rectangle(cr0,clipPoint.x(),clipPoint.y(),wClip,hClip);         
+        cairo_rectangle(cr0,0,0,wClip,hClip);
+        cairo_set_source_surface (cr0, surface,-clipPoint.x(), -clipPoint.y());
+        cairo_clip(cr0);
+        cairo_paint(cr0);   
+        
+        //cairo_surface_write_to_png (surface0, "./wmtsbbox.png");
+        
         std::string responseData;
-        cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
+        cairo_surface_write_to_png_stream(surface0, 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.write(responseData);   
+        cairo_destroy (cr0);
+        cairo_surface_destroy (surface0); 
         cairo_destroy (cr);
         cairo_surface_destroy (surface);              
     }
--- a/src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
查看文件 @93c4271
+++ b/src/server/services/tileserver/wmts/dmpesribundlev2provider.cpp
查看文件 @93c4271
@@ -81,14 +81,15 @@ namespace tileserver
         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());
+        DmpPoint min=DmpPoint(rectangle.xmin(),rectangle.ymax());
+        DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymin());
         std::vector<DmpTileMatrixSet*> tileMatrixSets;
         dmpTileLayer->getTileMatrixSets(tileMatrixSets); 
-        double resolution;
         DmpPoint origin;
+        double resolution;
+        
         int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,buffLen;
-        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile))
+        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,origin,resolution))
         {
             response.sendError(500, "缩略图范围错误:(");
             return;
@@ -116,27 +117,40 @@ namespace tileserver
         }
-        cairo_surface_t *newimage=cairo_image_surface_create_from_png ("/mnt/d/56.png");
+        //cairo_surface_t *newimage=cairo_image_surface_create_from_png ("/mnt/d/56.png");
+        cairo_surface_t* newimage=surface;
-        //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);   
+        DmpPoint topLeft;
+        // yMinTile=190;
+        // xMinTile=143;
+        TileProviderFactory::RowColToPoint(origin,xMinTile,yMaxTile,resolution,topLeft);
+        //DmpPoint botRight=DmpPoint((xMaxTile-xMinTile+1)*resolution,(yMaxTile-xMinTile+1)*resolution);
+        // yMaxTile=191;
+        // xMaxTile=144;
+        //TileProviderFactory::RowColToPoint(origin,xMaxTile+1,yMinTile+1,resolution,botRight);
+        DmpPoint clipPoint;
+        int wClip,hClip;
-        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w/2, h/2);
+        TileProviderFactory::GetClipBox(topLeft,min,max,resolution,clipPoint,wClip,hClip);
+        
+        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,wClip, hClip);
         cairo_t *cr0 =cairo_create (surface0);
+        cairo_rectangle(cr0,0,0,wClip,hClip);       
+        //cairo_rectangle(cr0,w/4,h/4,w/2,h/4); 
         cairo_clip(cr0);
-        //cairo_scale (cr0,  w/2, h/2);
-        cairo_set_source_surface (cr0, newimage, 0, 0);
-       
+        cairo_set_source_surface (cr0, newimage,-clipPoint.x(), -clipPoint.y());
+      
         cairo_paint(cr0);
         //cairo_surface_write_to_png (surface0, "./wmts.png");
-        cairo_surface_destroy (surface0);
-      
+        // 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(surface0, TileProviderFactory::cairo_write_func, &responseData);
         //cairo_surface_write_to_png_stream(newimage, TileProviderFactory::cairo_write_func, &responseData);
         response.removeHeader("Content-Type"); 
@@ -144,8 +158,8 @@ namespace tileserver
         response.setHeader("Content-Type", f);
         response.write(responseData);  
         //response.writeContent(&responseData,imageLen);  
-
-        
+        cairo_destroy (cr0);
+        cairo_surface_destroy (surface0);
         cairo_destroy (cr);
         cairo_surface_destroy (surface);   
     }
--- a/src/server/services/tileserver/wmts/dmpesritileprovider.cpp
查看文件 @93c4271
+++ b/src/server/services/tileserver/wmts/dmpesritileprovider.cpp
查看文件 @93c4271
@@ -77,7 +77,7 @@ namespace tileserver
         double resolution;
         DmpPoint origin;
         int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile;
-        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile))
+        if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,origin,resolution))
         {
             response.sendError(500, "缩略图范围错误:(");
             return;
--- a/src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
查看文件 @93c4271
+++ b/src/server/services/tileserver/wmts/dmptileproviderfactory.cpp
查看文件 @93c4271
@@ -135,7 +135,7 @@ namespace tileserver
     xTile=floor(abs(origin.x()-point.x())/resolution);
     yTile=floor(abs(origin.y()-point.y())/resolution);
   }
-  bool TileProviderFactory::GetTileScale(DmpTileLayer* dmpTileLayer,int& iLevel,int& xMinTile,int& yMinTile,int& xMaxTile,int& yMaxTile)
+  bool TileProviderFactory::GetTileScale(DmpTileLayer* dmpTileLayer,int& iLevel,int& xMinTile,int& yMinTile,int& xMaxTile,int& yMaxTile,DmpPoint& origin,double& resolution)
   {
     std::string tilePath=dmpTileLayer->getDataSource();
     DmpRectangle rectangle=dmpTileLayer->extent();
@@ -143,8 +143,8 @@ namespace tileserver
     DmpPoint max=DmpPoint(rectangle.xmax(),rectangle.ymax());
     std::vector<DmpTileMatrixSet*> tileMatrixSets;
     dmpTileLayer->getTileMatrixSets(tileMatrixSets);
-    DmpPoint origin;
-    double resolution;
+    // DmpPoint origin;
+    // double resolution;
     //筛选合适的切片层级
     iLevel=TileProviderFactory::screenTileMatrix(min,max,tileMatrixSets,resolution,origin);
     if(iLevel==-1)
@@ -157,6 +157,13 @@ namespace tileserver
     TileProviderFactory::PointToRowCol(max,origin,resolution,xMaxTile,yMaxTile);
     return true;
   }
+  void TileProviderFactory::RowColToPoint(DmpPoint& origin,int xTile,int yTile,double resolution,DmpPoint& tileTopleft)
+  {
+    double xTileP=origin.x()+(xTile)*resolution;
+    double yTileP=origin.y()-(yTile)*resolution;
+    
+    tileTopleft=DmpPoint(xTileP,yTileP);
+  }
   bool TileProviderFactory::BufferCopy(cairo_surface_t *pClsCSFrom, cairo_surface_t *pClsCSTo, cairo_t *cr,int x,int y)
     {
         if (pClsCSFrom == NULL||pClsCSTo == NULL)
@@ -178,4 +185,30 @@ namespace tileserver
         return CAIRO_STATUS_SUCCESS;
     }
+    void TileProviderFactory::GetClipBox(DmpPoint& point0,DmpPoint& bboxPoint0,DmpPoint& bboxPoint1,const double& resolution,DmpPoint & topLeftP,int& wBbox,int &hBbox)
+    {
+       //默认切片256*256
+      double xTile,yTile,xBox,yBox,xTop,yTop,xTopleft,yTopleft;
+      // //大图坐标距离
+      // xTile=abs(point0.x()-point1.x());
+      // yTile=abs(point0.y()-point1.y());
+      // //bbox坐标距离 distance pixel
+      xBox=abs(bboxPoint1.x()-bboxPoint0.x());
+      yBox=abs(bboxPoint1.y()-bboxPoint0.y());
+      //bbox左上与大图距离
+      xTopleft=abs(bboxPoint0.x()-point0.x());
+      yTopleft=abs(bboxPoint0.y()-point0.y());
+      // //获取bbox在合成大图种的范围及左上角坐标，默认大图左上角坐标为（0,0）像素坐标 
+      // int xTopLeftDistance=wImage*xTopleft/xTile;
+      // int yTopLeftDistance=hImage*yTopleft/yTile;
+
+      // int wBboxDistance=wImage*xBox/xTile;
+      // int hBboxDistance=hImage*yBox/yTile;
+      DmpPoint BboxP=DmpPoint(xTopleft*256/resolution,yTopleft*256/resolution);     
+      topLeftP=BboxP;
+       wBbox=xBox*256/resolution;
+       hBbox=yBox*256/resolution;
+
+
+    }   
 }
--- a/src/server/services/tileserver/wmts/dmptileproviderfactory.h
查看文件 @93c4271
+++ b/src/server/services/tileserver/wmts/dmptileproviderfactory.h
查看文件 @93c4271
@@ -42,13 +42,14 @@ namespace tileserver
     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 bool GetTileScale(DmpTileLayer* dmpTileLayer,int& iLevel,int& xMinTile,int& yMinTile,int& xMaxTile,int& yMaxTile,DmpPoint& origin,double& resolution);
     static cairo_status_t cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length);
-    
+    static void RowColToPoint(DmpPoint& origin,int xTile,int yTile,double resolution,DmpPoint& point0);
+    static void GetClipBox(DmpPoint& point0,DmpPoint& bboxPoint0,DmpPoint& bboxPoint1,const double& resolution ,DmpPoint & topLeftP,int& wBbox,int &hBbox);
   private:
     TileProviderFactory();
+    
   };
-   
-  
+    
 }
 #endif //__dmptileproviderfactory_h__