json

@@ -12,7 +12,7 @@ namespace DmapCore_30
 {
 	SimpleMarkerSymbol::SimpleMarkerSymbol()
 	{
-		m_iAntialiasing = CAIRO_ANTIALIAS_BEST;
+		m_iAntialiasing = CAIRO_ANTIALIAS_FAST;
 		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_BEST;
+		m_iAntialiasing = CAIRO_ANTIALIAS_FAST;
 		m_iBackgroundColor = clsUtil::RandomColor();
 		clsUtil::ToCairoColor(m_iBackgroundColor, r, g, b, a);
 		m_iLineType = 0;

@@ -323,7 +323,7 @@ namespace DmapCore_30
 		//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) 
+		if(iX < 0 || (iX + iTextW) > pClsCS->m_iW  || (iY - iTextH )  < 0 || iY > pClsCS->m_iH) 
 		{
 			return false;
 		}

 #ifndef _clsMalloc_H_
 #define _clsMalloc_H_
+
+#include "dmap_core.h"
+#include "stdio.h"
+#include <string>
 namespace DmapCore_30
 {
-	class clsMalloc
+	class CORE_EXPORT clsMalloc
 	{
 	public:
 		clsMalloc();

@@ -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)
 		{

@@ -8,6 +8,7 @@ SET (MAPSERVER_SRCS
   dmppgsql.cpp
   dmppgsqlpool.cpp
   dmppgsqlsourcepools.cpp
+  dmpgeometry.cpp
   wfs/dmpwfs.cpp
   wfs/dmpwfsfilter.cpp
   wfs/dmpgmlfilter.cpp
@@ -44,6 +45,7 @@ SET (MAPSERVER_HDRS
   dmppgsql.h
   dmppgsqlpool.h
   dmppgsqlsourcepools.h
+  dmpgeometry.h
   wfs/dmpwfs.h
   wfs/dmpwfsfilter.h
   wfs/dmpgmlfilter.h

+/**************************************************************************
+* file:              dmpgeometry.cpp
+
+* Author:            qingxiongf
+* Date:              2022-02-22 10:13:27
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmpgeometry.h"
+#include <iostream>
+#include <string.h>
+#include <sstream>
+
+namespace mapserver 
+{
+    std::string Dmpgeometry::geoJsonfromWKB(const char* wkb)
+    {
+        unsigned char* pwkb = (unsigned char*)wkb;
+        unsigned char hasZorSrsid = ((unsigned char *)(pwkb + 4))[0] / 16;
+       
+        unsigned char type = ((unsigned char *)(pwkb + 1))[0];
+        this->hasZ_ = hasZorSrsid / 8;
+		this->hasSrid_ = hasZorSrsid % 8;
+
+        
+		 notbig_ = this->ReadByte(pwkb);
+		int shape = this->ReadInt(pwkb, notbig_);
+		if (hasSrid_)
+		{
+			srid_ = this->ReadInt(pwkb, notbig_);
+		}
+
+        std::stringstream sstream;
+
+        switch (type)
+        {
+        case  DmpWkbTypes::Type::Point:
+       // case  DmpWkbTypes::Type::PointZ:
+       // case  DmpWkbTypes::Type::PointM:
+       // case  DmpWkbTypes::Type::PointZM:
+        {
+            sstream << R"({"type":"Point","coordinates": [)";
+            readPointfromWKB(pwkb,sstream);
+            break;
+        }
+           
+        
+        case  DmpWkbTypes::Type::MultiPoint:
+       // case  DmpWkbTypes::Type::MultiPointZ:
+       // case  DmpWkbTypes::Type::MultiPointM:
+       // case  DmpWkbTypes::Type::MultiPointZM:
+         {
+            sstream << R"({"type":"MultiPoint","coordinates": [)";
+            int nPoint = this->ReadInt(pwkb, notbig_);
+            for (int j = 0; j < nPoint; j++)
+		    {
+			   pwkb += 5; 
+               if(j>0) sstream << ",";
+               readPointfromWKB(pwkb,sstream);
+            }
+            break;
+         }
+
+        case  DmpWkbTypes::Type::LineString:
+       // case  DmpWkbTypes::Type::LineStringZ:
+       // case  DmpWkbTypes::Type::LineStringM:
+       // case  DmpWkbTypes::Type::LineStringZM:
+        {
+            sstream << R"({"type":"LineString","coordinates": [)";
+            readLinefromWKB(pwkb,sstream);
+            break;
+        }
+          
+
+        case  DmpWkbTypes::Type::MultiLineString:
+      //  case  DmpWkbTypes::Type::MultiLineStringZ:
+      //  case  DmpWkbTypes::Type::MultiLineStringM:
+       // case  DmpWkbTypes::Type::MultiLineStringZM:
+        {
+            sstream << R"({"type":"MultiLineString","coordinates": [)";
+            int nLine = this->ReadInt(pwkb, notbig_);
+            for (int j = 0; j < nLine; j++)
+		    {
+			   pwkb += 5; 
+               if(j>0) sstream << ",";
+               readLinefromWKB(pwkb,sstream);
+            }
+            break;
+        }
+
+        case  DmpWkbTypes::Type::Polygon:
+       // case  DmpWkbTypes::Type::PolygonZ:
+      //  case  DmpWkbTypes::Type::PolygonM:
+       // case  DmpWkbTypes::Type::PolygonZM:
+        {
+            sstream << R"({"type":"Polygon","coordinates": [)";
+            readPolygonfromWKB(pwkb,sstream);
+            break;
+        }  
+
+        case  DmpWkbTypes::Type::MultiPolygon:
+      //  case  DmpWkbTypes::Type::MultiPolygonZ:
+      //  case  DmpWkbTypes::Type::MultiPolygonM:
+      //  case  DmpWkbTypes::Type::MultiPolygonZM:
+        {
+            sstream << R"({"type":"MultiPolygon","coordinates": [)";
+            int nPolygon = this->ReadInt(pwkb, notbig_);
+            for (int j = 0; j < nPolygon; j++)
+		    {
+			   pwkb += 5; 
+               if(j>0) sstream << ",";
+               readPolygonfromWKB(pwkb,sstream);
+            }
+            break;
+        }
+
+        default:
+            break;
+        }
+       
+        sstream << "]}";
+
+        return sstream.str();;
+    }
+
+    bool Dmpgeometry::readPointfromWKB(unsigned char*& pwkb, stringstream& sstream )
+    {
+        double xx = this->ReadDouble(pwkb,notbig_);
+        double yy = this->ReadDouble(pwkb,notbig_);
+       
+       // sprintf(buff, "[%.6f,%.6f]" ,xx,yy);
+        sstream << "[" << ToDoubleStr(xx) << "," << ToDoubleStr(yy) << "]";
+
+        if(hasZ_)
+        {
+            pwkb += 8;
+            // double zz = this->ReadDouble(pwkb,notbig_);
+        }
+        return true;
+    }
+
+     char* Dmpgeometry::ToDoubleStr(double value)
+     {
+        int len = sprintf(buff, "%.6f" ,value);
+        for ( len --; len >0; len--)
+        {
+            if(buff[len] == '0')
+            {
+                buff[len] = 0;
+            }
+            else if(buff[len] == '.')
+            {
+                buff[len] = 0;
+                break;
+            }
+            else
+            {
+                break;
+            }
+        }
+        
+         return buff;
+
+     }
+
+    bool Dmpgeometry::readLinefromWKB(unsigned  char*& pwkb, stringstream& sstream)
+    {
+        int nPoint = this->ReadInt(pwkb, notbig_);
+        sstream << "[";
+        for (size_t i = 0; i < nPoint; i++)
+        {
+           if(i>0) sstream << ",";
+           readPointfromWKB(pwkb, sstream);
+        }
+        sstream <<  "]";
+        
+        return true;
+    }
+
+    bool Dmpgeometry::readPolygonfromWKB(unsigned  char*& pwkb, stringstream& sstream)
+    {
+        int nline = this->ReadInt(pwkb, notbig_);
+        sstream << "[";
+        for (size_t i = 0; i < nline; i++)
+        {
+           if(i>0) sstream << ",";
+           readLinefromWKB(pwkb, sstream);
+        }
+        sstream <<  "]";
+        
+        return true;
+    }
+
+    
+
+int Dmpgeometry::ReadInt(unsigned char*& here, int  not_big1)
+{
+    unsigned char * mem = (unsigned char *)malloc(4);
+	memcpy(mem, here, 4);
+	if (!not_big1)
+		this->Exchange4(mem);
+	int num = ((int*)mem)[0];
+    free(mem);
+	here += 4;
+	return num;
+}
+int Dmpgeometry::ReadByte(unsigned char*& here)
+{
+	int num = ((char*)here)[0];
+	here++;
+	return num;
+}
+
+double Dmpgeometry::ReadDouble(unsigned char*& here, int not_big)
+{
+	//DmapCore_30::clsMalloc clsM(8);
+    unsigned char * mem = (unsigned char *)malloc(8);
+	memcpy(mem, here, 8);
+	if (!not_big)
+		Exchange8(mem);
+	double num = ((double*)mem)[0];
+    free(mem);
+	here += 8;
+	return num;
+}
+
+bool Dmpgeometry::Exchange4(unsigned char * here)
+{
+	unsigned char temp;
+	for (int i = 0; i < 2; i++)
+	{
+		temp = here[i];
+		here[i] = here[3 - i];
+		here[3 - i] = temp;
+	}
+	return true;
+}
+
+bool Dmpgeometry::Exchange8(unsigned char * here)
+{
+	unsigned char temp;
+	for (int i = 0; i < 4; i++)
+	{
+		temp = here[i];
+		here[i] = here[7 - i];
+		here[7 - i] = temp;
+	}
+	return true;
+}
+
+
+}
+

+/**************************************************************************
+* file:              dmpgeometry.h
+
+* Author:            qingxiongf
+* Date:              2022-02-22 10:07:04
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpgeometry_h__
+#define __dmpgeometry_h__
+#include <geometry/dmpwkbtypes.h>
+#include <string>
+using namespace std;
+namespace mapserver 
+{
+    class Dmpgeometry
+    {
+          /* data */
+    public:
+       // Dmpgeometry(/* args */);
+       // ~Dmpgeometry();
+
+       // static Dmpgeometry geometryfromWKT(const char* wkt);
+
+         std::string geoJsonfromWKB(const char* wkb);
+
+         bool readPointfromWKB(unsigned char*& pwkb, stringstream& outstream);
+         bool readLinefromWKB(unsigned char*& pwkb, stringstream& outstream);
+         bool readPolygonfromWKB(unsigned char*& pwkb, stringstream& outstream);
+
+       // static string geoJsonfromWKT(const char* wkt);
+    private:
+        int ReadInt(unsigned char*& pwkb, int  not_big1);
+        double ReadDouble(unsigned char*& pwkb, int  not_big1);
+        int ReadByte(unsigned char*& pwkb);
+        bool Exchange4(unsigned char* pwkb);
+        bool Exchange8(unsigned char* pwkb);
+
+        char* ToDoubleStr(double value);
+    private:
+        int srid_;
+        bool hasZ_;
+        bool hasSrid_;
+        int   notbig_;
+
+        DmpWkbTypes::Type type_;
+        char buff[100];
+  
+    };
+
+}
+
+#endif // __dmpgeometry_h__

@@ -12,7 +12,7 @@
 #include <ostream>
 #include <string>
 #include <boost/asio.hpp>
-
+#include "dmpgeometry.h"
 using boost::asio::ip::tcp;
 
 namespace mapserver
@@ -56,17 +56,9 @@ namespace mapserver
 			int fieldsCount = pPgsqlConn->GetFieldCount();
 			for (; pPgsqlConn->next();)
 			{
-				//	css++;
-				//if(css!=24)continue;
-				//break;
-				//string geometry = "";
-				//string properties = "";
 				responseData.append("<gims:featureMember>");
 				sprintf(buff, "<gims:%s fid=\"%s.%d\">", layerName.c_str(), layerName.c_str(), count + 1);
 				responseData.append(buff);
-				//responseData.append("\r\n");
-
-				//columns[md[ i ].getString(MetaData::ATTR_NAME)] = i;
 				for (int i = 0; i < fieldsCount; i++)
 				{
 					const char *sfieldName = pPgsqlConn->GetFieldName(i); //pPgsqlConn->field_name[i].c_str();
@@ -77,7 +69,7 @@ namespace mapserver
 					if (strncmp(sfieldName, "RN_RN", 5) == 0)
 						continue;
 					std::string strFieldName = sfieldName;
-					//DmapDll::StringHelp::ToXMLString(strFieldName);
+					//DmapDll::StringHelp::ToXMLString(strFieldName); 
 
 					if (strFieldName == "geometry_as_gml")
 					{
@@ -165,6 +157,12 @@ namespace mapserver
 						geometry = pPgsqlConn->getString(i);
 						continue;
 					}
+					else if(strFieldName == "geometry_as_wkt")
+					{
+						Dmpgeometry dmpgeometry;
+						geometry = dmpgeometry.geoJsonfromWKB(pPgsqlConn->getString(i));
+						continue;
+					}
 					else
 					{
 						const char *v = pPgsqlConn->getString(i);
@@ -535,7 +533,7 @@ namespace mapserver
 
 		for (i = 0; i < strlen(cd); i++)
 		{
-			memset(p, '/0', 2);
+			memset(p, '\0', 2);
 			if (cd[i] != '%')
 			{
 				decd[j++] = cd[i];
@@ -549,7 +547,7 @@ namespace mapserver
 			p[1] = p[1] - 48 - ((p[1] >= 'A') ? 7 : 0) - ((p[1] >= 'a') ? 32 : 0);
 			decd[j++] = (unsigned char)(p[0] * 16 + p[1]);
 		}
-		decd[j] = '/0';
+		decd[j] = '\0';
 
 		return decd;
 	}

@@ -537,7 +537,8 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 					{
 						typeString = "geometry";
 						typeInt = PGFieldType::ShapeFieldType;
-						fields_str += " st_asgeojson(\"" + (fieldname) + "\") as geometry_as_geojson";
+						fields_str += " \"" + (fieldname) + "\" as geometry_as_wkt ";
+						//fields_str += " st_asgeojson(\"" + (fieldname) + "\") as geometry_as_geojson";
 					}
 					else if (typeString == "integer")
 					{
@@ -591,8 +592,14 @@ 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);
+		// WHERE  \"%s\" && \'BOX3D(%lf %lf,%lf %lf)\'::box3d 
+		//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(" \"%s\" && \'BOX3D(%lf %lf,%lf %lf)\'::box3d limit %d ",
+					  shapeName.c_str(), x - dis, y - dis, x + dis, y + dis, feature_count);
+
+
 		//cout<<sql.c_str() <<endl;
 		return sql;
 	}
@@ -625,7 +632,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 				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());
+				printf("%s\r\n",sql.c_str());
 				if (pPgsqlConn->ExecWaitBinary(sql))
 				{
 					if(pPgsqlConn->GetRowCount()>0 || i==0)
@@ -970,7 +977,7 @@ 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 = (int)(m_vLayers.size()) -1; i > 0; 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());
@@ -1229,7 +1236,7 @@ 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 = (int)(m_vLayers.size()) -1; i > 0; i--)
+		for (int i = (int)(m_vLayers.size()) -1; i >= 0; i--)
 		{
 			DmpVectorLayer *layer = m_vLayers[i];
 

@@ -74,7 +74,11 @@ namespace DmpWms
     ptGeographicBoundingbox.add("southBoundLatitude", miny);
     ptGeographicBoundingbox.add("northBoundLatitude", maxy);
     ptProject.add_child("EX_GeographicBoundingBox",ptGeographicBoundingbox);
-
+    if( mapLayers.begin() != mapLayers.end())
+    {
+       ptProject.add("source",  mapLayers.begin()->second->source());
+    }
+   
     boost::property_tree::ptree ptLayers;
     for (std::map<std::string, DmpMapLayer*>::iterator iter= mapLayers.begin();iter != mapLayers.end(); iter++)
     {
@@ -90,8 +94,9 @@ namespace DmpWms
     boost::property_tree::ptree ptLayer;
     ptLayer.add("Name", layer->name());
     ptLayer.add("Title", layer->title());
-    ptLayer.add("CRS", srs);
+    ptLayer.add("CRS",  layer->srid().empty()?srs:("EPSG:" + layer->srid()));
     ptLayer.add("Type", layer->GeomTypeString());
+    ptLayer.add("source", layer->source());
 
     boost::property_tree::ptree ptGeographicBoundingbox; 
     ptGeographicBoundingbox.add("westBoundLongitude", layer->extent().xmin());