Another fix for gml multipolygon reading and hopefully a fix for the …

…build system git-svn-id: http://svn.osgeo.org/qgis/trunk@5912 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 4, 2006 · 25d1ddf · 25d1ddf
1 parent b9083f3
commit 25d1ddf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -95,7 +95,7 @@ else
     AC_MSG_ERROR([Geos Version 2.x.x is needed, but you have $ac_geos_version!])
   else
     AC_MSG_CHECKING([GEOS_CFLAGS])
-    GEOS_CFLAGS="`$GEOS_CONFIG --cflags` `$GEOS_CONFIG --cflags`/geos" 
+    GEOS_CFLAGS=`$GEOS_CONFIG --cflags` 
     AC_MSG_RESULT($GEOS_CFLAGS)
 
     AC_MSG_CHECKING([GEOS_LDADD])

diff --git a/src/plugins/wfs/Makefile.am b/src/plugins/wfs/Makefile.am
@@ -69,6 +69,7 @@ wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
 			      $(DEBUG_QGIS) \
 			      $(GDAL_CFLAGS) \
 			      $(GEOS_CFLAGS) \
+				$(GEOS_CFLAGS)/geos \
 			      	-I../../core \
 			      	-I../../ui \
 			      	-I../../gui \

diff --git a/src/providers/wfs/Makefile.am b/src/providers/wfs/Makefile.am
@@ -14,6 +14,6 @@ BUILT_SOURCES = $(wfsprovider_MOC)
 
 libwfsprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
 libwfsprovider_la_LDFLAGS = -avoid-version -module
-libwfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
+libwfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GEOS_CFLAGS)/geos
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -824,7 +824,7 @@ int QgsWFSProvider::getWkbFromGML2Polygon(const QDomElement& geometryElement, un
     }
 
   //calculate number of bytes to allocate
-  int nrings = 1 + innerBoundaryList.size();
+  int nrings = ringCoordinates.size();
   int npoints = 0;//total number of points
   for(std::vector<std::list<QgsPoint> >::const_iterator it = ringCoordinates.begin(); it != ringCoordinates.end(); ++it)
     {
@@ -1154,12 +1154,12 @@ int QgsWFSProvider::getWkbFromGML2MultiPolygon(const QDomElement& geometryElemen
 	{
 	  std::list<QgsPoint> ringCoordinates;
 	  currentInnerBoundaryElement = innerBoundaryList.at(j).toElement();
-	  linearRingNodeList = currentOuterBoundaryElement.elementsByTagNameNS(GML_NAMESPACE, "LinearRing");
+	  linearRingNodeList = currentInnerBoundaryElement.elementsByTagNameNS(GML_NAMESPACE, "LinearRing");
 	  if(linearRingNodeList.size() < 1)
 	    {
 	      continue;
 	    }
-	  currentLinearRingElement = linearRingNodeList.at(j).toElement(); 
+	  currentLinearRingElement = linearRingNodeList.at(0).toElement(); 
 	  currentCoordinateList = currentLinearRingElement.elementsByTagNameNS(GML_NAMESPACE, "coordinates");
 	  if(currentCoordinateList.size() < 1)
 	    {