Merge pull request #4466 from tbonfort/geometryColumnWFS

[WFS] MapServer in WFS client mode doesn't allow setup the geometry column name for the filter request
MapServer · Sep 24, 2012 · 2c93b6d · 2c93b6d
2 parents f5fff71 + d351081
commit 2c93b6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/mapows.h b/mapows.h
@@ -51,6 +51,7 @@ typedef struct {
   char *pszService;
   char *pszTypeName;
   char *pszFilter;
+  char *pszGeometryName;
   int nMaxFeatures;
   char *pszBbox; /* only used with a Get Request */
   char *pszOutputFormat; /* only used with DescibeFeatureType */

diff --git a/mapwfs.c b/mapwfs.c
@@ -2741,6 +2741,7 @@ void msWFSFreeParamsObj(wfsParamsObj *wfsparams)
     free(wfsparams->pszTypeName);
     free(wfsparams->pszFilter);
     free(wfsparams->pszBbox);
+    free(wfsparams->pszGeometryName);
     free(wfsparams->pszOutputFormat);
     free(wfsparams->pszFeatureId);
     free(wfsparams->pszSrs);

diff --git a/mapwfslayer.c b/mapwfslayer.c
@@ -68,7 +68,7 @@ static wfsParamsObj *msBuildRequestParams(mapObj *map, layerObj *lp,
   rectObj bbox;
   const char *pszTmp;
   int nLength, i = 0;
-  char *pszVersion, *pszTypeName = NULL;
+  char *pszVersion, *pszTypeName, *pszGeometryName = NULL;
 
   if (!map || !lp || !bbox_ret)
     return NULL;
@@ -114,6 +114,10 @@ static wfsParamsObj *msBuildRequestParams(mapObj *map, layerObj *lp,
   }
   */
 
+  pszTmp = msOWSLookupMetadata(&(lp->metadata), "FO", "geometryname");
+  if (pszTmp)
+    psParams->pszGeometryName = msStrdup(pszTmp);
+
   pszTmp = msOWSLookupMetadata(&(lp->metadata), "FO", "typename");
   if (pszTmp)
     psParams->pszTypeName = msStrdup(pszTmp);
@@ -214,6 +218,7 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
 {
   char *pszPostReq = NULL;
   char *pszFilter = NULL;
+  char *pszGeometryName = "Geometry";
   size_t bufferSize = 0;
 
   if (psParams->pszVersion == NULL ||
@@ -231,6 +236,9 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
   }
 
 
+  if (psParams->pszGeometryName) {
+    pszGeometryName = psParams->pszGeometryName;
+  }
 
   if (psParams->pszFilter)
     pszFilter = psParams->pszFilter;
@@ -239,12 +247,12 @@ static char *msBuildWFSLayerPostRequest(mapObj *map, layerObj *lp,
     pszFilter = (char *)msSmallMalloc(bufferSize);
     snprintf(pszFilter, bufferSize, "<ogc:Filter>\n"
              "<ogc:BBOX>\n"
-             "<ogc:PropertyName>Geometry</ogc:PropertyName>\n"
+             "<ogc:PropertyName>%s</ogc:PropertyName>\n"
              "<gml:Box>\n"
              "<gml:coordinates>%f,%f %f,%f</gml:coordinates>\n"
              "</gml:Box>\n"
              "</ogc:BBOX>\n"
-             "</ogc:Filter>",bbox->minx, bbox->miny, bbox->maxx, bbox->maxy);
+             "</ogc:Filter>", pszGeometryName, bbox->minx, bbox->miny, bbox->maxx, bbox->maxy);
   }
 
   bufferSize = strlen(pszFilter)+500;