打印

@@ -303,6 +303,18 @@ bool DmpProject::initVectorLayerVacuate(std::function<std::string(const std::str
   return false;
 }
 
+std::shared_ptr<DmpRectangle>  DmpProject::GetExtent()
+{
+  shared_ptr<DmpRectangle> rect(new DmpRectangle());
+  for (size_t i = 0; i < this->vectorLayers_.size(); i++)
+  {
+      DmpMapLayer* layer = this->vectorLayers_.at(i);
+      DmpRectangle layerExtent = layer->extent();
+      rect->merge(layerExtent);
+  }
+  return rect;
+}
+
 bool DmpProject::initVectorLayerVacuate(DmpProject* project)
 {
   if(!project) return false;

@@ -16,6 +16,7 @@
 #include <boost/filesystem.hpp>
 #include "dmpcoordinatereferencesystem.h"
 #include "dmpmaplayer.h"
+#include <memory>
 
 //配图文件
 class CORE_EXPORT DmpProject
@@ -37,6 +38,7 @@ class CORE_EXPORT DmpProject
     std::vector<DmpMapLayer*> vectorLayers() const;
     DmpMapLayer* getLayer(const std::string &layerName) const;
     DmpMapLayer* getLayer()const;
+    std::shared_ptr<DmpRectangle>  GetExtent();
   private:
     static DmpProject *project_;
     std::string projectName_;

@@ -215,8 +215,8 @@ void DmpVectorLayer::setDataSource(const std::string &dataSource, const std::str
 }
 
 DmpWkbTypes::GeometryType DmpVectorLayer::GeometryType() const
-{
-	return DmpWkbTypes::GeometryType(wkbType_);
+{	
+	return DmpWkbTypes::geometryType(wkbType_);
 }
 
 bool DmpVectorLayer::setDataProvider(const std::string &provider)

@@ -50,6 +50,7 @@ class CORE_EXPORT DmpVectorLayer : public DmpMapLayer
     void setRenderer(DmpFeatureRenderer *renderer);
     void setDataSource(const std::string &dataSource, const std::string &baseName, const std::string &provider, bool loadDefaultStyleFlag);
     DmpWkbTypes::GeometryType GeometryType() const;
+    DmpWkbTypes::Type GeomWkbType() const{ return wkbType_;}
     bool setDataProvider(std::string const &provider);
    
 
@@ -65,6 +66,8 @@ class CORE_EXPORT DmpVectorLayer : public DmpMapLayer
     std::string  srid(){return  srid_;}
     size_t featurecount(){return featurecount_;}
     bool IsInit(){return isinit_;}
+
+    void  setSrid(string srid){ srid_ = srid;}
   private:
     bool readExtentFromXml_;
     DmpWkbTypes::Type wkbType_ = DmpWkbTypes::Unknown;

@@ -33,6 +33,24 @@ void DmpRectangle::normalize()
     }
 }
 
+void DmpRectangle::merge(DmpRectangle &rectangle)
+{
+    if(xmin_ == 0 && ymin_ ==0 && xmax_ ==0 && ymax_ ==0 )
+    {
+       this->xmin_ = rectangle.xmin();
+       this->ymin_ = rectangle.ymin();
+       this->xmax_ = rectangle.xmax();
+       this->ymax_ = rectangle.ymax();
+    }
+    else
+    {
+        if(rectangle.xmin() < this->xmin_ ) this->xmin_ = rectangle.xmin();
+        if(rectangle.ymin() < this->ymin_ ) this->ymin_ = rectangle.ymin();
+        if(rectangle.xmax() > this->xmax_ ) this->xmax_ = rectangle.xmax();
+        if(rectangle.ymax() < this->ymax_ ) this->ymax_ = rectangle.ymax();
+    }
+}
+
 
 bool DmpRectangle::isNull() 
 {

@@ -38,6 +38,13 @@ class CORE_EXPORT DmpRectangle
     double width() const  { return xmax_ - xmin_; }
     double height() const { return ymax_ - ymin_; }
 
+    void setXmax(double xmax){xmax_ = xmax; }
+    void setYmax(double ymax){ymax_ = ymax; }
+    void setXmin(double xmin){xmin_ = xmin; }
+    void setYmin(double ymin){ymin_ = ymin; }
+
+    void merge(DmpRectangle &rectangle);
+
  private:
     double xmin_ = 0.0;
     double ymin_ = 0.0;

@@ -12,7 +12,7 @@ namespace DmapCore_30
 
 	SimpleLineSymbol::SimpleLineSymbol()
 	{
-		m_iAntialiasing = CAIRO_ANTIALIAS_DEFAULT;
+		m_iAntialiasing = CAIRO_ANTIALIAS_BEST;
 		m_iColor = clsUtil::RandomColor();
 		clsUtil::ToCairoColor(m_iColor, r, g, b, a);
 		//m_pClsSurfBackup =	NULL;

@@ -12,7 +12,7 @@ namespace DmapCore_30
 {
 	SimpleMarkerSymbol::SimpleMarkerSymbol()
 	{
-		m_iAntialiasing = CAIRO_ANTIALIAS_DEFAULT;
+		m_iAntialiasing = CAIRO_ANTIALIAS_BEST;
 		m_bBoundary = true;
 		m_iColor = clsUtil::RandomColor();
 		clsUtil::ToCairoColor(m_iColor, r, g, b, a);

@@ -12,7 +12,7 @@ namespace DmapCore_30
 {
 	SimplePolygonSymbol::SimplePolygonSymbol()
 	{
-		m_iAntialiasing = CAIRO_ANTIALIAS_DEFAULT;
+		m_iAntialiasing = CAIRO_ANTIALIAS_BEST;
 		m_iBackgroundColor = clsUtil::RandomColor();
 		clsUtil::ToCairoColor(m_iBackgroundColor, r, g, b, a);
 		m_iLineType = 0;

@@ -316,16 +316,21 @@ namespace DmapCore_30
 		x += m_dXdis;
 		y += m_dYdis;
 		cairo_t* cr = pClsCS->m_pCr;
-		//cairo_font_options_set_antialias(cfo, CAIRO_ANTIALIAS_GRAY);
+		//cairo_font_options_set_antialias(cr, CAIRO_ANTIALIAS_BEST);
 		cairo_text_extents(cr, sUTF8, m_pCrExtents);
 		int iX = (int)x;                          int iY = (int)y;
 		int iTextW = (int)(m_pCrExtents->x_advance);  int iTextH = (int)(m_pCrExtents->height);
 		//int surf_w = pClsCS->m_iW;                int surf_h = pClsCS->m_iH;
+  
+        //文字被截取
+		if(iX < -30 || (iX + iTextW) > pClsCS->m_iW + 30 || (iY - iTextH )  < -15 || iY > pClsCS->m_iH + 15) 
+		{
+			return false;
+		}
 
 		/*
 		文字避让部分
 		*/
-
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		int xFrom = iX / gridsize;
 		int xTo = (iX + iTextW) / gridsize;
@@ -371,6 +376,10 @@ namespace DmapCore_30
 				//if (pFlag[iFlagW*i + j])	return false;
 			}
 		}
+
+		//文字截取部分
+
+
 		//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 

@@ -8,7 +8,7 @@ namespace DmapCore_30
 	{
 		m_pSurf = surface;
 		m_pCr = cairo_create(m_pSurf);
-		//cairo_set_antialias(m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
+		cairo_set_antialias(m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
 		m_iN = 1;
 		m_iW = cairo_image_surface_get_width(surface);
 		m_iH = cairo_image_surface_get_height(surface);

@@ -287,7 +287,7 @@ namespace DmapCore_30
     //CAIRO_ANTIALIAS_FAST,
    // CAIRO_ANTIALIAS_GOOD,
   //  CAIRO_ANTIALIAS_BEST
-	    cairo_set_antialias(cr,CAIRO_ANTIALIAS_FAST);
+	   // cairo_set_antialias(cr,CAIRO_ANTIALIAS_FAST);
 		return true;
 		switch (iAntialias)
 		{

@@ -30,7 +30,7 @@ namespace DmapCore_30
 
     bool legendParamater::next(char * title)
     {
-        if(index/row_maxsize>  current_Col_Index)
+        if( row_maxsize >0  && index/row_maxsize > current_Col_Index)
         {
               current_Col_Index ++;
               pixXIndex = 10 + (current_Col_Index *100);

@@ -49,7 +49,7 @@ public:
 		{
 			return;
 		}
-        
+       // printf("%s\r\n", szRequest);
 		
 		DmpSpServerRequest dmpRequest(request);
 		DmpSpServerResponse dmpResponse(response);

@@ -44,19 +44,19 @@ DmpServerManager::~DmpServerManager()
             delete mapProject;
             mapProject = nullptr;
         }
-    } 
+    }
     projects_.clear();
 }
 
 void DmpServerManager::init(const boost::filesystem::path &modulePath)
 {
     serverRegistry_->init(modulePath);
-    if(!loadServices())
+    if (!loadServices())
     {
         std::cout << "加载服务失败!" << std::endl;
         LOGGER_ERROR("加载服务失败!");
     }
-    //LoadDmpServices();
+    // LoadDmpServices();
 }
 
 std::string DmpServerManager::getCapabilities()
@@ -106,9 +106,9 @@ bool DmpServerManager::removeProject(const std::string &serviceName)
     return true;
 }
 
-bool DmpServerManager::publish(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData)
+bool DmpServerManager::publish(const std::string &serverName, const std::string &serviceName, const std::string &title, int capabilities, const std::string &projectData)
 {
-    //project
+    // project
     std::string projData;
     if (!DmpServerUtils::Base64Decode(projectData, &projData))
     {
@@ -122,9 +122,7 @@ bool DmpServerManager::publish(const std::string& serverName, const std::string&
     }
 
     project->initVectorLayerVacuate([](const std::string &tableguid)
-                                    {
-                                         return DmpHttp::get(DmpServerConfig::Instance()->getMetaUrl() + URL_VACUATE + tableguid);
-                                    });
+                                    { return DmpHttp::get(DmpServerConfig::Instance()->getMetaUrl() + URL_VACUATE + tableguid); });
 
     if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
     {
@@ -132,7 +130,7 @@ bool DmpServerManager::publish(const std::string& serverName, const std::string&
         return false;
     }
     projects_[serviceName] = project;
-    
+
     return true;
 }
 
@@ -159,34 +157,44 @@ bool DmpServerManager::stopService(const std::string &serverName, const std::str
 }
 bool DmpServerManager::loadServices()
 {
-    boost::property_tree::ptree pt,ptList;
-    std::string conn = DmpServerConfig::Instance()->getMetaUrl();
-    const std::string url= conn + URI_RELOAD;
-    std::string strContent=DmpHttp::get(url);
-    if(strContent.length()==0)
-    {
-        return false;
-    }
-    std::stringstream ssData;
-    ssData<<strContent.c_str();
-    boost::property_tree::read_json(ssData, pt);
-    int iCount = std::atoi(pt.get<std::string>("data.count").c_str());
-    if(iCount>0)
+    std::string strContent;
+    try
     {
-        ptList=pt.get_child("data.list");
-        for (auto& e : ptList) 
+        boost::property_tree::ptree pt, ptList;
+        std::string conn = DmpServerConfig::Instance()->getMetaUrl();
+        const std::string url = conn + URI_RELOAD;
+         strContent = DmpHttp::get(url);
+        if (strContent.length() == 0)
         {
-            std::string name = e.second.get<std::string>("name");
-            std::string title = e.second.get<std::string>("title");
-            std::string type = e.second.get<std::string>("type");
-            int capabilities =e.second.get<int>("capabilities");
-            std::string project = e.second.get<std::string>("project");
-            this->initServices(type,name,title,capabilities,project);
+            return false;
         }
+        std::stringstream ssData;
+        ssData << strContent.c_str();
+        boost::property_tree::read_json(ssData, pt);
+        int iCount = std::atoi(pt.get<std::string>("data.count").c_str());
+        if (iCount > 0)
+        {
+            ptList = pt.get_child("data.list");
+            for (auto &e : ptList)
+            {
+                std::string name = e.second.get<std::string>("name");
+                std::string title = e.second.get<std::string>("title");
+                std::string type = e.second.get<std::string>("type");
+                int capabilities = e.second.get<int>("capabilities");
+                std::string project = e.second.get<std::string>("project");
+                this->initServices(type, name, title, capabilities, project);
+            }
+        }
+    }
+    catch(const std::exception& e)
+    {
+        std::cerr << e.what() <<  strContent.c_str() << '\n';
+        return false;
     }
+
     return true;
 }
-bool DmpServerManager::initServices(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData)
+bool DmpServerManager::initServices(const std::string &serverName, const std::string &serviceName, const std::string &title, int capabilities, const std::string &projectData)
 {
     // project
     std::string projData;
@@ -202,9 +210,7 @@ bool DmpServerManager::initServices(const std::string& serverName, const std::st
     }
 
     project->initVectorLayerVacuate([](const std::string &tableguid)
-                                    {
-                                         return DmpHttp::get(DmpServerConfig::Instance()->getMetaUrl() + URL_VACUATE + tableguid);
-                                     });
+                                    { return DmpHttp::get(DmpServerConfig::Instance()->getMetaUrl() + URL_VACUATE + tableguid); });
 
     if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
     {

@@ -20,6 +20,7 @@ SET (MAPSERVER_SRCS
   wms/dmpwmsparameters.cpp
   wms/dmpwmsgetcapabilities.cpp
   wms/dmpwmsgetmap.cpp
+  wms/dmpwmsgetprint.cpp
   wms/dmpwmsserviceinfo.cpp
   wms/dmpwmsgetfeatureinfo.cpp
   wms/print/dmpmapprint.cpp
@@ -55,6 +56,7 @@ SET (MAPSERVER_HDRS
   wms/dmpwmsparameters.h
   wms/dmpwmsgetcapabilities.h
   wms/dmpwmsgetmap.h
+  wms/dmpwmsgetprint.h
   wms/dmpwmsserviceinfo.h
   wms/dmpwmsgetfeatureinfo.h
   wms/print/dmpmapprint.h

@@ -18,6 +18,23 @@ using boost::asio::ip::tcp;
 namespace mapserver
 {
 
+	void DmpMapServerUtil::initVectorLayerSrid(shared_ptr<DmpPgsql> pPgsqlConn,DmpVectorLayer* layer)
+	{
+		if(layer->srid().empty())
+		{
+			string name = layer->name();
+			string sql = "select  t.f_geometry_column shapeField, t.type ,f_table_schema,t.srid from public.geometry_columns t where lower( t.f_table_name) = lower('"+ name +"');";
+		    if(pPgsqlConn->ExecWait(sql))
+			{
+				string geom = pPgsqlConn->getString(0);
+				string value = pPgsqlConn->getString( 1);
+				string strSchema = pPgsqlConn->getString(2);
+			    string srid = pPgsqlConn->getString(3);
+				layer->setSrid(srid);
+			}
+		}
+	}
+
 	void DmpMapServerUtil::responseGml(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData, const string &layerName, const std::string &srid)
 	{
 

@@ -13,13 +13,16 @@
 #include <string>
 #include <memory>
 #include "dmppgsqlsourcepools.h"
-
+#include "dmpproject.h"
+#include "dmpvectorlayer.h"
 
 namespace mapserver 
 {
     class DmpMapServerUtil
     {
     public:
+        static void initVectorLayerSrid(shared_ptr<DmpPgsql> pPgsqlConn,DmpVectorLayer* layer);
+
         static void responseGeojson(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,const std::string &srid);
         static void responseGml(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,const std::string &srid);
         static void toXmlString(std::string &s);

@@ -140,7 +140,7 @@ namespace DmpMapping
     bool loadProjectService(const DmpServerContext &context,ProjectMap& vectorMappingProjects)
     {
         const char *data = (char *)(context.request()->GetData());
-        if(data== nullptr ||  *data == '\0') 
+        if(data== nullptr ||  *data == '\0'  || context.request()->method() != DmpServerRequest::Method::POST_METHOD) 
         {
              LOGGER_ERROR("post 参数错误");
              context.response()->writeJson("{\"status\":\"false\",\"message\":\"post 参数错误!\"}");
@@ -250,7 +250,7 @@ namespace DmpMapping
     bool editService(const DmpServerContext &context,ProjectMap& vectorMappingProjects)
     {
         const char *data = (char *)(context.request()->GetData());
-        if(data== nullptr ||  *data == '\0') 
+        if(data== nullptr ||  *data == '\0'  || context.request()->method() != DmpServerRequest::Method::POST_METHOD) 
         {
              LOGGER_ERROR("post 参数错误");
              context.response()->writeJson("{\"status\":\"false\",\"message\":\"post 参数错误!\"}");

@@ -76,6 +76,11 @@ namespace DmpMapping
     {
        getmap(context,params);
     }
+    else
+    {
+      std::string responseData = "{\"result\":\"false\",\"message\":\"配图服务未实现" + request + "接口\"}";
+			context.response()->writeJson(responseData);
+    }
    
   }
 

@@ -56,6 +56,11 @@ namespace DmpWfs
       {
          writeGetFeature(context,params, project);
       } 
+      else
+      {
+          std::string responseData = "{\"result\":\"false\",\"message\":\"WFS 未实现" + request + "接口\"}";
+			    context.response()->writeJson(responseData);
+      }
   }
 }
 

@@ -23,7 +23,31 @@ namespace DmpWfs
 						 const DmpProject *project,
 						 bool projectSettings)
 	{
-		WfsGetFeature(context, params, project, projectSettings);
+		std::string errorinfo = WfsGetFeature(context, params, project, projectSettings);
+		if(!errorinfo.empty())
+		{
+			DmpWfsParameters::Format resultType = params.ResultType();
+			if (resultType == DmpWfsParameters::Format::GeoJson)
+			{
+				std::string responseData;
+			    responseData = "{\"result\":\"false\",\"message\":\"" + errorinfo + "\"}";
+			    context.response()->writeJson(responseData);
+			}
+			else
+			{
+				boost::property_tree::ptree ptreeDoc;
+				boost::property_tree::ptree ptreeRoot;
+				ptreeRoot.add<bool>("result", false);
+				ptreeRoot.add<std::string>("message", errorinfo);
+				ptreeDoc.add_child("WfsGetfeatureResponse",ptreeRoot);
+				std::stringstream stream; 
+   				write_xml(stream, ptreeDoc);
+   				std::string responseData = stream.str();
+			    context.response()->removeHeader("Content-Type");
+    			context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
+    			context.response()->write(responseData);
+			}
+		}
 	}
 
 	std::string WfsGetFeature(const DmpServerContext &context, const DmpWfsParameters &params,

@@ -21,6 +21,7 @@
 #include "dmpwmsgetmap.h"
 #include "dmpwmsserviceinfo.h"
 #include "dmpwmsgetfeatureinfo.h"
+#include "dmpwmsgetprint.h"
 using namespace std;
 
 namespace DmpWms
@@ -40,6 +41,7 @@ namespace DmpWms
       const DmpWmsParameters params(context.request()->serverParameters());
       const DmpProject* project = context.serverProject()->project();
       const std::string request = params.Request();
+   // printf("%s\r\n", request.c_str());
       if (request.empty())
       {
          context.response()->writeHtml("wms,Operation is null");
@@ -66,12 +68,21 @@ namespace DmpWms
       } 
       else if(boost::iequals(request, "getserviceinfo"))
       {
-         writeGetServiceInfo(context,params, project);
+          writeGetServiceInfo(context,params, project);
       }
-      else if(request == "getlegendgraphic")
+      else if(boost::iequals(request, "getlegendgraphic"))
       {
           
       }
+      else if(boost::iequals(request, "getprint"))
+      {
+          writeGetPrint(context,params, project);
+      }
+      else
+      {
+          std::string responseData = "{\"result\":\"false\",\"message\":\"WMS 未实现" + request + "接口\"}";
+			    context.response()->writeJson(responseData);
+      }
   }
 } 
 

+/**************************************************************************
+* file:              dmpwmsgetprint.cpp
+
+* Author:            qingxiongf
+* Date:              2022-02-10 14:18:07
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmpwmsgetprint.h"
+#include "print/dmpmapprint.h"
+#include "dmpwmsrenderer.h"
+#include "dmpserverresponse.h"
+#include "dmpserverrequest.h"
+#include "dmpserverproject.h"
+#include <map>
+#include <memory>
+namespace DmpWms
+{
+ void writeGetPrint(const DmpServerContext &context,const DmpWmsParameters& params, 
+                             const  DmpProject* project,
+                             bool projectSettings )
+    {
+        DmpWmsParameters::Format outformat = params.ResFormat();
+        DmpMapPrint mapPrint(outformat);
+
+        std::string responseData;
+       
+        std::string name = context.serverProject()->name();
+        std::string title = context.serverProject()->title();
+        std::string boxx = params.BBox();
+        std::string printTemp = params.printTemp();
+
+        if(mapPrint.getPrintTempFile(responseData,project,printTemp.c_str(),boxx.c_str()))
+        {
+            if(outformat == DmpWmsParameters::Format::PDF)
+            {
+                 context.response()->setHeader("Content-Type", "application/pdf");
+            }
+            else if(outformat == DmpWmsParameters::Format::SVG)
+            {
+                 context.response()->setHeader("Content-Type", "image/svg");
+            }
+            else
+            {
+                 context.response()->setHeader("Content-Type", "image/png");
+            }
+        }
+        else
+        {
+             context.response()->setHeader("Content-Type", "text/xml");
+        }
+
+        context.response()->write(responseData);
+    }
+}
\ No newline at end of file

+/**************************************************************************
+* file:              dmpwmsgetprint.h
+
+* Author:            qingxiongf
+* Date:              2022-02-10 14:17:58
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpwmsgetprint_h__
+#define __dmpwmsgetprint_h__
+
+
+#include <boost/property_tree/ptree.hpp> 
+#include <boost/property_tree/xml_parser.hpp> 
+#include <boost/typeof/typeof.hpp>
+#include <memory>
+#include <vector>
+#include "dmpproject.h"
+#include "dmpwmsparameters.h"
+#include "dmpservercontext.h"
+
+namespace DmpWms
+{
+    void writeGetPrint(const DmpServerContext &context,const DmpWmsParameters& params, 
+                             const  DmpProject* project,
+                             bool projectSettings = false );
+}
+
+#endif // __dmpwmsgetprint_h__

@@ -169,6 +169,13 @@ namespace DmpWms
         return value;
     }
 
+    std::string  DmpWmsParameters::printTemp() const
+    {
+        std::string value = "";
+        GetStringParameter("PRINTTEMP",value);
+        return value;
+    }
+
     DmpWmsParameters::Format DmpWmsParameters::InfoFormat() const
     {
         std::string value = "";
@@ -241,6 +248,16 @@ namespace DmpWms
             if (frm.compare("jpg") == 0 || frm.compare("jpeg") == 0 || frm.compare("image/jpeg") == 0 ) {
               f = DmpWmsParameters::Format::JPG;
             }
+            else if(frm.compare("pdf") == 0){
+               f = DmpWmsParameters::Format::PDF;
+            }else if(frm.compare("svg") == 0){
+               f = DmpWmsParameters::Format::SVG;
+            }else if(frm.compare("xml") == 0 || frm.compare("gml") == 0){
+               f = DmpWmsParameters::Format::GML;
+            }else if(frm.compare("json") == 0 || frm.compare("geojson") == 0){
+               f = DmpWmsParameters::Format::GeoJson;
+            }
+
             return f;
         }
         return DmpWmsParameters::Format::NONE;

@@ -61,6 +61,8 @@ namespace DmpWms
         int Y() const; //地图上查询点的Y坐标，以像素为单位。0是左侧。j是WMS 1.3.0中使用的参数键。
         
         DmpWmsParameters::Format ResFormat() const; //GetMap URL为Format   GetFeatureInfo url为:info_format
+
+        std::string printTemp() const;
     private:
         bool GetStringParameter(const char* key, std::string &value) const;
         bool GetIntParameter(const char* key, int& value) const;

@@ -173,6 +173,25 @@ namespace DmpWms
 		//ss += " limit 40000 ";
 
 		double t = pRect->m_dTop, r = pRect->m_dRight, b = pRect->m_dBottom, l = pRect->m_dLeft;
+		//点 标注 避免被截取
+		if(layer->GeometryType() == DmpWkbTypes::GeometryType::PointGeometry)
+		{  
+			double drh =  (pRect->m_dTop -  pRect->m_dBottom)/this->m_dHeight;
+			double drw =  (pRect->m_dRight -  pRect->m_dLeft)/this->m_dWidth;
+			t = t + drh * 15;
+			b = b - drh * 15;
+			if(length > 0)
+			{
+				l = l - drw * 30;
+				r = r + drw * 20;
+			}
+			else
+			{
+				l = l - drw * 15;
+				r = r + drw * 15;
+			}
+		}
+	
 		std::string sql = format(ss.c_str(), shapeName.c_str(), layer->schema().c_str(), tableName.c_str(), shapeName.c_str(), l, b, r, t);
 		//printf("%s\r\n",sql.c_str());
 		return sql;
@@ -572,8 +591,8 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		std::string sql = format(ss.c_str(), layer->schema().c_str(), tableName.c_str());
 
 		string shapeName = layer->geom();
-		sql += format(" ST_DWithin(\"%s\", ST_GeometryFromText('POINT(%f %f)',%s), %f) limit %d ",
-					  shapeName.c_str(), x, y, layer->srid().c_str(), dis, feature_count);
+		sql += format(" ST_DWithin(\"%s\", ST_GeometryFromText('POINT(%f %f)',%s),%f) limit %d ",
+					  shapeName.c_str(), x, y,layer->srid().c_str(), dis, feature_count);
 		//cout<<sql.c_str() <<endl;
 		return sql;
 	}
@@ -596,16 +615,17 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			double start = clock();
 			double cost, cost2;
 
-			string sql = this->GetFeatureInfoSQL(layer, x0, y0, dis, feature_count); //sql语句中使用 ::box
-			if (sql == "")
-				continue;
-			//printf("%s\r\n",sql.c_str());
-			string layerName = layer->name();
+			
 			try
 			{
 				shared_ptr<DmpPgsql> pPgsqlConn = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
 				if (pPgsqlConn == nullptr)
 					break;
+				DmpMapServerUtil::initVectorLayerSrid(pPgsqlConn, layer);
+				string sql = this->GetFeatureInfoSQL(layer, x0, y0, dis, feature_count); //sql语句中使用 ::box
+		  	    if (sql == "") continue;
+			    string layerName = layer->name();
+				//printf("%s\r\n",sql.c_str());
 				if (pPgsqlConn->ExecWaitBinary(sql))
 				{
 					if(pPgsqlConn->GetRowCount()>0 || i==0)
@@ -949,7 +969,8 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 		}
 
-		for (int i = 0; i < (int)(m_vLayers.size()); i++)
+		//for (int i = 0; i < (int)(m_vLayers.size()); i++)
+		for (int i = (int)(m_vLayers.size()) -1; i > 0; i--)
 		{
 			DmpVectorLayer *layer = m_vLayers[i];
 			sprintf(buff, "<log>draw layer %s</log>", layer->name().c_str());
@@ -1206,7 +1227,9 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 		map<DmpVectorLayer *, shared_ptr<DataCollection>> map_DataCollection;
 
-		for (int i = 0; i < (int)(m_vLayers.size()); i++)
+
+		//for (int i = 0; i < (int)(m_vLayers.size()); i++)
+		for (int i = (int)(m_vLayers.size()) -1; i > 0; i--)
 		{
 			DmpVectorLayer *layer = m_vLayers[i];
 
@@ -1292,7 +1315,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 						if (PQntuples(res) == 0)
 							continue;
 
-						int shapeType = layer->GeometryType();
+						int shapeType = layer->GeomWkbType();
 						shared_ptr<DataCollection> data(new DataCollection());
 						data->InitDataCollection(res, shapeType, this->m_dWidth, this->m_dHeight, 0, m_dR, m_dScaleDenominator, x_dis, y_dis);
 
@@ -1317,7 +1340,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 							if (PQntuples(res) == 0)
 								continue;
 
-							int shapeType = layer->GeometryType();
+							int shapeType = layer->GeomWkbType();
 							shared_ptr<DataCollection> data(new DataCollection());
 							if (!renderHeat)
 							{
@@ -1361,6 +1384,76 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return true;
 	}
 
+	bool DmpWmsRenderer::GetMapLegend( std::stringstream& ab, shared_ptr<legendParamater> pLegendParamater)
+	{
+		clsCrSurf *pClsSurfThis;
+
+		pClsSurfThis = m_pClsSurfBuff; //refresh画图在  buff 中
+		this->DoSetBackGround(pClsSurfThis, m_iBackColor);
+
+		for (int layerType = 0; layerType < 3; layerType++)
+		{
+			
+			for (int i = 0; i < (int)(m_vLayers.size()); i++)
+			{
+				DmpVectorLayer *layer = m_vLayers[i];
+		
+				//if ((ml->m_bVisible) == false)
+				//	continue;
+
+				//if (ml->m_pDataset == nullptr)
+				//	continue;
+
+				//double r1 = ml->m_dUpperScale; // *
+				//double r2 = ml->m_dLowerScale; // *
+				std::shared_ptr<DmapCore_30::Renderer> renderer = layer->GetRenderer30();
+				renderer->DrawLegend(pClsSurfThis, pLegendParamater, layerType, (char *)layer->name().c_str());
+			}
+		}
+
+		this->BufferCopy(m_pClsSurfBuff, m_pClsMaxSurfBuffer);
+		this->BufferCopy(m_pClsSurfBuff, m_pClsSurfDC);
+
+		pLegendParamater->next(nullptr);
+
+		cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, (int)m_dWidth, pLegendParamater->pixYIndex + 10); //cairo_win32_surface_create(hdc);
+		clsCrSurf surfDC(surface);
+		this->BufferCopy(m_pClsSurfDC, &surfDC);
+
+		cairo_surface_write_to_png_stream(surfDC.m_pSurf, cairo_write_func, &ab);
+
+		return true;
+	}
+
+	bool DmpWmsRenderer::GetMapLegend( shared_ptr<legendParamater> pLegendParamater, clsCrSurf* pClsSurf)
+	{
+		if(pClsSurf == nullptr)
+		{
+			pClsSurf = m_pClsSurfBuff;
+		}
+
+		for (int layerType = 0; layerType < 3; layerType++)
+		{
+			for (int i = 0; i < (int)(m_vLayers.size()); i++)
+			{
+				DmpVectorLayer *layer = m_vLayers[i];
+		
+				//if ((ml->m_bVisible) == false)
+				//	continue;
+
+				//if (ml->m_pDataset == nullptr)
+				//	continue;
+
+				//double r1 = ml->m_dUpperScale; // *
+				//double r2 = ml->m_dLowerScale; // *
+				std::shared_ptr<DmapCore_30::Renderer> renderer = layer->GetRenderer30();
+				renderer->DrawLegend(pClsSurf, pLegendParamater, layerType, (char *)layer->name().c_str());
+			}
+			
+		}
+		return true;
+	}
+
 	bool DmpWmsRenderer::ToStream(std::string &responseData)
 	{
 		responseData.reserve(10240);

@@ -13,274 +13,191 @@
 
 namespace DmpWms
 {
-    static cairo_status_t cairo_write_func_print(void *pbuff, const unsigned char *data, unsigned int length)
+	static cairo_status_t cairo_write_func_print(void *pbuff, const unsigned char *data, unsigned int length)
 	{
-		//vector<unsigned char>& vecData = *((vector<unsigned char>*)closure);
+		// vector<unsigned char>& vecData = *((vector<unsigned char>*)closure);
 		string *pResponseData = (string *)pbuff;
-		pResponseData->append((char *)data,length);
+		pResponseData->append((char *)data, length);
 		return CAIRO_STATUS_SUCCESS;
 	}
 
-	DmpMapPrint::DmpMapPrint()
+	DmpMapPrint::DmpMapPrint(DmpWmsParameters::Format outformat)
 	{
-
+		this->format = outformat;
 	}
-/*
-	bool DmpMapPrint::getPrint(std::string &responseData, DmpProject *project,const char* xml,string servername)
-    {
-        string  result_msg;
-
-	    xml_document<> doc;    // character type defaults to char
-	    try
-	    {
-		    doc.parse<0>((char *)xml);
-	    }
-	    catch (...)
-	    {
-		    result_msg = "error:Post参数是XML格式";
-	    }
-
-	    xml_node<char> *node = doc.first_node();
-        if(!node)
-        {
-            return false;
-        }
-
-		 m_height =  1122;
-         m_width = 793;
-
-        xml_node<char> *template_node = node->first_node("template");
-		if(template_node != nullptr)
-		{
-			InitTemplateValue(template_node->value());
-		}
-		
-
-        xml_node<char> *extent_node = node->first_node("extent");
 
-		if(extent_node)
-		{// xmin="" ymin="" xmax="" ymax=""
-			xml_attribute<char> *attr_xmin = node->first_attribute("xmin");
-			xml_attribute<char> *attr_ymin = node->first_attribute("ymin");
-			xml_attribute<char> *attr_xmax = node->first_attribute("xmax");
-			xml_attribute<char> *attr_ymax = node->first_attribute("ymax");
-
-			if(attr_xmin == nullptr || attr_ymin == nullptr ||
-			   attr_xmax == nullptr || attr_ymax == nullptr)
-			{
-				return 0;
-			}
+	bool DmpMapPrint::getPrint(std::string &responseData,const DmpProject *project, const string &xml, const string& servername)
+	{
+		string result_msg;
 
-			xmin = atof( attr_xmax->value());
-        	ymin = atof( attr_ymin->value());
-        	xmax = atof( attr_xmax->value());
-        	ymax = atof( attr_ymax->value());
-		}
+		try
+		{
+			std::stringstream stream(xml);
+			boost::property_tree::ptree ptree;
+			boost::property_tree::read_xml(stream, ptree);
 
-		shared_ptr<MapParameter> pMapParameter(new MapParameter());
+			std::string templateStr = ptree.get<string>("template");
+			InitTemplateValue(templateStr);
 
+			m_height = 1122;
+			m_width = 793;
 
-		shared_ptr<OperationalDmapLayer> dmapLayer(new OperationalDmapLayer());
-        dmapLayer->serviceName = servername;
+			double xmin = ptree.get<double>("extent/xmin");
+			double ymin = ptree.get<double>("extent/ymin");
+			double xmax = ptree.get<double>("extent/xmax");
+			double ymax = ptree.get<double>("extent/ymax");
+			
+			shared_ptr<DmpPrintParameter> pDmpPrintParameter(new DmpPrintParameter());
 
-	    map<string, shared_ptr<WMSServer>>::iterator iter = mapWmsServer.find(dmapLayer->serviceName);
-		if(iter !=mapWmsServer.end())
-		{
- 			dmapLayer->m_wmsServer = iter->second;
-			Rect *rect =  dmapLayer->m_wmsServer->GetExtent();
-		    pMapParameter->InitParameter(xmin,xmax,ymax,ymin,m_width -100,m_height -120);
-			//double scaleDenominator = this->RecalculateScale(rect->m_dRight,rect->m_dLeft,rect->m_dTop,rect->m_dBottom,1022,693);
-		}
-		else
-		{
-			return false;
-		}
-       
+			shared_ptr<DmpPrintWMSService> dmapLayer(new DmpPrintWMSService());
+			dmapLayer->serviceName_ = servername;
 
-		//dmapLayer->serviceName = "土地利用现状";
-		//dmapLayer->m_id = "土地利用现状";
-		//dmapLayer->boxX1 = 683497;
-		//dmapLayer->boxX2 = 695357;
-		//dmapLayer->boxY1 = 2534922;
-		//dmapLayer->boxY2 = 2543053;
+			dmapLayer->project_ = project;
+			//shared_ptr<DmpRectangle> dmpRectangle
+			//Rect *rect = dmapLayer->project_->GetExtent();
+			pDmpPrintParameter->InitParameter(xmin, xmax, ymax, ymin, m_width - 100, m_height - 120);
 
-		Rect* rect =  dmapLayer->m_wmsServer->GetExtent();
+		// dmapLayer->serviceName = "土地利用现状";
+		// dmapLayer->m_id = "土地利用现状";
+		// dmapLayer->boxX1 = 683497;
+		// dmapLayer->boxX2 = 695357;
+		// dmapLayer->boxY1 = 2534922;
+		// dmapLayer->boxY2 = 2543053;
 
-		dmapLayer->boxX1 = xmin;
-		dmapLayer->boxX2 = xmax;
-		dmapLayer->boxY1 = ymin;
-		dmapLayer->boxY2 = ymax;
+		//Rect *rect = dmapLayer->m_wmsServer->GetExtent();
 
-		shared_ptr<DmapPrintLayout> dmapLayout(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout);
+		dmapLayer->boxX1_ = xmin;
+		dmapLayer->boxX2_ = xmax;
+		dmapLayer->boxY1_ = ymin;
+		dmapLayer->boxY2_ = ymax;
 
+		shared_ptr<DmpPrintLayout> dmapLayout(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout);
 
 		dmapLayout->data.push_back(dmapLayer);
-		dmapLayout->localtion_x = 50;
-		dmapLayout->localtion_y = 70;
+		dmapLayout->localtionX_ = 50;
+		dmapLayout->localtionY_ = 70;
 
-		dmapLayout->height = m_height -70;
-		dmapLayout->width = m_width -50;
+		dmapLayout->height_ = m_height - 70;
+		dmapLayout->width_ = m_width - 50;
 
-        this->m_height = m_height;
+		this->m_height = m_height;
 		this->m_width = m_width;
 
-
-		shared_ptr<OperationalGeom> geomLayer_scale(new OperationalGeom());
-        geomLayer_scale->pMapParameter = pMapParameter;
-        geomLayer_scale->type = "scale";
-		shared_ptr<DmapPrintLayout> dmapLayout_scale(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_scale);
-		geomLayer_scale->localtion_x = 150;
-		geomLayer_scale->localtion_y = m_height - 50;
+		shared_ptr<DmpPrintScale> geomLayer_scale(new DmpPrintScale());
+		geomLayer_scale->pPrintParameter_ = pDmpPrintParameter;
+		shared_ptr<DmpPrintLayout> dmapLayout_scale(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout_scale);
+		geomLayer_scale->localtionX_ = 150;
+		geomLayer_scale->localtionY_ = m_height - 50;
 		dmapLayout_scale->data.push_back(geomLayer_scale);
 
-
-		shared_ptr<OperationalGeom> geomLayer_compass(new OperationalGeom());
-        geomLayer_compass->pMapParameter = pMapParameter;
-        geomLayer_compass->type = "compass";
-		shared_ptr<DmapPrintLayout> dmapLayout_compass(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_compass);
-		geomLayer_compass->localtion_x = 80;
-		geomLayer_compass->localtion_y = m_height - 80;
+		shared_ptr<DmpPrintCompass> geomLayer_compass(new DmpPrintCompass());
+		geomLayer_compass->pPrintParameter_ = pDmpPrintParameter;
+		shared_ptr<DmpPrintLayout> dmapLayout_compass(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout_compass);
+		geomLayer_compass->localtionX_ = 80;
+		geomLayer_compass->localtionY_ = m_height - 80;
 		dmapLayout_compass->data.push_back(geomLayer_compass);
 
-		
-		ToPrint(ab);
-        return true;
-    }
-
-	bool DmpMapPrint::getPrint( std::string &responseData, DmpProject* project,
-			string servername,const char* printTemp,const char *bbox)
-    {
-        string  result_msg;
-	    
-		if(printTemp == nullptr || bbox == nullptr)
-		   return false;
-
-		 m_height =  1122;
-         m_width = 793;
-
-    
-		double boxX1, boxY1, boxX2, boxY2;
-		sscanf(bbox, "%lf,%lf,%lf,%lf", &boxY1, &boxX1, &boxY2, &boxX2); // &x1,&y1,&x2,&y2);
+		ToPrint(responseData);
+		return true;
 
-	
-		InitTemplateValue(printTemp);
-	
+		}
+		catch (...)
+		{
 
-		shared_ptr<MapParameter> pMapParameter(new MapParameter());
+		}
+		return false;
+	}
 
+	bool DmpMapPrint::getPrint(std::string &responseData,const DmpProject *project, const string& servername,
+							    const char *printTemp, const char *bbox)
+	{
+		string result_msg;
 
-		shared_ptr<OperationalDmapLayer> dmapLayer(new OperationalDmapLayer());
-        dmapLayer->serviceName = servername;
+		if (printTemp == nullptr || bbox == nullptr)
+			return false;
 
-	    map<string, shared_ptr<WMSServer>>::iterator iter = mapWmsServer.find(dmapLayer->serviceName);
-		if(iter !=mapWmsServer.end())
-		{
-            
+		m_height = 1122;
+		m_width = 793;
 
+		double boxX1, boxY1, boxX2, boxY2;
+		sscanf(bbox, "%lf,%lf,%lf,%lf", &boxY1, &boxX1, &boxY2, &boxX2); // &x1,&y1,&x2,&y2);
 
+		InitTemplateValue(printTemp);
 
-			if (rect_service)
-			{
-				if (rect_service->m_dBottom > 0 && rect_service->m_dRight > 0 && rect_service->m_dLeft > 0 && rect_service->m_dTop > 0)
-				{
-					if (min(boxX1, boxX2) > rect_service->m_dRight || max(boxX1, boxX2) < rect_service->m_dLeft ||
-						min(boxY1, boxY2) > rect_service->m_dTop || max(boxY1, boxY2) < rect_service->m_dBottom)
-					{
-						if (!(min(boxY1, boxY2) > rect_service->m_dRight || max(boxY1, boxY2) < rect_service->m_dLeft ||
-							  min(boxX1, boxX2) > rect_service->m_dTop || max(boxX1, boxX2) < rect_service->m_dBottom))
-						{
-							double x1 = boxX1;
-							boxX1 = boxY1;
-							boxY1 = x1;
-							double x2 = boxX2;
-							boxX2 = boxY2;
-							boxY2 = x2;
-						}
-					}
-				}
-			}
+		shared_ptr<DmpPrintParameter> pDmpPrintParameter(new DmpPrintParameter());
+
+		shared_ptr<DmpPrintWMSService> dmapLayer(new DmpPrintWMSService());
+		dmapLayer->serviceName_ = servername;
+
+		
 			xmin = min(boxX1, boxX2);
 			ymin = min(boxY1, boxY2);
 			xmax = max(boxX1, boxX2);
 			ymax = max(boxY1, boxY2);
-			pMapParameter->InitParameter(xmin,xmax,ymax,ymin,m_width -100,m_height -120);
-			//double scaleDenominator = this->RecalculateScale(rect->m_dRight,rect->m_dLeft,rect->m_dTop,rect->m_dBottom,1022,693);
-		}
-		else
-		{
-			return false;
-		}
-       
-
-		//dmapLayer->serviceName = "土地利用现状";
-		//dmapLayer->m_id = "土地利用现状";
-		//dmapLayer->boxX1 = 683497;
-		//dmapLayer->boxX2 = 695357;
-		//dmapLayer->boxY1 = 2534922;
-		//dmapLayer->boxY2 = 2543053;
+			pDmpPrintParameter->InitParameter(xmin, xmax, ymax, ymin, m_width - 100, m_height - 120);
+			// double scaleDenominator = this->RecalculateScale(rect->m_dRight,rect->m_dLeft,rect->m_dTop,rect->m_dBottom,1022,693);
+		
 
-		Rect* rect =  dmapLayer->m_wmsServer->GetExtent();
+		// dmapLayer->serviceName = "土地利用现状";
+		// dmapLayer->m_id = "土地利用现状";
+		// dmapLayer->boxX1 = 683497;
+		// dmapLayer->boxX2 = 695357;
+		// dmapLayer->boxY1 = 2534922;
+		// dmapLayer->boxY2 = 2543053;
 
-		dmapLayer->boxX1 = xmin;
-		dmapLayer->boxX2 = xmax;
-		dmapLayer->boxY1 = ymin;
-		dmapLayer->boxY2 = ymax;
+	//	Rect *rect = dmapLayer->m_wmsServer->GetExtent();
 
-		shared_ptr<DmapPrintLayout> dmapLayout(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout);
+		dmapLayer->boxX1_ = xmin;
+		dmapLayer->boxX2_ = xmax;
+		dmapLayer->boxY1_ = ymin;
+		dmapLayer->boxY2_ = ymax;
 
+		shared_ptr<DmpPrintLayout> dmapLayout(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout);
 
 		dmapLayout->data.push_back(dmapLayer);
-		dmapLayout->localtion_x = 50;
-		dmapLayout->localtion_y = 70;
+		dmapLayout->localtionX_ = 50;
+		dmapLayout->localtionY_ = 70;
 
-		dmapLayout->height = m_height -120;
-		dmapLayout->width = m_width -100;
+		dmapLayout->height_ = m_height - 120;
+		dmapLayout->width_ = m_width - 100;
 
-        this->m_height = m_height;
+		this->m_height = m_height;
 		this->m_width = m_width;
 
-
-		shared_ptr<OperationalGeom> geomLayer_scale(new OperationalGeom());
-        geomLayer_scale->pMapParameter = pMapParameter;
-        geomLayer_scale->type = "scale";
-		shared_ptr<DmapPrintLayout> dmapLayout_scale(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_scale);
-		geomLayer_scale->localtion_x = 150;
-		geomLayer_scale->localtion_y = m_height - 110;
+		shared_ptr<DmpPrintScale> geomLayer_scale(new DmpPrintScale());
+		geomLayer_scale->pPrintParameter_ = pDmpPrintParameter;
+		shared_ptr<DmpPrintLayout> dmapLayout_scale(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout_scale);
+		geomLayer_scale->localtionX_ = 150;
+		geomLayer_scale->localtionY_ = m_height - 110;
 		dmapLayout_scale->data.push_back(geomLayer_scale);
 
-
-		shared_ptr<OperationalGeom> geomLayer_compass(new OperationalGeom());
-        geomLayer_compass->pMapParameter = pMapParameter;
-        geomLayer_compass->type = "compass";
-		shared_ptr<DmapPrintLayout> dmapLayout_compass(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_compass);
-		geomLayer_compass->localtion_x = 80;
-		geomLayer_compass->localtion_y = m_height - 140;
+		shared_ptr<DmpPrintCompass> geomLayer_compass(new DmpPrintCompass());
+		geomLayer_compass->pPrintParameter_ = pDmpPrintParameter;
+		shared_ptr<DmpPrintLayout> dmapLayout_compass(new DmpPrintLayout());
+		this->vector_DmpPrintLayout.push_back(dmapLayout_compass);
+		geomLayer_compass->localtionX_ = 80;
+		geomLayer_compass->localtionY_ = m_height - 140;
 		dmapLayout_compass->data.push_back(geomLayer_compass);
 
-		
-		ToPrint(ab);
+		ToPrint(responseData);
 		return true;
- 		
-    }
-
+	}
 
-	bool DmpMapPrint::getPrintTempFile(string &responseData,,const char* tempName, const char* bbox)
+	bool DmpMapPrint::getPrintTempFile(string &responseData,const DmpProject *project, const char *tempName, const char *bbox)
 	{
-		string path = "./template/";path += tempName; path += ".xml";
-
+		string path = "../template/";
+		path += tempName;
+		path += ".xml";
 
 		ifstream fin(path.c_str(), ios::binary);
-
 		if (!fin)
 		{
-			string  result_msg = "<Error>打印模板未找到</Error>";
-			ab->AppendString(result_msg.c_str());
+			responseData = "<Error>打印模板未找到</Error>";
 			return false;
 		}
 
@@ -288,113 +205,100 @@ namespace DmpWms
 		buffer << fin.rdbuf();
 		string content(buffer.str());
 		fin.close();
-		return getPrintLayout(ab, pWmsServer,content.c_str(), bbox);
-		//return true;
+		return getPrintLayout(responseData, project, content.c_str(), bbox);
+		// return true;
 	}
 
-	
-	bool DmpMapPrint::getPrintLayout(AppendBuffer *ab,shared_ptr<WMSServer> pWmsServer,
-		const char* xml,const char *bbox)
-    {
-        string  result_msg;
-		if(xml == nullptr || bbox == nullptr)
-		   return false;
-
-		 m_height =  1122;
-         m_width = 793;
-
-	    xml_document<> doc;    // character type defaults to char
-	    try
-	    {
-		    doc.parse<0>((char *)xml);
-			xml_node<char> *node = doc.first_node();
-			if (!node)
-			{
-				result_msg = "<Error>打印模板无法解析</Error>";
-				ab->AppendString(result_msg.c_str());
-				return false;
-			}
+	bool DmpMapPrint::getPrintLayout(string &responseData,const DmpProject *project, const char *xml, const char *bbox)
+	{
+		string result_msg;
+		if (xml == nullptr || bbox == nullptr)
+			return false;
 
-			m_height =  1122;
-         	m_width = 793;
+		m_height = 1122;
+		m_width = 793;
 
-			xml_node<char> *template_node = node->first_node("template");
-			if (template_node != nullptr)
-			{
-				InitTemplateValue(template_node->value());
-			}
+		
+		try
+		{
+			std::stringstream stream(xml);
+			boost::property_tree::ptree ptree;
+			boost::property_tree::read_xml(stream, ptree);
+
+			std::string templateStr = ptree.get<string>("printlayout.template");
+			InitTemplateValue(templateStr);
 
 			double boxX1, boxY1, boxX2, boxY2;
 			sscanf(bbox, "%lf,%lf,%lf,%lf", &boxX1, &boxY1, &boxX2, &boxY2); // &x1,&y1,&x2,&y2);
-			shared_ptr<MapParameter> pMapParameter(new MapParameter());
-			//Rect *rect_service = pWmsServer->GetExtent();
-			//if (rect_service)
+			shared_ptr<DmpPrintParameter> pDmpPrintParameter(new DmpPrintParameter());
+			// Rect *rect_service = pWmsServer->GetExtent();
+			// if (rect_service)
 			//{
 			//	rect_service->GetExtent(boxX1, boxX2, boxY1, boxY2);
-			//}
-						 
+			// }
+
 			xmin = min(boxX1, boxX2);
 			ymin = min(boxY1, boxY2);
 			xmax = max(boxX1, boxX2);
 			ymax = max(boxY1, boxY2);
-			pMapParameter->pWmsService = pWmsServer;
-			pMapParameter->InitParameter(xmin,xmax,ymax,ymin,m_width -100,m_height -120);
-			
-			shared_ptr<DmapPrintLayout> printLayout(new DmapPrintLayout());
-	
-			if(printLayout->ReadXML(node,pMapParameter,result_msg))
-			{  
-				this->vector_dmapPrintLayout.push_back(printLayout);
-				ToPrint(ab);
+			pDmpPrintParameter->pWmsService = project;
+			pDmpPrintParameter->InitParameter(xmin, xmax, ymax, ymin, m_width - 100, m_height - 120);
+
+			shared_ptr<DmpPrintLayout> printLayout(new DmpPrintLayout());
+            boost::property_tree::ptree ptreelayout = ptree.get_child("printlayout");
+			if (printLayout->ReadXML(ptreelayout, pDmpPrintParameter, result_msg))
+			{
+				this->vector_DmpPrintLayout.push_back(printLayout);
+				ToPrint(responseData);
 				return true;
 			}
 		}
-	    catch (...)
-	    {
-		    result_msg = "<Error>error:Post参数是XML格式</Error>";
-	    }
+		catch (const std::exception& e)
+    	{
+        	std::cerr << e.what()  << '\n';
+			result_msg = "<Error>error:Post参数是XML格式</Error>";
+		}
 
-		ab->AppendString(result_msg.c_str());
+		responseData = result_msg;
 		return false;
+	}
 
-    }
-
-	bool DmpMapPrint::ToPrint(AppendBuffer *ab)
+	bool DmpMapPrint::ToPrint(string &responseData)
 	{
-		if(isPicture ==  PrintOutputFormat::SVG)
+		if (format ==  DmpWmsParameters::Format::SVG)
 		{
-			//string path = this->GetFilePath("mapPrint.pdf");
-			cairo_surface_t *surface = cairo_svg_surface_create_for_stream(cairo_write_func_print,ab,
-																(int)m_width,
-																 (int)m_height);
-
-			//cairo_surface_set_fallback_resolution(surface,900,900);
-			clsCrSurf mClsSurfDC(surface,(int)m_width,(int)m_height,false);
-			cairo_set_antialias(mClsSurfDC.m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
+			// string path = this->GetFilePath("mapPrint.pdf");
+			cairo_surface_t *surface = cairo_svg_surface_create_for_stream(cairo_write_func_print, &responseData,
+																		   (int)m_width,
+																		   (int)m_height);
+
+			// cairo_surface_set_fallback_resolution(surface,900,900);
+			clsCrSurf mClsSurfDC(surface, (int)m_width, (int)m_height, false);
+			cairo_set_antialias(mClsSurfDC.m_pCr, cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
 			DoSetBackGround(&mClsSurfDC, 0xffffffff);
 
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
+			for (size_t i = 0; i < vector_DmpPrintLayout.size(); i++)
 			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC,PrintOutputFormat::SVG);
+				shared_ptr<DmpPrintLayout> layout = vector_DmpPrintLayout.at(i);
+				layout->DrawData(&mClsSurfDC,  DmpWmsParameters::Format::SVG);
 			}
 		}
-        else if(isPicture == PrintOutputFormat::PDF)
+		else if (format ==  DmpWmsParameters::Format::PDF)
 		{
-			//string path = this->GetFilePath("mapPrint.pdf");
-			cairo_surface_t *surface = cairo_pdf_surface_create_for_stream(cairo_write_func_print,ab,
-																(int)m_width,
-																 (int)m_height);
-
-			//cairo_surface_set_fallback_resolution(surface,900,900);
-			clsCrSurf mClsSurfDC(surface,(int)m_width,(int)m_height,false);
-			cairo_set_antialias(mClsSurfDC.m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
+			// string path = this->GetFilePath("mapPrint.pdf");
+			cairo_surface_t *surface = cairo_pdf_surface_create_for_stream(cairo_write_func_print, &responseData,
+																		   (int)m_width,
+																		   (int)m_height);
+
+			// cairo_surface_set_fallback_resolution(surface,900,900);
+			clsCrSurf mClsSurfDC(surface, (int)m_width, (int)m_height, false);
+			cairo_set_antialias(mClsSurfDC.m_pCr, cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
 			DoSetBackGround(&mClsSurfDC, 0xffffffff);
 
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
+			for (size_t i = 0; i < vector_DmpPrintLayout.size(); i++)
 			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC,PrintOutputFormat::PDF);
+				shared_ptr<DmpPrintLayout> layout = vector_DmpPrintLayout.at(i);
+				layout->DrawData(&mClsSurfDC,  DmpWmsParameters::Format::PDF);
 			}
 		}
 		else
@@ -403,32 +307,28 @@ namespace DmpWms
 																  (int)m_width,
 																  (int)m_height);
 
-			
-			
-			//cairo_surface_set_fallback_resolution(surface);
-			//double dpix, dpiy;
-			//cairo_surface_get_fallback_resolution(surface,&dpix, &dpiy);
-			//printf("%f,%f",dpix,dpiy);
+			// cairo_surface_set_fallback_resolution(surface);
+			// double dpix, dpiy;
+			// cairo_surface_get_fallback_resolution(surface,&dpix, &dpiy);
+			// printf("%f,%f",dpix,dpiy);
 
 			clsCrSurf mClsSurfDC(surface);
 			DoSetBackGround(&mClsSurfDC, 0xffffffff);
-			
 
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
+			for (size_t i = 0; i < vector_DmpPrintLayout.size(); i++)
 			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC,PrintOutputFormat::PNG);
+				shared_ptr<DmpPrintLayout> layout = vector_DmpPrintLayout.at(i);
+				layout->DrawData(&mClsSurfDC, DmpWmsParameters::Format::PNG);
 			}
 
-			cairo_surface_write_to_png_stream(surface, cairo_write_func_print, ab);
+			cairo_surface_write_to_png_stream(surface, cairo_write_func_print, &responseData);
 		}
 		return true;
 	}
 
-
 	bool DmpMapPrint::InitTemplateValue(string templateValue)
 	{
-		
+
 		if (templateValue == "A4竖" || templateValue == "A4-hoch")
 		{
 			m_height = 1122;
@@ -463,222 +363,81 @@ namespace DmpWms
 	}
 
 
-	bool DmpMapPrint::Test(AppendBuffer *ab,map<string, shared_ptr<WMSServer>> &mapWmsServer,string servername)
-	{
-		//double scaleDenominator = 0;
-
-		shared_ptr<MapParameter> pMapParameter(new MapParameter());
-
-
-		shared_ptr<OperationalDmapLayer> dmapLayer(new OperationalDmapLayer());
-        dmapLayer->serviceName = servername;
 
-	    map<string, shared_ptr<WMSServer>>::iterator iter = mapWmsServer.find(dmapLayer->serviceName);
-		if(iter !=mapWmsServer.end())
-		{
- 			dmapLayer->m_wmsServer = iter->second;
-			Rect *rect =  dmapLayer->m_wmsServer->GetExtent();
-		    pMapParameter->InitParameter(rect->m_dLeft,rect->m_dRight,rect->m_dTop,rect->m_dBottom,693,1022);
-			double scaleDenominator = this->RecalculateScale(rect->m_dRight,rect->m_dLeft,rect->m_dTop,rect->m_dBottom,1022,693);
-		}
-		else
-		{
+	double DmpMapPrint::RecalculateScale(double right, double left, double top, double bottom, double width, double height)
+	{
+		double w = right - left;
+		double h = top - bottom;
+		double oneInchInLayoutUnits = 0.0254;
+		double resolution = 96;
+		if ((w > std::pow(10, 12)) || (w < std::pow(10, -12)))
+			return false;
+		if ((h > std::pow(10, 12)) || (h < std::pow(10, -12)))
 			return false;
-		}
-       
-
-		//dmapLayer->serviceName = "土地利用现状";
-		//dmapLayer->m_id = "土地利用现状";
-		//dmapLayer->boxX1 = 683497;
-		//dmapLayer->boxX2 = 695357;
-		//dmapLayer->boxY1 = 2534922;
-		//dmapLayer->boxY2 = 2543053;
-
-		Rect* rect =  dmapLayer->m_wmsServer->GetExtent();
-
-		dmapLayer->boxX1 = rect->m_dLeft;
-		dmapLayer->boxX2 = rect->m_dRight;
-		dmapLayer->boxY1 = rect->m_dBottom;
-		dmapLayer->boxY2 = rect->m_dTop;
-
-		shared_ptr<DmapPrintLayout> dmapLayout(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout);
-
-
-		dmapLayout->data.push_back(dmapLayer);
-		dmapLayout->localtion_x = 50;
-		dmapLayout->localtion_y = 70;
-
-		dmapLayout->height = 1022;
-		dmapLayout->width = 693;
-
-        this->m_height = 1122;
-		this->m_width = 793;
-
 
-		shared_ptr<OperationalGeom> geomLayer_scale(new OperationalGeom());
-        geomLayer_scale->pMapParameter = pMapParameter;
-        geomLayer_scale->type = "scale";
-		shared_ptr<DmapPrintLayout> dmapLayout_scale(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_scale);
-		dmapLayout_scale->localtion_x = 150;
-		dmapLayout_scale->localtion_y = 1022+20;
-		dmapLayout_scale->data.push_back(geomLayer_scale);
+		long double R1 = width / w;
+		long double R2 = height / h;
+		double r = R1 < R2 ? R1 : R2;
+		if ((r > std::pow(10, 12)) || (r < std::pow(10, -12)))
+			return false;
 
+		// m_dR = R1 < R2 ? R1 : R2;
+		double m_dR = r;
+		double m_dXdis = width / 2.0 - m_dR * (right + left) / 2.0;
+		double m_dYdis = height / 2.0 + m_dR * (top + bottom) / 2.0;
 
-		shared_ptr<OperationalGeom> geomLayer_compass(new OperationalGeom());
-        geomLayer_compass->pMapParameter = pMapParameter;
-        geomLayer_compass->type = "compass";
-		shared_ptr<DmapPrintLayout> dmapLayout_compass(new DmapPrintLayout());
-		this->vector_dmapPrintLayout.push_back(dmapLayout_compass);
-		dmapLayout_compass->localtion_x = 80;
-		dmapLayout_compass->localtion_y = 1022-10;
-		dmapLayout_compass->data.push_back(geomLayer_compass);
+		bool isWGS84 = left <= 180 && right < 180 &&
+					   left >= -180 && right >= -180 &&
+					   top < 90 && bottom < 90;
 
-		
-		if(isPicture ==  DmpWmsParameters::Format::SVG)
+		double scaleDenominator = 0;
+		if (isWGS84)
 		{
-			//string path = this->GetFilePath("mapPrint.pdf");
-			cairo_surface_t *surface = cairo_svg_surface_create_for_stream(cairo_write_func_print,ab,
-																(int)m_width,
-																 (int)m_height);
-
-			//cairo_surface_set_fallback_resolution(surface,900,900);
-			clsCrSurf mClsSurfDC(surface,(int)m_width,(int)m_height,false);
-			cairo_set_antialias(mClsSurfDC.m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
-			DoSetBackGround(&mClsSurfDC, 0xffffffff);
-
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
-			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC,DmpWmsParameters::Format::SVG);
-			}
-		}
-        else if(isPicture == DmpWmsParameters::Format::PDF)
-		{
-			//string path = this->GetFilePath("mapPrint.pdf");
-			cairo_surface_t *surface = cairo_pdf_surface_create_for_stream(cairo_write_func_print,ab,
-																(int)m_width,
-																 (int)m_height);
-
-			//cairo_surface_set_fallback_resolution(surface,900,900);
-			clsCrSurf mClsSurfDC(surface,(int)m_width,(int)m_height,false);
-			cairo_set_antialias(mClsSurfDC.m_pCr,cairo_antialias_t::CAIRO_ANTIALIAS_BEST);
-			DoSetBackGround(&mClsSurfDC, 0xffffffff);
-
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
-			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC,DmpWmsParameters::Format::PDF);
-			}
+			scaleDenominator = (resolution / oneInchInLayoutUnits) * (1 / r) * 111000;
+			// m_dR = r *(96 / 0.0254) *111000 ;//111000 为赤道1经度等于 111000米
 		}
 		else
 		{
-			cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
-																  (int)m_width,
-																  (int)m_height);
-
-			
-			
-			//cairo_surface_set_fallback_resolution(surface);
-			//double dpix, dpiy;
-			//cairo_surface_get_fallback_resolution(surface,&dpix, &dpiy);
-			//printf("%f,%f",dpix,dpiy);
-
-			clsCrSurf mClsSurfDC(surface);
-			DoSetBackGround(&mClsSurfDC, 0xffffffff);
-			
-
-			for (size_t i = 0; i < vector_dmapPrintLayout.size(); i++)
-			{
-				shared_ptr<DmapPrintLayout> layout = vector_dmapPrintLayout.at(i);
-				layout->DrawData(&mClsSurfDC, DmpWmsParameters::Format::PNG);
-			}
-
-			cairo_surface_write_to_png_stream(surface, cairo_write_func_print, ab);
+			scaleDenominator = (resolution / oneInchInLayoutUnits) * 1 / r;
 		}
 
-		
+		return scaleDenominator;
 	}
 
-
-double DmpMapPrint::RecalculateScale(double right, double left, double top, double bottom, double width, double height )
-{
-	double w = right - left;
-	double h = top - bottom;
-	double oneInchInLayoutUnits = 0.0254;
-	double resolution = 96;
-	if ((w > std::pow(10, 12)) || (w < std::pow(10, -12)))
-		return false;
-	if ((h > std::pow(10, 12)) || (h < std::pow(10, -12)))
-		return false;
-
-	long double R1 = width / w;
-	long double R2 = height / h;
-	double r = R1 < R2 ? R1 : R2;
-	if ((r > std::pow(10, 12)) || (r < std::pow(10, -12)))
-		return false;
-
-	//m_dR = R1 < R2 ? R1 : R2;
-	double m_dR = r;
-	double m_dXdis = width / 2.0 - m_dR * (right + left) / 2.0;
-	double m_dYdis = height / 2.0 + m_dR * (top + bottom) / 2.0;
-
-	
-
-
-	bool isWGS84 = left <=180 &&  right <180 &&
-				   left >= -180 &&  right >=-180 &&
-				   top < 90 &&  bottom <90;
-
-	double scaleDenominator = 0;
-	if(isWGS84)
-	{
-	    scaleDenominator = (resolution / oneInchInLayoutUnits)*(1/r)*111000;
-		//m_dR = r *(96 / 0.0254) *111000 ;//111000 为赤道1经度等于 111000米
-	}
-	else
-	{
-	    scaleDenominator= (resolution / oneInchInLayoutUnits) * 1/r;
-	}
-
-	return scaleDenominator;
-}
-
 	string DmpMapPrint::GetFilePath(string path)
 	{
 		char sz[200] = {0};
-        if(GetCurrentFolderPath(sz, sizeof(sz)) > 0)
+		if (GetCurrentFolderPath(sz, sizeof(sz)) > 0)
 		{
 			std::string s;
 			s = sz;
 			size_t t = s.rfind('/');
 			sz[t] = 0;
-			if(path[0]=='/')
+			if (path[0] == '/')
 			{
 				return path;
 			}
-			int i=0;
-		    if(path[0]=='.')
+			int i = 0;
+			if (path[0] == '.')
 			{
-				if(path[1]=='.')
+				if (path[1] == '.')
 				{
 					i++;
-					s= sz;
+					s = sz;
 					t = s.rfind('/');
 					sz[t] = 0;
 				}
 				i++;
 			}
-			if((sz[t]=='/' || sz[t]=='\\')&& (path[i]=='/' || path[i]=='\\'))
+			if ((sz[t] == '/' || sz[t] == '\\') && (path[i] == '/' || path[i] == '\\'))
 			{
 				i++;
 			}
 
-			int j= t;
-			for(j=t;i<path.length(); i++,j++)
+			int j = t;
+			for (j = t; i < path.length(); i++, j++)
 			{
-				if(path[i]=='\\')
+				if (path[i] == '\\')
 				{
 					sz[j] = '/';
 				}
@@ -686,32 +445,29 @@ double DmpMapPrint::RecalculateScale(double right, double left, double top, doub
 				{
 					sz[j] = path[i];
 				}
-
 			}
-			sz[j] =0;
-			//strcat(sz, path.c_str());
+			sz[j] = 0;
+			// strcat(sz, path.c_str());
 			return sz;
 		}
-		else return 0;
-
+		else
+			return 0;
 	}
 
-	int DmpMapPrint::GetCurrentFolderPath(char* processdir, size_t len)
+	int DmpMapPrint::GetCurrentFolderPath(char *processdir, size_t len)
 	{
-        char* path_end;
-        if (readlink("/proc/self/exe", processdir, len) <= 0)
-                return -1;
-        path_end = strrchr(processdir, '/');
-        if (path_end == NULL)
-                return -1;
-        ++path_end;
-        //strcpy(processname, path_end);
-        *path_end = '\0';
-        return (size_t)(path_end - processdir);
+		char *path_end;
+		if (readlink("/proc/self/exe", processdir, len) <= 0)
+			return -1;
+		path_end = strrchr(processdir, '/');
+		if (path_end == NULL)
+			return -1;
+		++path_end;
+		// strcpy(processname, path_end);
+		*path_end = '\0';
+		return (size_t)(path_end - processdir);
 	}
 
-
-
 	bool DmpMapPrint::DoSetBackGround(clsCrSurf *pClsCS, int iColor)
 	{
 		cairo_surface_t *surface = pClsCS->m_pSurf;
@@ -721,9 +477,9 @@ double DmpMapPrint::RecalculateScale(double right, double left, double top, doub
 		//画一个矩形背景
 		cairo_rectangle(cr, 0, 0, surf_w, surf_h);
 		double r, g, b, a;
-		MyUtil::ToCairoColor(iColor, r, g, b, a);
-		cairo_set_source_rgb(cr, r, g, b);
+		//MyUtil::ToCairoColor(iColor, r, g, b, a);
+		cairo_set_source_rgb(cr, 255, 255, 255);
 		cairo_fill(cr);
 		return true;
-	}*/
+	}
 }
\ No newline at end of file

@@ -7,8 +7,8 @@
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
 
-#ifndef __dmpprint_h__
-#define __dmpprint_h__
+#ifndef __dmpmapprint_h__
+#define __dmpmapprint_h__
 
 #include <string>
 #include <string.h>
@@ -16,14 +16,18 @@
 #include <map>
 #include <math.h>
 #include "dmpproject.h"
-#include "../dmpwmsrenderer.h"
-
 #include "clsCrSurf.h"
 #include "clsRect.h"
 #include "clsUtil.h"
+#include <boost/property_tree/ptree.hpp> 
+#include <boost/property_tree/xml_parser.hpp> 
+#include <boost/typeof/typeof.hpp>
+#include "dmpprintlayout.h"
+#include "dmpprintparameter.h"
+#include "../dmpwmsrenderer.h"
+#include "../dmpwmsparameters.h"
 using namespace std;
 using namespace DmapCore_30;
-
 namespace DmpWms
 {
     class DmpMapPrint
@@ -41,7 +45,7 @@ namespace DmpWms
         int m_wkid;
         int m_dpi;
         double m_scale;
-        int isPicture;
+        DmpWmsParameters::Format format;
 
     private:
         bool DoSetBackGround(clsCrSurf *pClsCS, int iColor);
@@ -50,29 +54,28 @@ namespace DmpWms
         int GetCurrentFolderPath(char *processdir, size_t len);
         bool InitTemplateValue(string templateValue);
         bool ToPrint(std::string &responseData);
-
     public:
-        DmpMapPrint();
+        DmpMapPrint(DmpWmsParameters::Format outformat);
     
-        bool getPrint(std::string &responseData, DmpProject* project, const char *xml, string servername);
-        bool getPrint(std::string &responseData, DmpProject* project, const char *printTemp, const char *bbox);
+        bool getPrint(std::string &responseData,const DmpProject* project,const string & xml, const string& servername);
+        bool getPrint(std::string &responseData,const DmpProject* project, const string& servername, const char *printTemp, const char *bbox);
 
         bool getPrintLayout(std::string &responseData,
-                            DmpProject* project,
+                            const DmpProject* project,
                             const char *xml,
                             const char *bbox);
 
         bool getPrintTempFile(std::string &responseData,
-                              DmpProject* project,
+                             const DmpProject* project,
                               const char *tempName,
                               const char *bbox);
 
-        bool Test(std::string &responseData, DmpProject* project, string servername);
+     //   bool Test(std::string &responseData, DmpProject* project, string servername);
 
-       // vector<shared_ptr<DmapPrintLayout>> vector_dmapPrintLayout;
+        vector<shared_ptr<DmpPrintLayout>> vector_DmpPrintLayout;
        // vector<shared_ptr<OperationalLayer>> vector_operationalLayer;
         
     };
 }
 
-#endif // __dmpprint_h__
+#endif // __dmpmapprint_h__

@@ -14,7 +14,7 @@ namespace DmpWms
 {
     class DmpPrintCompass :public DmpPrintLayer
     {
-        private:
+        public:
             string  serviceName;
 
             shared_ptr<DmpPrintParameter> pPrintParameter_ = nullptr;

@@ -25,7 +25,7 @@ namespace DmpWms
 {
     class DmpPrintLayer
     {
-    protected:
+    public:
         std::string id_;
 
         std::string title_;

@@ -7,11 +7,6 @@
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
 #include "dmpprintlayout.h"
-#include "dmpprintrect.h"
-#include "dmpprintscale.h"
-#include "dmpprinttext.h"
-#include "dmpprintcompass.h"
-#include "dmpprintwmsservice.h"
 namespace DmpWms
 {
    bool DmpPrintLayout::DrawData(clsCrSurf* pClsCS,DmpWmsParameters::Format format)
@@ -28,7 +23,7 @@ namespace DmpWms
 
      bool DmpPrintLayout::ReadXML(boost::property_tree::ptree &pt, shared_ptr<DmpPrintParameter> pPrintParameter,string& errorstr)
      {
-         try
+        /* try
          {
              boost::property_tree::ptree ptbound = pt.get_child("bound");
              this->ReadXmlAttribute(ptbound, showbound_, "show");
@@ -43,7 +38,7 @@ namespace DmpWms
          catch(const std::exception& e)
          {
             
-         }
+         }*/
          
          try
          {

@@ -10,6 +10,11 @@
 #ifndef __dmpprintlayout_h__
 #define __dmpprintlayout_h__
 #include "dmpprintlayer.h"
+#include "dmpprintrect.h"
+#include "dmpprintscale.h"
+#include "dmpprinttext.h"
+#include "dmpprintcompass.h"
+#include "dmpprintwmsservice.h"
 #include <vector>
 namespace DmpWms
 {

@@ -18,7 +18,7 @@ namespace DmpWms
     class DmpPrintParameter
     {
      public:
-        DmpProject* pWmsService = nullptr;
+        const DmpProject* pWmsService = nullptr;
 
         bool  isWGS84 = false;
         double dWgs = 111000;

@@ -15,7 +15,7 @@ namespace DmpWms
 {
     class DmpPrintScale :public DmpPrintLayer
     {
-        private:
+        public:
             string  serviceName;
             shared_ptr<DmpPrintParameter> pPrintParameter_ = nullptr;
         public:

@@ -26,7 +26,7 @@ namespace DmpWms
             //不透明度
             double  opacity_;
 
-            DmpProject* project_;
+            const DmpProject* project_;
 
             double boxX1_, boxY1_, boxX2_, boxY2_;