ljh

@@ -312,6 +312,12 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
                     confcdipath=path+"/conf.cdi";
                     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;                    
                     boost::property_tree::read_xml(confcdipath,pt_confcdi);  

@@ -76,7 +76,7 @@ namespace DmpWmts
         dmpTileLayer->getTileMatrixSets(tileMatrixSets); 
         double resolution;
         DmpPoint origin;
-        int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile,buffLen;
+        int  iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile;
         if(!TileProviderFactory::GetTileScale(dmpTileLayer,iLevel,xMinTile,yMinTile, xMaxTile, yMaxTile))
         {
             response.sendError(500, "缩略图范围错误:(");
@@ -90,9 +90,12 @@ namespace DmpWmts
         {
             for(int j=0;j<=heigth;j++)
             {
-                std::string strBuff;
-                GetTile(yMaxTile+j,xMinTile+i,iLevel,strBuff,buffLen);
-                
+                std::string filepath;
+                if(GetTile(yMaxTile+j,xMinTile+i,iLevel,format,filepath))
+                {
+                    cairo_surface_t*  image = cairo_image_surface_create_from_png( filepath.c_str());
+                    TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
+                }
                 //TileProviderFactory::BufferCopy(image,surface,cr,i*256,j*256);
                 //cairo_surface_write_to_png (surface, "./wmts.png");
             }
@@ -107,8 +110,19 @@ namespace DmpWmts
         cairo_destroy (cr);
         cairo_surface_destroy (surface);   
     }
-    bool DmpEsriTileProvider::GetTile(int row, int col, int level,std::string& refbuff,int& length )
+    bool DmpEsriTileProvider::GetTile(const int row,const int col,const int level,const std::string& format,std::string& reTilePath)
     {
+        std::string level_str = "L" + DmpWmtsUtils::IntToFormatStr(level);
+        std::string row_str = "R" + IntToHex8Str(row);
+        std::string col_str = "C" + IntToHex8Str(col);
+        
+        reTilePath = rootPath_ + level_str + "/"+ row_str+"/"+ col_str + "." + format;
 
+        std::ifstream fread(reTilePath, std::ifstream::binary);
+        if(!fread)
+        {
+            return false;
+        }
+        
     }
 }
\ No newline at end of file

@@ -21,7 +21,7 @@ namespace DmpWmts
       DmpEsriTileProvider(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& response) override;
-      bool GetTile(const int row,const int col,const int level,std::string& rebuff,int& length);
+      bool GetTile(const int row,const int col,const int level,const std::string& format,std::string& reTilePath);
     private:
       std::string IntToHex8Str(const int num);
   };

@@ -105,6 +105,12 @@ namespace DmpWmts
             iLevel=id;
             resolution=relus;
             break;
+          } 
+          else if(leviter==tileLevels.cbegin()&&(heigth+1)*(width+1)>=9)
+          {
+             iLevel=id;
+             resolution=relus;
+             break;
           }
         }        
     }   
@@ -145,7 +151,7 @@ namespace DmpWmts
         }
         if(cr==NULL)
         {
-            cr =  cairo_create (pClsCSTo);
+          cr =  cairo_create (pClsCSTo);
         }
         cairo_set_source_surface(cr, pClsCSFrom, x, y); 
         cairo_paint(cr);