getfeatueinfo2

@@ -4,6 +4,7 @@
 
 SET (MAPSERVER_SRCS
   dmpmapserver.cpp
+  dmpmapserverutil.cpp
   dmppgsql.cpp
   dmppgsqlpool.cpp
   dmppgsqlsourcepools.cpp
@@ -12,10 +13,12 @@ SET (MAPSERVER_SRCS
   wms/dmpwmsparameters.cpp
   wms/dmpwmsgetcapabilities.cpp
   wms/dmpwmsgetmap.cpp
+  wms/dmpwmsgetfeatureinfo.cpp
 )
 
 SET (MAPSERVER_HDRS
   dmpmapserver.h
+  dmpmapserverutil.h
   dmppgsql.h
   dmppgsqlpool.h
   dmppgsqlsourcepools.h
@@ -24,6 +27,7 @@ SET (MAPSERVER_HDRS
   wms/dmpwmsparameters.h
   wms/dmpwmsgetcapabilities.h
   wms/dmpwmsgetmap.h
+  wms/dmpwmsgetfeatureinfo.h
 )
 
 ########################################################

+/**************************************************************************
+* file:              dmpmapserverutil.cpp
+
+* Author:            qingxiongf
+* Date:              2021-12-21 11:02:18
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmpmapserverutil.h"
+#include <string.h>
+
+namespace mapserver
+{ 
+
+    //以GeoJson的形式返回
+void DmpMapServerUtil::responseGeojson(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,const string& srid)
+{
+	double xg1, yg1, xg2, yg2;
+	int havegSet = 0;
+	int count = 0;
+	int pointCountTemp = 0;
+	std::string stringTime;
+	char buff[5000] = {0};
+
+	responseData.append(R"({"type":"FeatureCollection","features":[)");
+	try
+	{
+		int fieldsCount = pPgsqlConn->GetFieldCount();
+		for (int featureIndex = 0; pPgsqlConn->next(); featureIndex++)
+		{
+			
+			if (featureIndex > 0)
+				responseData.append(",");
+			//ab->AppendString(R"({"type":"Feature")");
+
+			string geometry = "";
+			string properties = "";
+
+			for (int i = 0; i < fieldsCount; i++)
+			{
+				const char *sfieldName = pPgsqlConn->GetFieldName(i); //pPgsqlConn->field_name[i].c_str();
+				if (sfieldName == 0)
+				{
+					break;
+				}
+
+				if (strncmp(sfieldName, "RN_RN", 5) == 0)
+					continue;
+				std::string strFieldName = sfieldName;
+				//XML转义
+			    DmpMapServerUtil::toJsonString(strFieldName);
+				sfieldName = strFieldName.c_str();
+
+				if (strFieldName == "geometry_as_geojson")
+				{
+					geometry = pPgsqlConn->getString(i);
+					continue;
+				}
+				else
+				{
+					const char *v =  pPgsqlConn->getString(i);
+					std::sprintf(buff, R"(,"%s":"%s")", sfieldName, v);
+					properties += buff;
+				}
+			}
+
+			if (geometry != "")
+			{
+				responseData.append(R"(,"geometry":)");
+				responseData.append(geometry.c_str());
+			}
+
+			if (properties != "")
+			{
+				responseData.append(R"(,"properties":)");
+				properties[0] = '{';
+				responseData.append(properties.c_str());
+				responseData.append("}");
+			}
+			responseData.append("}");
+			count++;
+		}
+	}
+	catch (...)
+	{
+		return;
+	}
+
+	responseData.append("]}");
+
+	return;
+}
+
+
+	void DmpMapServerUtil::toJsonString(std::string &s)
+	{
+		const char *str1 = s.c_str();
+		if (strstr(str1, "\\"))
+		{
+			s = replace(s, "\\", "\\\\");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "/"))
+		{
+			s = replace(s, "/", "\\/");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\""))
+		{
+			s = replace(s, "\"", "\\\"");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\\r"))
+		{
+			s = replace(s, "\\r", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\\n"))
+		{
+			s = replace(s, "\\n", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\r"))
+		{
+			s = replace(s, "\r", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\n"))
+		{
+			s = replace(s, "\n", "");
+			str1 = s.c_str();
+		}
+		if (strstr(str1, "\t"))
+		{
+			s = replace(s, "'", "\\t");
+		}
+		return;
+	}
+
+    std::string DmpMapServerUtil::replace(std::string strsrc, std::string strfind, std::string strrep)
+    {
+         for(std::string::size_type pos(0); pos!=std::string::npos;pos+=strrep.length())   
+         {     
+            if((pos=strsrc.find(strfind,pos))!=std::string::npos)     
+                strsrc.replace(pos,strfind.length(),strrep);     
+            else   
+                break;     
+        }
+        return   strsrc;   
+    }
+}
\ No newline at end of file

+/**************************************************************************
+* file:              dmpmapserverutil.h
+
+* Author:            qingxiongf
+* Date:              2021-12-21 11:02:10
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpmapserverutil_h__
+#define __dmpmapserverutil_h__
+
+#include <string>
+#include <memory>
+#include "dmppgsqlsourcepools.h"
+
+namespace mapserver 
+{
+    class DmpMapServerUtil
+    {
+    public:
+        static void responseGeojson(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,const std::string &srid);
+        static void toJsonString(std::string &s);
+        static std::string replace(std::string strsrc, std::string strfind, std::string strrep);
+    };
+}
+
+#endif // __dmpmapserverutil_h__

@@ -234,8 +234,28 @@ namespace mapserver
 
 	bool DmpPgsql::TryReconn()
 	{
-		if (Connect(this->sConnInfo_.c_str()))return true;
+		if (Connect(this->sConnInfo_.c_str()))
+			return true;
 		return false;
 	}
 
+	int DmpPgsql::GetRowCount()
+	{
+		return PQnparams(pPGresult_);
+	}
+
+	int DmpPgsql::GetFieldCount()
+	{
+		return PQnfields(pPGresult_);
+	}
+
+	char *DmpPgsql::GetFieldName(int index)
+	{
+		return PQfname(pPGresult_, index);
+	}
+
+	int DmpPgsql::GetFieldType(int index)
+	{
+		return PQftype(pPGresult_, index);
+	}
 }
\ No newline at end of file

@@ -61,10 +61,11 @@ namespace mapserver
 
 		PGresult* GetPGresult(){ return pPGresult_;}
 
-    //    int GetRowCount();
-	//	int GetFieldCount();
-	//	char *GetFieldName(int index);
-	//	int GetFieldType(int index);
+		
+        int GetRowCount();
+		int GetFieldCount();
+		char* GetFieldName(int index);
+		int GetFieldType(int index);
 	public:
 		
 		//void PrepareFieldhead();

@@ -6,7 +6,7 @@
 * Email:             qingxiongf@chinadci.com
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
-#include "dmpwmsgetcapabilities.h"
+#include "dmpwmsgetfeatureinfo.h"
 #include "dmpwmsrenderer.h"
 #include "dmpserverresponse.h"
 #include "dmpserverrequest.h"
@@ -14,74 +14,73 @@
 #include <memory>
 namespace DmpWms
 {
-     void writeFeatureInfo(const DmpServerContext &context,const DmpWmsParameters& params, 
-                             const  DmpProject* project,
-                             bool projectSettings )
-    {
-		string exception = WmsGetMap(context,params, project,projectSettings);
-		if(exception.length() >0)
+	void writeFeatureInfo(const DmpServerContext &context, const DmpWmsParameters &params,
+						  const DmpProject *project,
+						  bool projectSettings)
+	{
+		string exception = WmsGetFeatureInfo(context, params, project, projectSettings);
+		if (exception.length() > 0)
 		{
-			
 		}
-    }
+	}
 
-
-    std::string WmsGetFeatureInfo(const DmpServerContext &context, const DmpWmsParameters& params, 
-                             const  DmpProject* project,  bool projectSettings)
-   {
-        try
+	std::string WmsGetFeatureInfo(const DmpServerContext &context, const DmpWmsParameters &params,
+								  const DmpProject *project, bool projectSettings)
+	{
+		try
 		{
-		
+
 			double boxX1, boxY1, boxX2, boxY2;
-            std::string srs = params.Srs();
-            std::string recbox = params.BBox();
+			std::string srs = params.Srs();
+			std::string recbox = params.BBox();
 
-            int width = params.Width();
-            int height = params.Height();
+			int width = params.Width();
+			int height = params.Height();
 
-			if (boost::iequals(srs, "CRS:84")|| boost::iequals(srs, "EPSG:4326"))
+			if (boost::iequals(srs, "CRS:84") || boost::iequals(srs, "EPSG:4326"))
 			{
-				sscanf(recbox.c_str(), "%lf,%lf,%lf,%lf", &boxY1, &boxX1, &boxY2, &boxX2); 
+				sscanf(recbox.c_str(), "%lf,%lf,%lf,%lf", &boxY1, &boxX1, &boxY2, &boxX2);
 			}
 			else
 			{
-				sscanf(recbox.c_str(), "%lf,%lf,%lf,%lf", &boxX1, &boxY1, &boxX2, &boxY2); 
+				sscanf(recbox.c_str(), "%lf,%lf,%lf,%lf", &boxX1, &boxY1, &boxX2, &boxY2);
 			}
-			
+
 			//stbstb:应该检查大量地方的 width和height不为零 ,char* regionDefs
-			if (width <= 0 || height <= 0) return  "width和height 参数错误";
-		
+			if (width <= 0 || height <= 0)
+				return "width和height 参数错误";
+
 			DmpWms::DmpWmsRenderer mapRenderer(height, width);
 
-            std::string layers = params.QueryLayers();
-			if (layers !="")
+			std::string layers = params.QueryLayers();
+			if (layers != "")
 			{
 				mapRenderer.AddWmsMapLayers(project);
 			}
 			else
 			{
 				char strlayers[1000] = {0};
-				strcpy(strlayers,(char *)layers.c_str());
+				strcpy(strlayers, (char *)layers.c_str());
 				mapRenderer.AddWmsMapLayers(project, strlayers);
 			}
 
-            int x = params.X();
-            int y = params.Y();
-            int featureCount = params.FeatureCount();
-			
-			shared_ptr<Rect> rect (new Rect(boxY2, boxX2, boxY1, boxX1));
+			int x = params.X();
+			int y = params.Y();
+			int featureCount = params.FeatureCount();
+
+			shared_ptr<Rect> rect(new Rect(boxY2, boxX2, boxY1, boxX1));
 			mapRenderer.SetExtent(rect);
-            string responseData;
-	        mapRenderer.GetFeatureInfo(responseData,  "",  x,  y,featureCount);
+			string responseData;
+			mapRenderer.GetFeatureInfo(responseData, x, y, featureCount);
 			context.response()->removeHeader("Content-Type");
-    		context.response()->setHeader("Content-Type", "image/png");
+			context.response()->setHeader("Content-Type", "image/png");
 			context.response()->write(responseData);
 			return "";
 		}
 		catch (const std::exception &e)
 		{
 			std::cerr << " GetMap " << e.what() << '\n';
-			return  e.what();
+			return e.what();
 		}
-   }
+	}
 }
\ No newline at end of file

@@ -6,36 +6,40 @@
 * Email:             qingxiongf@chinadci.com
 * copyright:         广州城市信息研究所有限公司
 ***************************************************************************/
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
+#include <boost/typeof/typeof.hpp>
 #include "dmpwmsrenderer.h"
+#include "dmpmapserverutil.h"
 #include <sstream>
 #include <stdarg.h>
 #include <set>
 #include <png.h>
 #include <math.h>
+
 namespace DmpWms
 {
 	static cairo_status_t cairo_write_func(void *pbuff, const unsigned char *data, unsigned int length)
 	{
-		std::string* responseData  = (std::string*)pbuff;
-		responseData->append((char*)data,length);
+		std::string *responseData = (std::string *)pbuff;
+		responseData->append((char *)data, length);
 		return CAIRO_STATUS_SUCCESS;
 	}
 
 	static void png_write_data_to_buffer(png_structp png_ptr, png_bytep data, png_size_t length)
 	{
-		
-  		std::string* responseData =  (std::string*)png_get_io_ptr(png_ptr);
-		responseData->append((char*)data,length);
+
+		std::string *responseData = (std::string *)png_get_io_ptr(png_ptr);
+		responseData->append((char *)data, length);
 	}
 
 	static void png_flush_data(png_structp png_ptr)
-    {
-
-    }
+	{
+	}
 
-    DmpWmsRenderer::DmpWmsRenderer(double height, double width)
-    {
-        rasterBufferObj* rb = (rasterBufferObj*)malloc(sizeof(rasterBufferObj));
+	DmpWmsRenderer::DmpWmsRenderer(double height, double width)
+	{
+		rasterBufferObj *rb = (rasterBufferObj *)malloc(sizeof(rasterBufferObj));
 		initializeRasterBufferCairo(rb, width, height);
 
 		pRasterBufferObj = rb;
@@ -47,9 +51,9 @@ namespace DmpWms
 		m_vLayers = {};
 		m_WMSServers = {};
 		m_iN = 1;
-		m_iBackColor = 0xffffffff;																				   //背景默认白色
-		cairo_surface_t *surface = cairo_image_surface_create_for_data(rb->data.rgba.pixels,  
-		CAIRO_FORMAT_ARGB32, (int)m_dWidth, (int)m_dHeight,rb->data.rgba.row_step); //cairo_win32_surface_create(hdc);
+		m_iBackColor = 0xffffffff; //背景默认白色
+		cairo_surface_t *surface = cairo_image_surface_create_for_data(rb->data.rgba.pixels,
+																	   CAIRO_FORMAT_ARGB32, (int)m_dWidth, (int)m_dHeight, rb->data.rgba.row_step); //cairo_win32_surface_create(hdc);
 		m_pClsSurfDC = new clsCrSurf(surface);
 		cairo_surface_t *surfaceBuffer = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, (int)m_dWidth, (int)m_dHeight);
 		m_pClsSurfBuff = new clsCrSurf(surfaceBuffer);
@@ -57,33 +61,33 @@ namespace DmpWms
 		m_pClsMaxSurfBuffer = new clsCrSurf(maxSurfaceBuffer);
 
 		m_pExtent = shared_ptr<Rect>(new Rect(0, 0, 0, 0));
-    }
-
-    int DmpWmsRenderer::initializeRasterBufferCairo(rasterBufferObj *rb, int width, int height)
-    {
-        rb->type = MS_BUFFER_BYTE_RGBA;
-        rb->width = width;
-        rb->height = height;
-        rb->data.rgba.pixel_step = 4;
-        rb->data.rgba.row_step = width * 4;
-        rb->data.rgba.pixels = (unsigned char*)calloc(width*height*4,sizeof(unsigned char));
-        rb->data.rgba.r = &(rb->data.rgba.pixels[2]);
-        rb->data.rgba.g = &(rb->data.rgba.pixels[1]);
-        rb->data.rgba.b = &(rb->data.rgba.pixels[0]);
-        rb->data.rgba.a = &(rb->data.rgba.pixels[3]);
-        return MS_SUCCESS;
-    }
+	}
+
+	int DmpWmsRenderer::initializeRasterBufferCairo(rasterBufferObj *rb, int width, int height)
+	{
+		rb->type = MS_BUFFER_BYTE_RGBA;
+		rb->width = width;
+		rb->height = height;
+		rb->data.rgba.pixel_step = 4;
+		rb->data.rgba.row_step = width * 4;
+		rb->data.rgba.pixels = (unsigned char *)calloc(width * height * 4, sizeof(unsigned char));
+		rb->data.rgba.r = &(rb->data.rgba.pixels[2]);
+		rb->data.rgba.g = &(rb->data.rgba.pixels[1]);
+		rb->data.rgba.b = &(rb->data.rgba.pixels[0]);
+		rb->data.rgba.a = &(rb->data.rgba.pixels[3]);
+		return MS_SUCCESS;
+	}
 
 	DmpWmsRenderer::~DmpWmsRenderer()
 	{
 		m_vLayers.clear();
-		if(this->pRasterBufferObj)
+		if (this->pRasterBufferObj)
 		{
 			cairo_surface_finish(m_pClsSurfDC->m_pSurf);
-			if( this->pRasterBufferObj->data.rgba.pixels)
+			if (this->pRasterBufferObj->data.rgba.pixels)
 			{
 				free(this->pRasterBufferObj->data.rgba.pixels);
-				this->pRasterBufferObj->data.rgba.pixels  = nullptr;
+				this->pRasterBufferObj->data.rgba.pixels = nullptr;
 			}
 			free(this->pRasterBufferObj);
 			this->pRasterBufferObj = nullptr;
@@ -107,7 +111,7 @@ namespace DmpWms
 		}
 	}
 
-    std::string DmpWmsRenderer::format(const char *fmt, ...)
+	std::string DmpWmsRenderer::format(const char *fmt, ...)
 	{
 		va_list argptr;
 		int cnt;
@@ -121,9 +125,7 @@ namespace DmpWms
 		return buffer;
 	}
 
-
-    
-	string DmpWmsRenderer::GetDrawSQL(DmpVectorLayer* layer, Rect *pRect, const char *layerdef)
+	string DmpWmsRenderer::GetDrawSQL(DmpVectorLayer *layer, Rect *pRect, const char *layerdef)
 	{
 		if (layer == 0 || layer->geom().size() == 0)
 			return "";
@@ -131,7 +133,7 @@ namespace DmpWms
 		//char sql[6000];
 		string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-		shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+		shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
 		//	int renType = renderer->RendererType();
 		vector<string> vFieldName;
@@ -166,18 +168,16 @@ namespace DmpWms
 			ss += " and  ";
 			ss += layerdef;
 		}
-   		ss +=  format(" limit %d ",MAXCOUNT);
+		ss += format(" limit %d ", MAXCOUNT);
 		//ss += " limit 40000 ";
 
 		double t = pRect->m_dTop, r = pRect->m_dRight, b = pRect->m_dBottom, l = pRect->m_dLeft;
 		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());
+		//printf("%s\r\n",sql.c_str());
 		return sql;
 	}
 
-
-	
-	string DmpWmsRenderer::GetRegionQuerySQL(DmpVectorLayer* layer,Rect *pRect,string srid, const char *regionDef,const char *layerdef)
+	string DmpWmsRenderer::GetRegionQuerySQL(DmpVectorLayer *layer, Rect *pRect, string srid, const char *regionDef, const char *layerdef)
 	{
 		if (layer == 0 || layer->geom().size() == 0)
 			return "";
@@ -186,69 +186,65 @@ namespace DmpWms
 		if (pPgsqlConn != nullptr)
 		{
 			double t = pRect->m_dTop, r = pRect->m_dRight, b = pRect->m_dBottom, l = pRect->m_dLeft;
-		  // if(pPgsqlConn->ExecWait(sql.c_str()) && pPgsqlConn->next())
-		   {
-			  		// const char * polygon = pPgsqlConn->getString(0);
-					string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
+			// if(pPgsqlConn->ExecWait(sql.c_str()) && pPgsqlConn->next())
+			{
+				// const char * polygon = pPgsqlConn->getString(0);
+				string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-					shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+				shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
-					//	int renType = renderer->RendererType();
-					vector<string> vFieldName;
-					renderer->TryAddField(vFieldName);
+				//	int renType = renderer->RendererType();
+				vector<string> vFieldName;
+				renderer->TryAddField(vFieldName);
 
-					int length = (int)(vFieldName.size());
-					for (int i = 0; i < length; i++)
-					{
-						string filename = vFieldName[i];
-						ss += ",\"" + (filename) + "\"::varchar ";
-					}
+				int length = (int)(vFieldName.size());
+				for (int i = 0; i < length; i++)
+				{
+					string filename = vFieldName[i];
+					ss += ",\"" + (filename) + "\"::varchar ";
+				}
 
-					string tableName = layer->name(); //layer->name();
-					string shapeName = layer->geom();
-					shared_ptr<DmpVectorThinLayer> pVectorThinLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
+				string tableName = layer->name(); //layer->name();
+				string shapeName = layer->geom();
+				shared_ptr<DmpVectorThinLayer> pVectorThinLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
 
-					if (pVectorThinLayer != nullptr)
-					{
-						tableName = pVectorThinLayer->tableName();
-					}
+				if (pVectorThinLayer != nullptr)
+				{
+					tableName = pVectorThinLayer->tableName();
+				}
 
-					ss += " FROM \"%s\".\"%s\"  "; // 这个 %s 是tableName
-					ss += " WHERE  ST_Intersects( (select (ST_Intersection(ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),'%s'::Geometry)) ),\"%s\" )";
-					if (layer->wherestr().length() > 0)
-					{
-						ss += " and  ";
-						ss += layer->wherestr();
-					}
+				ss += " FROM \"%s\".\"%s\"  "; // 这个 %s 是tableName
+				ss += " WHERE  ST_Intersects( (select (ST_Intersection(ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),'%s'::Geometry)) ),\"%s\" )";
+				if (layer->wherestr().length() > 0)
+				{
+					ss += " and  ";
+					ss += layer->wherestr();
+				}
 
 				if (layerdef != nullptr && strcmp(layerdef, "") != 0)
 				{
 					ss += " and  ";
 					ss += layerdef;
 				}
-				ss +=  format(" limit %d ",MAXCOUNT);
-			//	ss += " limit 40000 ";
+				ss += format(" limit %d ", MAXCOUNT);
+				//	ss += " limit 40000 ";
 				//size_t size = strlen(regionDef);
 				std::string sql1 = format(ss.c_str(), shapeName.c_str(), layer->schema().c_str(),
-				 tableName.c_str(),l,t,  r,t, r, b,  l, b  ,l, t,srid.c_str(), regionDef,shapeName.c_str() );
-
-				 //	printf("%s\r\n",sql1.c_str());
+										  tableName.c_str(), l, t, r, t, r, b, l, b, l, t, srid.c_str(), regionDef, shapeName.c_str());
 
-               return sql1;
-		  }
-		 //  else
-		   {
-			   return "";
-		   }
+				//	printf("%s\r\n",sql1.c_str());
 
-						   
+				return sql1;
+			}
+			//  else
+			{
+				return "";
+			}
 		}
 		return "";
 	}
 
-	
-	
-	string DmpWmsRenderer::GetRegionQuerySQL(DmpVectorLayer* layer,Rect *pRect,string srid, const string &regionLayerName,const string &regionDef,const char *layerdef)
+	string DmpWmsRenderer::GetRegionQuerySQL(DmpVectorLayer *layer, Rect *pRect, string srid, const string &regionLayerName, const string &regionDef, const char *layerdef)
 	{
 		if (layer == 0 || layer->geom().size() == 0)
 			return "";
@@ -258,62 +254,59 @@ namespace DmpWms
 		{
 			double t = pRect->m_dTop, r = pRect->m_dRight, b = pRect->m_dBottom, l = pRect->m_dLeft;
 			size_t pos = regionDef.find("not in");
-			if(pos == string::npos)
+			if (pos == string::npos)
 			{
-				sql =  format( "select ST_Intersection( \
+				sql = format("select ST_Intersection( \
 ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 (select st_union(geom) from  \"%s\" where %s))",
-    l,t,  r,t, r, b,  l, b  ,l, t, srid.c_str(),regionLayerName.c_str(),regionDef.c_str());
+							 l, t, r, t, r, b, l, b, l, t, srid.c_str(), regionLayerName.c_str(), regionDef.c_str());
 			}
 			else
 			{
 				string field = regionDef.substr(0, pos);
-				string exp = regionDef.substr(pos+6);
-				sql =  format( "select (ST_Difference( \
+				string exp = regionDef.substr(pos + 6);
+				sql = format("select (ST_Difference( \
 ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 (select st_union(geom) from  \"%s\" where %s in %s)))",
-    l,t,  r,t, r, b,  l, b  ,l, t, srid.c_str(), regionLayerName.c_str(),field.c_str(),exp.c_str());
+							 l, t, r, t, r, b, l, b, l, t, srid.c_str(), regionLayerName.c_str(), field.c_str(), exp.c_str());
 
 				//regionDef = StringHelp::
 			}
 
-            
-
-
-		 // if(pPgsqlConn->ExecWait(sql.c_str()) && pPgsqlConn->next())
-		   {
-			  		// const char * polygon = pPgsqlConn->getString(0);
-					string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
+			// if(pPgsqlConn->ExecWait(sql.c_str()) && pPgsqlConn->next())
+			{
+				// const char * polygon = pPgsqlConn->getString(0);
+				string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-					shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+				shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
-					//	int renType = renderer->RendererType();
-					vector<string> vFieldName;
-					renderer->TryAddField(vFieldName);
+				//	int renType = renderer->RendererType();
+				vector<string> vFieldName;
+				renderer->TryAddField(vFieldName);
 
-					int length = (int)(vFieldName.size());
-					for (int i = 0; i < length; i++)
-					{
-						string filename = vFieldName[i];
-						ss += ",\"" + (filename) + "\"::varchar ";
-					}
+				int length = (int)(vFieldName.size());
+				for (int i = 0; i < length; i++)
+				{
+					string filename = vFieldName[i];
+					ss += ",\"" + (filename) + "\"::varchar ";
+				}
 
-					string tableName = layer->name(); //layer->name();
-					string shapeName = layer->geom();
-					shared_ptr<DmpVectorThinLayer> pVectorThinLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
+				string tableName = layer->name(); //layer->name();
+				string shapeName = layer->geom();
+				shared_ptr<DmpVectorThinLayer> pVectorThinLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
 
-					if (pVectorThinLayer != nullptr)
-					{
-						tableName = pVectorThinLayer->tableName();
-					}
+				if (pVectorThinLayer != nullptr)
+				{
+					tableName = pVectorThinLayer->tableName();
+				}
 
-					ss += " FROM \"%s\".\"%s\"  "; // 这个 %s 是tableName
-					ss += " WHERE  \"%s\" && \'BOX3D(%lf %lf,%lf %lf)\'::box3d and  ST_Intersects( (%s),\"%s\" )"; //'%s'::Geometry
-					if (layer->wherestr().length() > 0)
-					{
-						ss += " and  ";
-						ss += layer->wherestr();
-					}
+				ss += " FROM \"%s\".\"%s\"  ";																   // 这个 %s 是tableName
+				ss += " WHERE  \"%s\" && \'BOX3D(%lf %lf,%lf %lf)\'::box3d and  ST_Intersects( (%s),\"%s\" )"; //'%s'::Geometry
+				if (layer->wherestr().length() > 0)
+				{
+					ss += " and  ";
+					ss += layer->wherestr();
+				}
 
 				if (layerdef != nullptr && strcmp(layerdef, "") != 0)
 				{
@@ -321,27 +314,24 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 					ss += layerdef;
 				}
 
-				ss +=  format(" limit %d ",MAXCOUNT);
+				ss += format(" limit %d ", MAXCOUNT);
 
 				std::string sql1 = format(ss.c_str(), shapeName.c_str(), layer->schema().c_str(),
-				tableName.c_str(), shapeName.c_str(), l, b, r, t,  sql.c_str(),shapeName.c_str() );
+										  tableName.c_str(), shapeName.c_str(), l, b, r, t, sql.c_str(), shapeName.c_str());
 
 				//printf("%s\r\n",sql1.c_str());
 
-               return sql1;
-		   }
-		   //else
-		   {
-			   return "";
-		   }
-
-						   
+				return sql1;
+			}
+			//else
+			{
+				return "";
+			}
 		}
-		 return "";
+		return "";
 	}
-	
 
-	string DmpWmsRenderer::GetDrawSQLAll_Catch(DmpVectorLayer* layer, shared_ptr<DmpVectorThinLayer> pVectorThinLayer)
+	string DmpWmsRenderer::GetDrawSQLAll_Catch(DmpVectorLayer *layer, shared_ptr<DmpVectorThinLayer> pVectorThinLayer)
 	{
 		if (layer == 0 || layer->geom().size() == 0)
 			return "";
@@ -349,7 +339,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		//char sql[6000];
 		string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-		shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+		shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
 		//	int renType = renderer->RendererType();
 		vector<string> vFieldName;
@@ -383,15 +373,15 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return sql;
 	}
 
-	string DmpWmsRenderer::GetDrawSQLAll(DmpVectorLayer* layer)
+	string DmpWmsRenderer::GetDrawSQLAll(DmpVectorLayer *layer)
 	{
-		if (layer == 0  || layer->geom().size() == 0)
+		if (layer == 0 || layer->geom().size() == 0)
 			return "";
 
 		//char sql[6000];
 		string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-		shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+		shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
 		//	int renType = renderer->RendererType();
 		vector<string> vFieldName;
@@ -421,15 +411,15 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return sql;
 	}
 
-	string DmpWmsRenderer::GetDrawSQLAllOrderby(DmpVectorLayer* layer)
+	string DmpWmsRenderer::GetDrawSQLAllOrderby(DmpVectorLayer *layer)
 	{
-		if (layer == 0  || layer->geom().size() == 0)
+		if (layer == 0 || layer->geom().size() == 0)
 			return "";
 
 		//char sql[6000];
 		string ss = "SELECT \"%s\" "; //这个 %s 是表示　shape 字段
 
-		shared_ptr<Renderer>  renderer = layer->GetRenderer30();
+		shared_ptr<Renderer> renderer = layer->GetRenderer30();
 
 		//	int renType = renderer->RendererType();
 		vector<string> vFieldName;
@@ -451,7 +441,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			ss += layer->wherestr();
 		}
 
-        ss +=  format(" limit %d ",MAXCOUNT);
+		ss += format(" limit %d ", MAXCOUNT);
 
 		string tableName = layer->name();
 		string shapeName = layer->geom();
@@ -461,9 +451,9 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return sql;
 	}
 
-	string DmpWmsRenderer::GetCountSQL(DmpVectorLayer* layer)
+	string DmpWmsRenderer::GetCountSQL(DmpVectorLayer *layer)
 	{
-		if (layer == 0  || layer->geom().size() == 0)
+		if (layer == 0 || layer->geom().size() == 0)
 			return "";
 
 		//char sql[6000];
@@ -488,13 +478,11 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return sql;
 	}
 
-	string DmpWmsRenderer::GetFeatureInfoSQL(DmpVectorLayer* layer, double x, double y, double dis,int feature_count)
+	string DmpWmsRenderer::GetFeatureInfoSQL(DmpVectorLayer *layer, double x, double y, double dis, int feature_count)
 	{
 		if (layer == 0 || layer->geom().size() == 0)
 			return "";
 
-		
-
 		string ss = "SELECT  "; //这个 %s 是表示　shape 字段
 
 		string fields_str = "";
@@ -504,9 +492,9 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		{
 
 			char tablesql_buff[300];
-			sprintf(tablesql_buff, "select column_name,data_type from information_schema.columns where table_schema = '%s' and table_name = '%s'",
-					layer->schema().c_str(),
-					layer->name().c_str());
+			std::sprintf(tablesql_buff, "select column_name,data_type from information_schema.columns where table_schema = '%s' and table_name = '%s'",
+						 layer->schema().c_str(),
+						 layer->name().c_str());
 
 			int returnResult = pPgsqlConn->ExecWait(tablesql_buff);
 			if (!returnResult)
@@ -515,10 +503,10 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 			else
 			{
-			    
+
 				for (int i = 0; pPgsqlConn->next(); i++)
 				{
-					if (i > 0 && fields_str.length() >0 && fields_str[fields_str.length() -1]!=',')
+					if (i > 0 && fields_str.length() > 0 && fields_str[fields_str.length() - 1] != ',')
 					{
 						fields_str += ",";
 					}
@@ -572,8 +560,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 		if (layer->wherestr().length() > 0)
 		{
-			ss += format("where %s and ", layer->wherestr().c_str() );
-	
+			ss += format("where %s and ", layer->wherestr().c_str());
 		}
 		else
 		{
@@ -584,60 +571,51 @@ 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->crs().srid(), dis, feature_count);
+		sql += format(" ST_DWithin(\"%s\", ST_GeometryFromText('POINT(%f %f)',%s), %f) limit %d ",
+					  shapeName.c_str(), x, y, layer->crs().srid(), dis, feature_count);
 		//cout<<sql.c_str() <<endl;
 		return sql;
 	}
 
-	
-	bool DmpWmsRenderer::GetFeatureInfo(std::string &responseData, int gmlVersion, int x, int y, int feature_count)
+	bool DmpWmsRenderer::GetFeatureInfo(std::string &responseData, int x, int y, int feature_count)
 	{
-		if(m_dR == 0)
+		if (m_dR == 0)
 			return false;
 		//double x0 = m_dR * x + m_dXdis;
 		//double y0 = -m_dR * y + m_dYdis;
 
-		double x0 =(x - m_dXdis)/ m_dR ;
-		double y0 = (m_dYdis -y )/m_dR ;
-		double dis = 1/m_dR;
-	
+		double x0 = (x - m_dXdis) / m_dR;
+		double y0 = (m_dYdis - y) / m_dR;
+		double dis = 1 / m_dR;
 
-
-		for (int i = (int)(m_vLayers.size()) -1; i >=0; i--)
+		for (int i = (int)(m_vLayers.size()) - 1; i >= 0; i--)
 		{
-			DmpVectorLayer* layer = (DmpVectorLayer*)m_vLayers[i];
+			DmpVectorLayer *layer = (DmpVectorLayer *)m_vLayers[i];
 
 			//double r1 = layer->m_dUpperScale; // *
 			//double r2 = layer->m_dLowerScale; // *
 
-
 			///if ((this->m_dScaleDenominator > r1 || this->m_dScaleDenominator < r2 || ml->m_pRenderer == 0))
 			//	continue;
 
 			double start = clock();
 			double cost, cost2;
 
-			string sql = this->GetFeatureInfoSQL(layer, x0, y0, dis,feature_count); //sql语句中使用 ::box
+			string sql = this->GetFeatureInfoSQL(layer, x0, y0, dis, feature_count); //sql语句中使用 ::box
 			if (sql == "")
 				continue;
 
 			string layerName = layer->name();
-			//const char *ss__ = "";
-			//const char **pmsg = &ss__;
 			try
 			{
-				shared_ptr<DmpPgsql> pPgsqlConn  = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
+				shared_ptr<DmpPgsql> pPgsqlConn = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
 				if (pPgsqlConn == nullptr)
 					break;
-				if (pPgsqlConn->ExecWaitBinary(sql) )
+				if (pPgsqlConn->ExecWaitBinary(sql))
 				{
-					
-					//PGresult *res = pPgsqlConn->GetPGresult();	
-					string srid =  std::__cxx11::to_string(layer->crs().srid());			
-					this->FormatWFSJsonCAll(pPgsqlConn, responseData, layerName, gmlVersion,srid);
-				    return true;
-					
+					string srid = std::__cxx11::to_string(layer->crs().srid());
+					mapserver::DmpMapServerUtil::responseGeojson(pPgsqlConn, responseData, layerName, srid);
+					return true;
 				}
 			}
 			catch (const std::exception &e)
@@ -646,14 +624,12 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 		}
 		return true;
-    }
-	
+	}
 
-    
-	bool DmpWmsRenderer::AddWmsMapLayers(const DmpProject* project) //插入型加入
+	bool DmpWmsRenderer::AddWmsMapLayers(const DmpProject *project) //插入型加入
 	{
-        std::map<std::string, DmpMapLayer*> mapLayers =  project->mapLayers();
-		for(std::map<std::string, DmpMapLayer*>::iterator iter= mapLayers.begin();
+		std::map<std::string, DmpMapLayer *> mapLayers = project->mapLayers();
+		for (std::map<std::string, DmpMapLayer *>::iterator iter = mapLayers.begin();
 			 iter != mapLayers.end(); iter++)
 		{
 			this->AddMapLayer(-1, (DmpVectorLayer *)iter->second);
@@ -661,7 +637,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return true;
 	}
 
-	bool DmpWmsRenderer::AddWmsMapLayers(const DmpProject* project, char *layer) //插入型加入
+	bool DmpWmsRenderer::AddWmsMapLayers(const DmpProject *project, char *layer) //插入型加入
 	{
 		bool layerIndex = true;
 		for (size_t i = 0; layer[i] != 0; i++)
@@ -693,15 +669,15 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 				i++;
 			}
 
-            std::map<std::string, DmpMapLayer*> mapLayers =  project->mapLayers();
-		    for (std::map<std::string, DmpMapLayer*>::iterator iter= mapLayers.begin(); 
-                iter != mapLayers.end(); iter++)
-		    {
-                if (set_layer.find(iter->first) != set_layer.end())
+			std::map<std::string, DmpMapLayer *> mapLayers = project->mapLayers();
+			for (std::map<std::string, DmpMapLayer *>::iterator iter = mapLayers.begin();
+				 iter != mapLayers.end(); iter++)
+			{
+				if (set_layer.find(iter->first) != set_layer.end())
 				{
 					this->AddMapLayer(-1, (DmpVectorLayer *)iter->second);
 				}
-            }
+			}
 
 			/*for (size_t i = 0; i < pWmsServer->layers.size(); i++)
 			{
@@ -752,8 +728,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return true;
 	}
 
-	
-	bool DmpWmsRenderer::AddMapLayer(int index, DmpVectorLayer* layer)
+	bool DmpWmsRenderer::AddMapLayer(int index, DmpVectorLayer *layer)
 	{
 		if (!layer)
 			return false;
@@ -810,23 +785,22 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		if ((r > std::pow(10, 12)) || (r < std::pow(10, -12)))
 			return false;
 
-	
 		//m_dR = R1 < R2 ? R1 : R2;
 		m_dR = r;
 		m_dXdis = m_dWidth / 2.0 - m_dR * (m_pExtent->m_dRight + m_pExtent->m_dLeft) / 2.0;
 		m_dYdis = m_dHeight / 2.0 + m_dR * (m_pExtent->m_dTop + m_pExtent->m_dBottom) / 2.0;
 
-		if(R1 < R2)
+		if (R1 < R2)
 		{
-			 double top = (m_pExtent->m_dTop + m_pExtent->m_dBottom) / 2.0 +  m_dHeight/(m_dR * 2);
-			 double bottom = (m_pExtent->m_dTop + m_pExtent->m_dBottom) / 2.0 - m_dHeight/( m_dR * 2) ;
-			 m_pExtent->m_dTop = top;
-			 m_pExtent->m_dBottom = bottom;
+			double top = (m_pExtent->m_dTop + m_pExtent->m_dBottom) / 2.0 + m_dHeight / (m_dR * 2);
+			double bottom = (m_pExtent->m_dTop + m_pExtent->m_dBottom) / 2.0 - m_dHeight / (m_dR * 2);
+			m_pExtent->m_dTop = top;
+			m_pExtent->m_dBottom = bottom;
 		}
 		else
 		{
-			double right= (m_pExtent->m_dRight + m_pExtent->m_dLeft) / 2.0 +  m_dWidth/(2 * m_dR);
-			double left = (m_pExtent->m_dRight + m_pExtent->m_dLeft) / 2.0 -  m_dWidth/(2 * m_dR) ;
+			double right = (m_pExtent->m_dRight + m_pExtent->m_dLeft) / 2.0 + m_dWidth / (2 * m_dR);
+			double left = (m_pExtent->m_dRight + m_pExtent->m_dLeft) / 2.0 - m_dWidth / (2 * m_dR);
 			m_pExtent->m_dRight = right;
 			m_pExtent->m_dLeft = left;
 		}
@@ -874,7 +848,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		}
 		return true;
 	}
-/*
+	/*
 	bool DmpWmsRenderer::DrawData(DataCollection *data, Renderer *renderer, clsCrSurf *pClsCS)
 	{
 	
@@ -911,8 +885,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return true;
 	}
 
-
-    bool DmpWmsRenderer::BufferCopy(clsCrSurf *pClsCSFrom, clsCrSurf *pClsCSTo)
+	bool DmpWmsRenderer::BufferCopy(clsCrSurf *pClsCSFrom, clsCrSurf *pClsCSTo)
 	{
 		if (pClsCSFrom == NULL)
 			pClsCSFrom = m_pClsSurfBuff;
@@ -940,11 +913,10 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		cairo_fill(cr);
 		return true;
 	}
-	
 
 	//在DC上绘制时是否使用一个临时的 image_surface, 然后拷上去,这样具体的细节处理就没有区别了
-	bool DmpWmsRenderer::GetMap(map<string, string> *map_layerDefs,map<string, string> * map_regionDefs, clsCrSurf *pClsCS, bool isThumbnail,
-					  shared_ptr<Rect> pRect, double r__, double x_dis__, double y_dis__)
+	bool DmpWmsRenderer::GetMap(map<string, string> *map_layerDefs, map<string, string> *map_regionDefs, clsCrSurf *pClsCS, bool isThumbnail,
+								shared_ptr<Rect> pRect, double r__, double x_dis__, double y_dis__)
 	{
 		/*确定参数*/
 		clsCrSurf *pClsSurfThis;
@@ -978,7 +950,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			y_dis = y_dis__;
 		}
 
-   /*
+		/*
 	* 重置文字避让
 	*/
 		//文字避让是否写成局部??
@@ -990,7 +962,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		string strRegionColDefs = "";
 		string strRegionLayerNameDefs = "";
 
-		if(map_regionDefs)
+		if (map_regionDefs)
 		{
 			map<string, string>::iterator iter_regionDef = map_regionDefs->begin();
 			if (iter_regionDef != map_regionDefs->end())
@@ -1000,14 +972,12 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 				has_regionDefs = true;
 			}
 		}
-		
 
-		map<DmpVectorLayer*, shared_ptr<DataCollection>> map_DataCollection;
+		map<DmpVectorLayer *, shared_ptr<DataCollection>> map_DataCollection;
 
 		for (int i = 0; i < (int)(m_vLayers.size()); i++)
 		{
-			DmpVectorLayer* layer = m_vLayers[i];
-		
+			DmpVectorLayer *layer = m_vLayers[i];
 
 			double r1 = layer->maxScale(); // *
 			double r2 = layer->minScale(); // *
@@ -1028,55 +998,53 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 
 			//bool isbuffQuery = false;
-		//	double width_scale = abs((layer->m_pDataset->maxx - layer->m_pDataset->minx) / (pExtent->m_dRight - pExtent->m_dLeft));
+			//	double width_scale = abs((layer->m_pDataset->maxx - layer->m_pDataset->minx) / (pExtent->m_dRight - pExtent->m_dLeft));
 			{
 				//std::printf("db \r\n ");
 				double start = clock();
 				double cost, cost2;
 
-				string sql ="";
+				string sql = "";
 				shared_ptr<DmpVectorThinLayer> pVectorThinLayer = nullptr;
 
 				bool renderHeat = false;
 				shared_ptr<DataCollection> data(new DataCollection());
 
-				if(!has_regionDefs)
+				if (!has_regionDefs)
 				{
-                    sql = GetDrawSQL(layer, pExtent.get(), strLayerDef);
+					sql = GetDrawSQL(layer, pExtent.get(), strLayerDef);
 				}
 				else
 				{
-					sql = GetRegionQuerySQL(layer, pExtent.get(), format("%d",layer->crs().srid()), strRegionLayerNameDefs,strRegionColDefs, strLayerDef);
+					sql = GetRegionQuerySQL(layer, pExtent.get(), format("%d", layer->crs().srid()), strRegionLayerNameDefs, strRegionColDefs, strLayerDef);
 				}
 
 				pVectorThinLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
 
-			// printf( "%s\r\n", sql.c_str());
-			// this->GetDrawSQL(layer, pExtent.get(), strLayerDef); //sql语句中使用 ::box
+				// printf( "%s\r\n", sql.c_str());
+				// this->GetDrawSQL(layer, pExtent.get(), strLayerDef); //sql语句中使用 ::box
 				if (sql == "")
 					continue;
 
 				string tableName = layer->name();
 
-				
 				if (pVectorThinLayer != nullptr)
 				{
-			       tableName = pVectorThinLayer->tableName();
-		        }
+					tableName = pVectorThinLayer->tableName();
+				}
 
-				if(tableName.length() > 32)
+				if (tableName.length() > 32)
 				{
 					tableName = tableName.substr(32);
 				}
 
-				
 				const char *ss__ = "";
 				const char **pmsg = &ss__;
 				try
 				{
 
 					shared_ptr<DmpPgsql> pPgsqlConn = nullptr;
-					if(pVectorThinLayer == nullptr)
+					if (pVectorThinLayer == nullptr)
 					{
 						pPgsqlConn = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
 					}
@@ -1084,9 +1052,9 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 					{
 						pPgsqlConn = DmpPgsqlSourcePools::get_instance()->GetDefaultPgsqlConn();
 					}
-					
+
 					if (pPgsqlConn == nullptr)
-							break;
+						break;
 					if (pPgsqlConn->ExecWaitBinary(sql))
 					{
 						PGresult *res = pPgsqlConn->GetPGresult();
@@ -1096,7 +1064,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 						int shapeType = layer->GeometryType();
 						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);
-						
+
 						//data->InitDataCollection(res, shapeType, this->m_dWidth, this->m_dHeight, (int)layer->subset, m_dR, m_dScaleDenominator, x_dis, y_dis);
 						map_DataCollection[layer] = data;
 						//data_ptr = data;
@@ -1104,10 +1072,10 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 						allDataCount += PQntuples(res);
 						this->DrawSimpleData(data.get(), layer->GetRenderer30().get(), pClsSurfThis);
-					//	DrawText(StringHelp::fmt("data %.0fm",(endTime_data - startTime).count()/1000000.0) 
-					//		,pClsSurfThis,10,50);
+						//	DrawText(StringHelp::fmt("data %.0fm",(endTime_data - startTime).count()/1000000.0)
+						//		,pClsSurfThis,10,50);
 
-					/*
+						/*
 						DrawText(tableName ,pClsSurfThis,10,100);
 
 						char ptext[100] = {0};
@@ -1116,10 +1084,10 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 						*/
 					}
-					else if(pVectorThinLayer != nullptr)
+					else if (pVectorThinLayer != nullptr)
 					{
-						shared_ptr<DmpPgsql>  pPgsqlConn1 = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
-						
+						shared_ptr<DmpPgsql> pPgsqlConn1 = DmpPgsqlSourcePools::get_instance()->GetPgsqlConn(layer->source());
+
 						if (pPgsqlConn1 == nullptr)
 							break;
 						if (pPgsqlConn1->ExecWaitBinary(sql))
@@ -1130,16 +1098,16 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 							int shapeType = layer->GeometryType();
 							shared_ptr<DataCollection> data(new DataCollection());
-							if(!renderHeat)
+							if (!renderHeat)
 							{
 								data->InitDataCollection(res, shapeType, this->m_dWidth, this->m_dHeight, 0, m_dR, m_dScaleDenominator, x_dis, y_dis);
 							}
 							else
 							{
-								data->InitHeatCollection(res, shapeType, this->m_dWidth, this->m_dHeight, 
-								 pExtent->m_dLeft,  pExtent->m_dRight, pExtent->m_dBottom, pExtent->m_dTop, 0, m_dR, m_dScaleDenominator, x_dis, y_dis);
+								data->InitHeatCollection(res, shapeType, this->m_dWidth, this->m_dHeight,
+														 pExtent->m_dLeft, pExtent->m_dRight, pExtent->m_dBottom, pExtent->m_dTop, 0, m_dR, m_dScaleDenominator, x_dis, y_dis);
 							}
-							
+
 							map_DataCollection[layer] = data;
 
 							//auto endTime_data = chrono::steady_clock::now();
@@ -1147,14 +1115,12 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 							allDataCount += PQntuples(res);
 							this->DrawSimpleData(data.get(), layer->GetRenderer30().get(), pClsSurfThis);
-
 						}
 						else
 						{
-							//DrawText2("获取数据失败,找不到图层" ,pClsSurfThis,10,10);	
+							//DrawText2("获取数据失败,找不到图层" ,pClsSurfThis,10,10);
 						}
 					}
-
 				}
 				catch (const std::exception &e)
 				{
@@ -1163,7 +1129,6 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 		}
 
-
 		map_DataCollection.clear();
 
 		//return true;
@@ -1175,311 +1140,125 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		return true;
 	}
 
-
-	bool DmpWmsRenderer::ToStream(std::string& responseData)
+	bool DmpWmsRenderer::ToStream(std::string &responseData)
 	{
 		responseData.reserve(10240);
-		if(this->pRasterBufferObj == nullptr)
+		if (this->pRasterBufferObj == nullptr)
 		{
 			cairo_surface_write_to_png_stream(m_pClsSurfDC->m_pSurf, cairo_write_func, &responseData);
 			return true;
 		}
 		else
-        {
+		{
 			return ToPngStream(this->pRasterBufferObj, responseData);
 		}
 	}
 
-	
-bool DmpWmsRenderer::ToPngStream(rasterBufferObj *rb,std::string& responseData)
-{
-	png_infop info_ptr;
-    int color_type;
-    int row;
-    unsigned int *rowdata;
-	int compression = 9;
-    png_structp png_ptr = png_create_write_struct(
-                            PNG_LIBPNG_VER_STRING, NULL,NULL,NULL);
-
-    if (!png_ptr)
-      return (false);
-
-    png_set_compression_level(png_ptr, compression);
-    png_set_filter (png_ptr,0, PNG_FILTER_NONE);
-
-    info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) {
-      png_destroy_write_struct(&png_ptr,
-                               (png_infopp)NULL);
-      return (false);
-    }
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-      png_destroy_write_struct(&png_ptr, &info_ptr);
-      return (false);
-    }
-    //if(info->fp)
-    //  png_set_write_fn(png_ptr,info, png_write_data_to_stream, png_flush_data);
-    //else
-    png_set_write_fn(png_ptr,&responseData, png_write_data_to_buffer, png_flush_data);
-
-    if(rb->data.rgba.a)
-      color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-    else
-      color_type = PNG_COLOR_TYPE_RGB;
-
-    png_set_IHDR(png_ptr, info_ptr, rb->width, rb->height,
-                 8, color_type, PNG_INTERLACE_NONE,
-                 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-
-    png_write_info(png_ptr, info_ptr);
-
-    if(!rb->data.rgba.a && rb->data.rgba.pixel_step==4)
-      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-
-    rowdata = (unsigned int*)malloc(rb->width*sizeof(unsigned int));
-    for(row=0; row<rb->height; row++) {
-      unsigned int *pixptr = rowdata;
-      int col;
-      unsigned char *a,*r,*g,*b;
-      r=rb->data.rgba.r+row*rb->data.rgba.row_step;
-      g=rb->data.rgba.g+row*rb->data.rgba.row_step;
-      b=rb->data.rgba.b+row*rb->data.rgba.row_step;
-      if(rb->data.rgba.a) {
-        a=rb->data.rgba.a+row*rb->data.rgba.row_step;
-        for(col=0; col<rb->width; col++) {
-          if(*a) {
-            double da = *a/255.0;
-            unsigned char *pix = (unsigned char*)pixptr;
-            pix[0] = *r/da;
-            pix[1] = *g/da;
-            pix[2] = *b/da;
-            pix[3] = *a;
-          } else {
-            *pixptr=0;
-          }
-          pixptr++;
-          a+=rb->data.rgba.pixel_step;
-          r+=rb->data.rgba.pixel_step;
-          g+=rb->data.rgba.pixel_step;
-          b+=rb->data.rgba.pixel_step;
-        }
-      } else {
-        for(col=0; col<rb->width; col++) {
-          unsigned char *pix = (unsigned char*)pixptr;
-          pix[0] = *r;
-          pix[1] = *g;
-          pix[2] = *b;
-          pixptr++;
-          r+=rb->data.rgba.pixel_step;
-          g+=rb->data.rgba.pixel_step;
-          b+=rb->data.rgba.pixel_step;
-        }
-      }
-
-      png_write_row(png_ptr,(png_bytep)rowdata);
-
-    }
-    png_write_end(png_ptr, info_ptr);
-    free(rowdata);
-    png_destroy_write_struct(&png_ptr, &info_ptr);
-    return MS_SUCCESS;
-}
-
+	bool DmpWmsRenderer::ToPngStream(rasterBufferObj *rb, std::string &responseData)
+	{
+		png_infop info_ptr;
+		int color_type;
+		int row;
+		unsigned int *rowdata;
+		int compression = 9;
+		png_structp png_ptr = png_create_write_struct(
+			PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+		if (!png_ptr)
+			return (false);
+
+		png_set_compression_level(png_ptr, compression);
+		png_set_filter(png_ptr, 0, PNG_FILTER_NONE);
+
+		info_ptr = png_create_info_struct(png_ptr);
+		if (!info_ptr)
+		{
+			png_destroy_write_struct(&png_ptr,
+									 (png_infopp)NULL);
+			return (false);
+		}
 
-//以GeoJson的形式返回
-void DmpWmsRenderer::FormatWFSJsonCAll(shared_ptr<DmpPgsql> pPgsqlConn, AppendBuffer *ab, char *layerNAMEc,int gmlVersion,char *srsOut)
-{
-	double xg1, yg1, xg2, yg2;
-	int havegSet = 0;
-	int count = 0;
-	int pointCountTemp = 0;
+		if (setjmp(png_jmpbuf(png_ptr)))
+		{
+			png_destroy_write_struct(&png_ptr, &info_ptr);
+			return (false);
+		}
+		//if(info->fp)
+		//  png_set_write_fn(png_ptr,info, png_write_data_to_stream, png_flush_data);
+		//else
+		png_set_write_fn(png_ptr, &responseData, png_write_data_to_buffer, png_flush_data);
 
-	std::string stringTime;
-	char buff[5000] = {0};
-    
-	ab->AppendString(R"({"type":"FeatureCollection","features":[)");
+		if (rb->data.rgba.a)
+			color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+		else
+			color_type = PNG_COLOR_TYPE_RGB;
 
-	try
-	{
-		int fieldsCount = pPgsqlConn->GetFieldCount();
-		for (int featureIndex = 0; pPgsqlConn->next(); featureIndex++)
-		{
-			if (featureIndex > 0)
-				ab->AppendString(",");
-			ab->AppendString(R"({"type":"Feature")");
+		png_set_IHDR(png_ptr, info_ptr, rb->width, rb->height,
+					 8, color_type, PNG_INTERLACE_NONE,
+					 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
+		png_write_info(png_ptr, info_ptr);
 
-			string geometry = "";
-			string properties = "";
+		if (!rb->data.rgba.a && rb->data.rgba.pixel_step == 4)
+			png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
 
-			for (int i = 0; i < fieldsCount; i++)
+		rowdata = (unsigned int *)malloc(rb->width * sizeof(unsigned int));
+		for (row = 0; row < rb->height; row++)
+		{
+			unsigned int *pixptr = rowdata;
+			int col;
+			unsigned char *a, *r, *g, *b;
+			r = rb->data.rgba.r + row * rb->data.rgba.row_step;
+			g = rb->data.rgba.g + row * rb->data.rgba.row_step;
+			b = rb->data.rgba.b + row * rb->data.rgba.row_step;
+			if (rb->data.rgba.a)
 			{
-				const char *str =  pPgsqlConn->GetFieldName(i); //pPgsqlConn->field_name[i].c_str();
-				//printf("%s\r\n",str);
-				if(str == 0)
-				{
-					break;
-				}
-				
-				if (strncmp(str, "RN_RN", 5) == 0)
-					continue;
-				std::string sT = str;
-				//XML转义
-				DmapDll::StringHelp::ToJSONString(sT);
-				str = sT.c_str();
-
-				if( sT == "geometry_as_geojson")
-				{
-					geometry = pPgsqlConn->getString(i);
-					continue;
-				}
-				//	str="a";
-				switch (pPgsqlConn->GetPGFieldType(i))
-				{
-				case PGFieldType::ByteaFieldType:
-				{
-					const char *s = pPgsqlConn->getBlob2(i);
-					sprintf(buff, R"(,"%s":"%s")", str, s);
-					properties += buff;
-				}
-				break;
-				case PGFieldType::ClobFieldType:
-				{
-					const char *s = pPgsqlConn->getClob2(i);
-					sprintf(buff, R"(,"%s":"%s")", str, s);
-					properties += buff;
-				}
-				break;
-				case PGFieldType::BigIntFieldType:
-				{
-					long v;
-					const char *str1 = pPgsqlConn->getString(i);
-						((char *)&v)[7] = str1[0];
-						((char *)&v)[6] = str1[1];
-						((char *)&v)[5] = str1[2];
-						((char *)&v)[4] = str1[3];
-						((char *)&v)[3] = str1[4];
-						((char *)&v)[2] = str1[5];
-						((char *)&v)[1] = str1[6];
-						((char *)&v)[0] = str1[7];
-					sprintf(buff, R"(,"%s":%ld)", str, v);
-					properties += buff;
-					//sprintf(sql, "<%s:%s>%llu</%s:%s>", "dmp", str, v, "dmp", str);
-					//ab->AppendString(sql);
-				}
-				break;
-				case PGFieldType::DateFieldType:
-				{
-					int v;
-					const char *str1 = pPgsqlConn->getString(i);
-						((char *)&v)[3] = str1[0];
-						((char *)&v)[2] = str1[1];
-						((char *)&v)[1] = str1[2];
-						((char *)&v)[0] = str1[3];
-					sprintf(buff, R"(,"%s":%d)", str, v);
-					properties += buff;
-					//sprintf(sql, "<%s:%s>%ld</%s:%s>", "dmp", str, v, "dmp", str);
-					//ab->AppendString(sql);
-				}
-				break;
-				case PGFieldType::IntFieldType:
+				a = rb->data.rgba.a + row * rb->data.rgba.row_step;
+				for (col = 0; col < rb->width; col++)
 				{
-					int v;
-					const char *str1 = pPgsqlConn->getString(i);
-						((char *)&v)[3] = str1[0];
-						((char *)&v)[2] = str1[1];
-						((char *)&v)[1] = str1[2];
-						((char *)&v)[0] = str1[3];
-					sprintf(buff, R"(,"%s":%d)", str, v);
-					properties += buff;
-					//sprintf(sql, "<%s:%s>%ld</%s:%s>", "dmp", str, v, "dmp", str);
-					//ab->AppendString(sql);
-				}
-				break;
-				case PGFieldType::DoubleFieldType:
-				{
-					double v;
-					const char *str1 = pPgsqlConn->getString(i);
-						//int vs=PQgetlength(((PgConn *)rs->conn)->res,0,0);
-						//memcpy(&v,str1,sizeof(v));
-						((char *)&v)[7] = str1[0];
-						((char *)&v)[6] = str1[1];
-						((char *)&v)[5] = str1[2];
-						((char *)&v)[4] = str1[3];
-						((char *)&v)[3] = str1[4];
-						((char *)&v)[2] = str1[5];
-						((char *)&v)[1] = str1[6];
-						((char *)&v)[0] = str1[7];
-					//number 有问题。
-
+					if (*a)
 					{
-						char sz1[100];
-						StringHelp::modp_dtoa2(v, sz1, 5);
-						sprintf(buff, R"(,"%s":"%s")", str, sz1);
-						properties += buff;
-						//sprintf(sql, "<%s:%s>%s</%s:%s>", "dmp", str, sz1, "dmp", str);
+						double da = *a / 255.0;
+						unsigned char *pix = (unsigned char *)pixptr;
+						pix[0] = *r / da;
+						pix[1] = *g / da;
+						pix[2] = *b / da;
+						pix[3] = *a;
 					}
-					//sprintf(sql,"<%s:%s>%lf</%s:%s>","dmp",str,v,"dmp",str);
-					//ab->AppendString(sql);
-				}
-				break;
-				case PGFieldType::TimestampWithoutTimeZone:
-				{
-					std::string s = pPgsqlConn->getString(i);
-					StringHelp::ToJSONString(s);
-					sprintf(buff, R"(,"%s":"%s")", str, s.c_str());
-					properties += buff;
-					//sprintf(sql, "<%s:%s>%s</%s:%s>", "dmp", str, s.c_str(), "dmp", str);
-					//ab->AppendString(sql);
-				}
-				case PGFieldType::VarCharFieldType:
-				{
-					
-					std::string s = pPgsqlConn->getString(i);
-					StringHelp::ToJSONString(s);
-					sprintf(buff, R"(,"%s":"%s")", str, s.c_str());
-					properties += buff;
-					//sprintf(sql, "<%s:%s>%s</%s:%s>", "dmp", str, s.c_str(), "dmp", str);
-					///ab->AppendString(sql);
-				}
+					else
+					{
+						*pixptr = 0;
+					}
+					pixptr++;
+					a += rb->data.rgba.pixel_step;
+					r += rb->data.rgba.pixel_step;
+					g += rb->data.rgba.pixel_step;
+					b += rb->data.rgba.pixel_step;
 				}
 			}
-
-			if(geometry != "")
-			{
-				ab->AppendString(R"(,"geometry":)");
-				ab->AppendString(geometry.c_str());
-			}
-
-			if (properties != "")
+			else
 			{
-				ab->AppendString(R"(,"properties":)");
-				properties[0] = '{';
-				ab->AppendString(properties.c_str());
-				ab->AppendString("}");
+				for (col = 0; col < rb->width; col++)
+				{
+					unsigned char *pix = (unsigned char *)pixptr;
+					pix[0] = *r;
+					pix[1] = *g;
+					pix[2] = *b;
+					pixptr++;
+					r += rb->data.rgba.pixel_step;
+					g += rb->data.rgba.pixel_step;
+					b += rb->data.rgba.pixel_step;
+				}
 			}
-			ab->AppendString("}");
-			//tickAA=GetTickCount();
-
-			//sprintf(sql, "</%s:%s>\r", "dmp", layerName);
-			//ab->AppendString(sql);
-			//ab->AppendString("</gml:featureMember>");
 
-			count++;
-			//if(pointCount>25)break;
+			png_write_row(png_ptr, (png_bytep)rowdata);
 		}
+		png_write_end(png_ptr, info_ptr);
+		free(rowdata);
+		png_destroy_write_struct(&png_ptr, &info_ptr);
+		return MS_SUCCESS;
 	}
-	catch (...)
-	{
-		return;
-	}
-
-	ab->AppendString("]}");
-
-	return ;
-}
-
 
+	
 
 }

@@ -44,7 +44,7 @@ namespace DmpWms
 
 		bool GetMapLog(std::stringstream&  outputStream, map<string,string>* map_layerDefs = NULL,map<string,string>* map_regionDefs = NULL,  shared_ptr<Rect> pRect = nullptr, double r__ = -1, double x_dis__ = 0, double y_dis__ = 0);
 		bool GetMap(map<string,string>* map_layerDefs = NULL,map<string,string>* map_regionDefs = NULL, clsCrSurf* pClsSurf = NULL,bool isThumbnail = false, shared_ptr<Rect> pRect = nullptr, double r__ = -1, double x_dis__ = 0, double y_dis__ = 0);
-		bool GetFeatureInfo(string &responseData, int gmlVersion, int x, int y, int feature_count);
+		bool GetFeatureInfo(string &responseData, int x, int y, int feature_count);
 		
 		bool GetMapLegend( std::stringstream& ab, shared_ptr<legendParamater> pLegendParamater);
 		bool GetMapLegend( shared_ptr<legendParamater> pLegendParamater, clsCrSurf* pClsSurf);
@@ -143,8 +143,8 @@ namespace DmpWms
 		bool CollectRules(const char* sRules);
 		bool CollectRules2(const char* sRules);
 
-		void FormatWFSJsonCAll(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,int gmlVersion,const char *srid);
-		void FormatWFSXMLCAll(shared_ptr<DmpPgsql> pPgsqlConn,std::string &responseData, const string& layerName, int gmlVersion,const char *srid);
+		//void FormatResponseJson(shared_ptr<DmpPgsql> pPgsqlConn, std::string &responseData,const string& layerName,const char *srid);
+		//void FormatResponseXml(shared_ptr<DmpPgsql> pPgsqlConn,std::string &responseData, const string& layerName, int gmlVersion,const char *srid);
     };
 }