[Mapbender-commits] r5302 - branches/2.6/http/classes

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-01-12 10:07:07 -0500 (Tue, 12 Jan 2010)
New Revision: 5302

Modified:
   branches/2.6/http/classes/class_gml_3_factory.php
Log:
parse surfaceMembers, lineMembers... correctly

Modified: branches/2.6/http/classes/class_gml_3_factory.php
===================================================================
--- branches/2.6/http/classes/class_gml_3_factory.php	2010-01-12 15:05:58 UTC (rev 5301)
+++ branches/2.6/http/classes/class_gml_3_factory.php	2010-01-12 15:07:07 UTC (rev 5302)
@@ -152,6 +152,9 @@
 		$simpleXMLNode->registerXPathNamespace('gml', 'http://www.opengis.net/gml');
 		
 		$allCoords = $simpleXMLNode->xpath("gml:lineStringMember/gml:LineString/gml:posList");
+		if (count($allCoords) === 0) {
+			$allCoords = $simpleXMLNode->xpath("gml:lineStringMembers/gml:LineString/gml:posList");
+		}
 			
 		$cnt=0;
 		foreach ($allCoords as $Coords) {
@@ -180,6 +183,9 @@
 		$simpleXMLNode->registerXPathNamespace('gml', 'http://www.opengis.net/gml');
 		
 		$allCoords = $simpleXMLNode->xpath("gml:pointMember/gml:Point/gml:pos");
+		if (count($allCoords) === 0) {
+			$allCoords = $simpleXMLNode->xpath("gml:pointMembers/gml:Point/gml:pos");
+		}
 			
 		foreach ($allCoords as $Coords) {
 			
@@ -205,6 +211,9 @@
 		$simpleXMLNode->registerXPathNamespace('gml', 'http://www.opengis.net/gml');
 		
 		$allCoords = $simpleXMLNode->xpath("gml:curveMembers/gml:LineString/gml:posList");
+		if (count($allCoords) === 0) {
+			$allCoords = $simpleXMLNode->xpath("gml:curveMember/gml:LineString/gml:posList");
+		}
 			
 		$cnt=0;
 		foreach ($allCoords as $Coords) {
@@ -233,6 +242,9 @@
 		$simpleXMLNode->registerXPathNamespace('gml', 'http://www.opengis.net/gml');
 
 		$allPolygons = $simpleXMLNode->xpath("gml:surfaceMember/gml:Polygon");
+		if (count($allPolygons) === 0) {
+			$allPolygons = $simpleXMLNode->xpath("gml:surfaceMembers/gml:Polygon");
+		}
 		
 		$cnt=0;
 		foreach ($allPolygons as $polygon) {
@@ -426,4 +438,4 @@
 	
 	
 }
-?>
\ No newline at end of file
+?>