ljh

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

@@ -105,7 +105,7 @@ namespace tileserver
             {
             {
                 std::string strBuff;
                 std::string strBuff;
                 GetTile(yMaxTile+j,xMinTile+i,iLevel,strBuff,buffLen);
                 GetTile(yMaxTile+j,xMinTile+i,iLevel,strBuff,buffLen);
-                
+                imageLen+=buffLen;
                 const char* buff=strBuff.c_str();
                 const char* buff=strBuff.c_str();
                 st_png_data pngData = {(unsigned char*)buff, 0};
                 st_png_data pngData = {(unsigned char*)buff, 0};
                 cairo_surface_t *image = cairo_image_surface_create_from_png_stream(cairo_read_func,&pngData);
                 cairo_surface_t *image = cairo_image_surface_create_from_png_stream(cairo_read_func,&pngData);
@@ -168,6 +168,7 @@ namespace tileserver
         fread.close();   
         fread.close();   
         if(len > 0)
         if(len > 0)
         {
         {
+            length=len;
             refbuff.append(imgBuffer,len); 
             refbuff.append(imgBuffer,len); 
         }   
         }   
         
         

@@ -120,6 +120,15 @@ namespace tileserver
     }   
     }   
     return iLevel;
     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)
   void TileProviderFactory::PointToRowCol(DmpPoint& point,DmpPoint& origin,double resolution,int& xTile,int& yTile)
   {
   {
@@ -143,6 +152,7 @@ namespace tileserver
         return false;
         return false;
     }
     }
     // int xMinTile,yMinTile,xMaxTile,yMaxTile;
     // int xMinTile,yMinTile,xMaxTile,yMaxTile;
+    //resolution=76.43718115577508*256;
     TileProviderFactory::PointToRowCol(min,origin,resolution,xMinTile,yMinTile);
     TileProviderFactory::PointToRowCol(min,origin,resolution,xMinTile,yMinTile);
     TileProviderFactory::PointToRowCol(max,origin,resolution,xMaxTile,yMaxTile);
     TileProviderFactory::PointToRowCol(max,origin,resolution,xMaxTile,yMaxTile);
     return true;
     return true;

@@ -40,6 +40,7 @@ namespace tileserver
     static int StringToVector(std::string& strVector);
     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 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 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 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);
     static cairo_status_t cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length);