Merge branch 'master' of http://gitlab.ctune.cn/DMapServer/DMapServer4.1

@@ -241,7 +241,7 @@ namespace mapserver
 
 
 	int DmpPgsql::GetRowCount()
 	int DmpPgsql::GetRowCount()
 	{
 	{
-		return PQnparams(pPGresult_);
+		return PQntuples(pPGresult_);
 	}
 	}
 
 
 	int DmpPgsql::GetFieldCount()
 	int DmpPgsql::GetFieldCount()

@@ -64,7 +64,7 @@ namespace DmpWfs
     rootname = "WFS_Capabilities";
     rootname = "WFS_Capabilities";
     xmlRoot.add("<xmlattr>.xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance");
     xmlRoot.add("<xmlattr>.xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance");
     xmlRoot.add("<xmlattr>.xmlns","http://www.opengis.net/wfs");
     xmlRoot.add("<xmlattr>.xmlns","http://www.opengis.net/wfs");
-    xmlRoot.add("<xmlattr>.ogc","http://www.ogc.net/wfs");
+    xmlRoot.add("<xmlattr>.xmlns:ogc","http://www.ogc.net/wfs");
     xmlRoot.add("<xmlattr>.xmlns:sld","http://www.opengis.net/sld");
     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>.xsi:schemaLocation","http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd");
     xmlRoot.add("<xmlattr>.version", version);
     xmlRoot.add("<xmlattr>.version", version);
@@ -160,7 +160,7 @@ namespace DmpWfs
            if (pPgsqlConn != nullptr)
            if (pPgsqlConn != nullptr)
            {
            {
                boost::property_tree::ptree ptFeatureType;
                boost::property_tree::ptree ptFeatureType;
-               std::string srs = "EPSG:" + std::__cxx11::to_string(project->crs().srid());
+               std::string srs = "EPSG:" + layer->srid();
                ptFeatureType.add("<xmlattr>.id", i);
                ptFeatureType.add("<xmlattr>.id", i);
                ptFeatureType.add("Name", layer->name());
                ptFeatureType.add("Name", layer->name());
                ptFeatureType.add("Title", layer->title());
                ptFeatureType.add("Title", layer->title());

@@ -591,12 +591,20 @@ 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());
 		std::string sql = format(ss.c_str(), layer->schema().c_str(), tableName.c_str());
 
 
 		string shapeName = layer->geom();
 		string shapeName = layer->geom();
-		// 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 ",
+		if(!layer->srid().empty() && layer->srid().length()==4)
+		{
+			// 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);
+		}
+		else
+		{
+			sql += format(" \"%s\" && \'BOX3D(%lf %lf,%lf %lf)\'::box3d limit %d ",
 					  shapeName.c_str(), x - dis, y - dis, x + dis, y + dis, feature_count);
 					  shapeName.c_str(), x - dis, y - dis, x + dis, y + dis, feature_count);
+		}
+		
+
+		
 
 
 
 
 		//cout<<sql.c_str() <<endl;
 		//cout<<sql.c_str() <<endl;
@@ -612,9 +620,9 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 
 
 		double x0 = (x - m_dXdis) / m_dR;
 		double x0 = (x - m_dXdis) / m_dR;
 		double y0 = (m_dYdis - y) / m_dR;
 		double y0 = (m_dYdis - y) / m_dR;
-		double dis = 1 / m_dR;
+		double dis = 2 / m_dR;
 
 
-		for (int i = (int)(m_vLayers.size()) - 1; i >= 0; i--)
+		for (int i = 0; i < m_vLayers.size(); i++)
 		{
 		{
 			DmpVectorLayer *layer = (DmpVectorLayer *)m_vLayers[i];
 			DmpVectorLayer *layer = (DmpVectorLayer *)m_vLayers[i];
 
 
@@ -632,7 +640,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			    string layerName = layer->name();
 			    string layerName = layer->name();
 				if (pPgsqlConn->ExecWaitBinary(sql))
 				if (pPgsqlConn->ExecWaitBinary(sql))
 				{
 				{
-					if(pPgsqlConn->GetRowCount()>0 || i==0)
+					if(pPgsqlConn->GetRowCount()>0 || i== m_vLayers.size()-1)
 					{
 					{
 						string srid = std::__cxx11::to_string(layer->crs().srid());
 						string srid = std::__cxx11::to_string(layer->crs().srid());
 						mapserver::DmpMapServerUtil::responseGeojson(pPgsqlConn, responseData, layerName, srid);
 						mapserver::DmpMapServerUtil::responseGeojson(pPgsqlConn, responseData, layerName, srid);
@@ -1078,7 +1086,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 			}
 			}
 			else
 			else
 			{
 			{
-				sql = GetRegionQuerySQL(layer, pExtent.get(), format("%d", layer->crs().srid()), strRegionLayerNameDefs, strRegionColDefs, strLayerDef);
+				sql = GetRegionQuerySQL(layer, pExtent.get(), layer->srid(), strRegionLayerNameDefs, strRegionColDefs, strLayerDef);
 			}
 			}
 
 
 			pVectorVacuateLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
 			pVectorVacuateLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
@@ -1274,7 +1282,7 @@ ST_GeometryFromText('POLYGON((%f %f, %f %f,  %f %f, %f %f,  %f %f))',%s),\
 				}
 				}
 				else
 				else
 				{
 				{
-					sql = GetRegionQuerySQL(layer, pExtent.get(), format("%d", layer->crs().srid()), strRegionLayerNameDefs, strRegionColDefs, strLayerDef);
+					sql = GetRegionQuerySQL(layer, pExtent.get(),  layer->srid(), strRegionLayerNameDefs, strRegionColDefs, strLayerDef);
 				}
 				}
 
 
 				pVectorVacuateLayer = layer->GetCurrentScaleTable(1 / this->m_dR);
 				pVectorVacuateLayer = layer->GetCurrentScaleTable(1 / this->m_dR);

@@ -220,5 +220,4 @@ namespace tileserver
 	    pPngData->length += length;
 	    pPngData->length += length;
 	    return CAIRO_STATUS_SUCCESS;
 	    return CAIRO_STATUS_SUCCESS;
     }
     }
-
 }
 }