ljh

@@ -310,14 +310,19 @@ void DmpManagerApiHandler::GetTileServiceInfo(const DmpServerApiContext &context
                     
                     
                     boost::property_tree::read_json(stream, pt);                    
                     boost::property_tree::read_json(stream, pt);                    
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
                     path= pt.get<std::string>("projectlayers.maplayer.datasource");
-                    
+                    path="/mnt/d/Code/tiles";
                     confcdipath=path+"/conf.cdi";
                     confcdipath=path+"/conf.cdi";
                     confxmlpath=path+"/conf.xml";
                     confxmlpath=path+"/conf.xml";
                     std::ifstream fread(confxmlpath, std::ifstream::binary);
                     std::ifstream fread(confxmlpath, std::ifstream::binary);
                     if(!fread)
                     if(!fread)
                     {
                     {
-                        context.response()->write("{\"status\":\"false\",\"message\":\"获取切片配置信息失败\"}");
-                        return;
+                        confxmlpath=confxmlpath=path+"/Conf.xml";
+                        std::ifstream fread(confxmlpath, std::ifstream::binary);
+                        if(!fread)
+                        {
+                            context.response()->write("{\"status\":\"false\",\"message\":\"获取切片配置信息失败\"}");
+                            return;
+                        }                        
                     }
                     }
                     //读取切片配置文件conf.cdi
                     //读取切片配置文件conf.cdi
                     boost::property_tree::ptree pt_confcdi;                    
                     boost::property_tree::ptree pt_confcdi;                    

@@ -111,16 +111,41 @@ namespace tileserver
                 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);
                 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");
                 //cairo_surface_write_to_png (surface, "./wmts.png");
+
             }
             }
+            
         }
         }
+        
+        cairo_surface_t *newimage=cairo_image_surface_create_from_png ("/mnt/d/56.png");
+        
+        //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);   
+
+        cairo_surface_t *surface0 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w/2, h/2);
+        cairo_t *cr0 =cairo_create (surface0);
+        cairo_clip(cr0);
+        //cairo_scale (cr0,  w/2, h/2);
+        cairo_set_source_surface (cr0, newimage, 0, 0);
+       
+        
+        cairo_paint(cr0);
+        //cairo_surface_write_to_png (surface0, "./wmts.png");
+        cairo_surface_destroy (surface0);
+      
+        
         std::string responseData;
         std::string responseData;
         cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
         cairo_surface_write_to_png_stream(surface, TileProviderFactory::cairo_write_func, &responseData);
+        //cairo_surface_write_to_png_stream(newimage, TileProviderFactory::cairo_write_func, &responseData);
         
         
         response.removeHeader("Content-Type"); 
         response.removeHeader("Content-Type"); 
         std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
         std::string f = (format == "jpg") ? "image/jpg" : "image/png";     
         response.setHeader("Content-Type", f);
         response.setHeader("Content-Type", f);
         response.write(responseData);  
         response.write(responseData);  
         //response.writeContent(&responseData,imageLen);  
         //response.writeContent(&responseData,imageLen);  
+
+        
         cairo_destroy (cr);
         cairo_destroy (cr);
         cairo_surface_destroy (surface);   
         cairo_surface_destroy (surface);   
     }
     }