字体

@@ -78,9 +78,11 @@ namespace DmapCore_30
 				  return false;
 			   }
 			}
-			
 
-			this->m_simpleRenderer = m_pRen->m_simpleRenderer;
+			if (m_pRen != NULL)
+			{
+				this->m_simpleRenderer = m_pRen->m_simpleRenderer;
+			}
 			return true;
 		}
 		//clsXML::XMLParse(NULL, f, &m_pRen);

@@ -91,14 +91,14 @@ namespace DmapCore_30
 	{
 		 char buff[300] = {0};
 		boost::property_tree::ptree ptRenderer;
-		ptRenderer.add("lookupfield",m_sField);
+		ptRenderer.add("<xmlattr>.lookupfield",m_sField);
 	
 		int length = (int)m_vComponents.size();
 		for (int i = 0; i < length; i++)
 		{
 			boost::property_tree::ptree ptNode;
 			ValueMapRendererComponent* vmrc = m_vComponents[i];
-	        ptNode.add("value",vmrc->GetValue());
+	        ptNode.add("<xmlattr>.value",vmrc->GetValue());
 			if(vmrc->m_pSymbol)
 			{
 				vmrc->m_pSymbol->ParsePtree(ptNode);
@@ -112,6 +112,7 @@ namespace DmapCore_30
 			this->m_pDefaultSymbol->ParsePtree(ptNode);
 			ptRenderer.add_child("OTHER",ptNode);
 		}
+		pt.add_child("VALUEMAPRENDERER",ptRenderer);
 		return true;
 	}
 

@@ -455,4 +455,85 @@ namespace mapserver
 		}
 		return 0;
 	}
+
+	unsigned char DmpMapServerUtil::char_to_hex(unsigned char x)
+	{
+		return (unsigned char)(x > 9 ? x + 55 : x + 48);
+	}
+
+	int DmpMapServerUtil::is_alpha_number_char(unsigned char c)
+	{
+		if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'))
+			return 1;
+		return 0;
+	}
+
+	std::string DmpMapServerUtil::urlEncode(char* src, int length)
+	{
+		char  buff[1024];
+		urlEncode((unsigned char *)src, length, (unsigned char *)buff, 1000);
+		return buff;
+	}
+
+	// url编码实现
+
+	void DmpMapServerUtil::urlEncode(unsigned char *src, int src_len, unsigned char *dest, int dest_len)
+	{
+		unsigned char ch;
+		int len = 0;
+
+		while (len < (dest_len - 4) && *src)
+		{
+			ch = (unsigned char)*src;
+			if (*src == ' ')
+			{
+				*dest++ = '+';
+			}
+			else if (is_alpha_number_char(ch) || strchr("=!~*'()", ch))
+			{
+				*dest++ = *src;
+			}
+			else
+			{
+				*dest++ = '%';
+				*dest++ = char_to_hex((unsigned char)(ch >> 4));
+				*dest++ = char_to_hex((unsigned char)(ch % 16));
+			}
+			++src;
+			++len;
+		}
+		*dest = 0;
+		return;
+	}
+
+	//解url编码实现
+
+	unsigned char * DmpMapServerUtil::urlDecode(unsigned char *encd, unsigned char *decd)
+	{
+		int j, i;
+		char *cd = (char *)encd;
+		char p[2];
+		unsigned int num;
+		j = 0;
+
+		for (i = 0; i < strlen(cd); i++)
+		{
+			memset(p, '/0', 2);
+			if (cd[i] != '%')
+			{
+				decd[j++] = cd[i];
+				continue;
+			}
+
+			p[0] = cd[++i];
+			p[1] = cd[++i];
+
+			p[0] = p[0] - 48 - ((p[0] >= 'A') ? 7 : 0) - ((p[0] >= 'a') ? 32 : 0);
+			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';
+
+		return decd;
+	}
 }
\ No newline at end of file

@@ -29,6 +29,13 @@ namespace mapserver
         static std::vector<std::string> stringSplit(const std::string &str, const std::string &pattern);
 
         static int HttpPost(const std::string& url, std::string& postData, std::string& responseData );
+
+        static unsigned char char_to_hex(unsigned char x);
+        static int is_alpha_number_char(unsigned char c);
+        static std::string urlEncode(char* src, int length);
+        static void urlEncode(unsigned char *src, int src_len, unsigned char *dest, int dest_len);
+        static unsigned char *urlDecode(unsigned char *encd, unsigned char *decd);
+
     };
 }
 

@@ -50,6 +50,7 @@ namespace DmpMapping
             
             DmpProject* project = (DmpProject*)context.serverProject()->project();
             std::string projectData = project->WriteXml();
+           // printf("%s\r\n",projectData.c_str());
             if(!guid.empty() && !projectData.empty())
             {
 

@@ -90,7 +90,7 @@ namespace DmpMapping
                     if (mapFont.find(buff) != mapFont.end())
                     {
                         boost::property_tree::ptree ptNode;
-                        ptNode.put("", buff);
+                        ptNode.put("", mapFont[buff]);
                         ptRoot.push_back(std::make_pair("", ptNode));
                     }
                 }

@@ -12,6 +12,7 @@
 #include "dmpserverproject.h"
 #include "dmpvectorlayer.h"
 #include "dmpserverproject.h"
+#include "dmpmapserverutil.h"
 
 namespace DmpWfs
 {
@@ -35,7 +36,7 @@ namespace DmpWfs
     {
       sprintf(char_hrefUrl, "http://%s:%s%s", domain.c_str(),port.c_str(), context.request()->path().c_str());
     }
-    hrefUrl = char_hrefUrl;
+    hrefUrl = DmpMapServerUtil::urlEncode(char_hrefUrl,1024);
    // hrefUrl = "http://172.26.40.51:8821/?mapService=test";
     std::shared_ptr<boost::property_tree::ptree> doc = getCapabilities(project, name,title, version,hrefUrl, projectSettings);
 
@@ -63,6 +64,7 @@ namespace DmpWfs
     rootname = "WFS_Capabilities";
     xmlRoot.add("<xmlattr>.xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance");
     xmlRoot.add("<xmlattr>.xmlns","http://www.opengis.net/wfs");
+    xmlRoot.add("<xmlattr>.ogc","http://www.ogc.net/wfs");
     xmlRoot.add("<xmlattr>.xmlns:sld","http://www.opengis.net/sld");
     xmlRoot.add("<xmlattr>.xsi:schemaLocation","http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd");
     xmlRoot.add("<xmlattr>.version", version);

+/**************************************************************************
+* file:              dmpprint.cpp
+
+* Author:            qingxiongf
+* Date:              2022-01-20 18:50:40
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+#include "dmpprint.h"

+/**************************************************************************
+* file:              dmpprint.h
+
+* Author:            qingxiongf
+* Date:              2022-01-20 18:50:30
+* Email:             qingxiongf@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpprint_h__
+#define __dmpprint_h__
+
+
+
+
+#endif // __dmpprint_h__

@@ -10,6 +10,7 @@
 #include "dmpserverresponse.h"
 #include "dmpserverrequest.h"
 #include "dmpserverproject.h"
+#include "dmpmapserverutil.h"
 namespace DmpWms
 {
   void writeGetCapabilities( const DmpServerContext &context, const DmpWmsParameters& params, 

@@ -593,19 +593,13 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 		{
 			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
 			if (sql == "")
 				continue;
-			printf("%s\r\n",sql.c_str());
+			//printf("%s\r\n",sql.c_str());
 			string layerName = layer->name();
 			try
 			{
@@ -614,9 +608,16 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 					break;
 				if (pPgsqlConn->ExecWaitBinary(sql))
 				{
-					string srid = std::__cxx11::to_string(layer->crs().srid());
-					mapserver::DmpMapServerUtil::responseGeojson(pPgsqlConn, responseData, layerName, srid);
-					return true;
+					if(pPgsqlConn->GetRowCount()>0 || i==0)
+					{
+						string srid = std::__cxx11::to_string(layer->crs().srid());
+						mapserver::DmpMapServerUtil::responseGeojson(pPgsqlConn, responseData, layerName, srid);
+						return true;
+					}
+					else
+					{
+						continue;
+					}
 				}
 			}
 			catch (const std::exception &e)