Fix srsDimension parsing in GML

tcoupin · tcoupin · commit aa65af5e1abe · 2017-07-20T22:47:02.000+02:00
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -480,6 +480,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
   const int nsLen = ( pszSep ) ? ( int )( pszSep - el ) : 0;
   const int localNameLen = ( pszSep ) ? ( int )( elLen - nsLen ) - 1 : elLen;
   ParseMode parseMode( mParseModeStack.isEmpty() ? None : mParseModeStack.top() );
+  int elDimension = 0;
 
   // Figure out if the GML namespace is GML_NAMESPACE or GML32_NAMESPACE
   if ( !mGMLNameSpaceURIPtr && pszSep )
@@ -538,14 +539,14 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
     mParseModeStack.push( QgsGmlStreamingParser::PosList );
     mCoorMode = QgsGmlStreamingParser::PosList;
     mStringCash.clear();
-    if ( mDimension == 0 )
+    if ( elDimension == 0 )
     {
       QString srsDimension = readAttribute( QStringLiteral( "srsDimension" ), attr );
       bool ok;
       int dimension = srsDimension.toInt( &ok );
       if ( ok )
       {
-        mDimension = dimension;
+        elDimension = dimension;
       }
     }
   }
@@ -803,7 +804,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
   if ( !mGeometryString.empty() )
     isGeom = true;
 
-  if ( mDimension == 0 && isGeom )
+  if ( elDimension == 0 && isGeom )
   {
     // srsDimension can also be set on the top geometry element
     // e.g. https://data.linz.govt.nz/services;key=XXXXXXXX/wfs?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=data.linz.govt.nz:layer-524
@@ -812,10 +813,16 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
     int dimension = srsDimension.toInt( &ok );
     if ( ok )
     {
-      mDimension = dimension;
+      elDimension = dimension;
     }
   }
 
+  if ( elDimension != 0 )
+  {
+    mDimension = elDimension;
+  }
+  mDimensionStack.push( mDimension );
+
   if ( mEpsg == 0 && isGeom )
   {
     if ( readEpsgFromAttribute( mEpsg, attr ) != 0 )
@@ -842,6 +849,8 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )
   const int localNameLen = ( pszSep ) ? ( int )( elLen - nsLen ) - 1 : elLen;
   ParseMode parseMode( mParseModeStack.isEmpty() ? None : mParseModeStack.top() );
 
+  mDimension = mDimensionStack.isEmpty() ? 0 : mDimensionStack.top() ;
+
   const bool isGMLNS = ( nsLen == mGMLNameSpaceURI.size() && mGMLNameSpaceURIPtr && memcmp( el, mGMLNameSpaceURIPtr, nsLen ) == 0 );
 
   if ( parseMode == Coordinate && isGMLNS && LOCALNAME_EQUALS( "coordinates" ) )
diff --git a/src/core/qgsgml.h b/src/core/qgsgml.h
@@ -298,7 +298,9 @@ class CORE_EXPORT QgsGmlStreamingParser
     QString mCoordinateSeparator;
     //! Tuple separator for coordinate strings. Usually " "
     QString mTupleSeparator;
-    //! Number of dimensions in pos or posList
+    //! Keep track about number of dimensions in pos or posList
+    QStack<int> mDimensionStack;
+    //! Number of dimensions in pos or posList for the current geometry
     int mDimension;
     //! Coordinates mode, coordinate or posList
     ParseMode mCoorMode;

Original file line number	Diff line number	Diff line change
`@@ -480,6 +480,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char el, const XML_Char *a`
`480`	`480`	`const int nsLen = ( pszSep ) ? ( int )( pszSep - el ) : 0;`
`481`	`481`	`const int localNameLen = ( pszSep ) ? ( int )( elLen - nsLen ) - 1 : elLen;`
`482`	`482`	`ParseMode parseMode( mParseModeStack.isEmpty() ? None : mParseModeStack.top() );`
	`483`	`+ int elDimension = 0;`
`483`	`484`
`484`	`485`	`// Figure out if the GML namespace is GML_NAMESPACE or GML32_NAMESPACE`
`485`	`486`	`if ( !mGMLNameSpaceURIPtr && pszSep )`
`@@ -538,14 +539,14 @@ void QgsGmlStreamingParser::startElement( const XML_Char el, const XML_Char *a`
`538`	`539`	`mParseModeStack.push( QgsGmlStreamingParser::PosList );`
`539`	`540`	`mCoorMode = QgsGmlStreamingParser::PosList;`
`540`	`541`	`mStringCash.clear();`
`541`		`- if ( mDimension == 0 )`
	`542`	`+ if ( elDimension == 0 )`
`542`	`543`	`{`
`543`	`544`	`QString srsDimension = readAttribute( QStringLiteral( "srsDimension" ), attr );`
`544`	`545`	`bool ok;`
`545`	`546`	`int dimension = srsDimension.toInt( &ok );`
`546`	`547`	`if ( ok )`
`547`	`548`	`{`
`548`		`- mDimension = dimension;`
	`549`	`+ elDimension = dimension;`
`549`	`550`	`}`
`550`	`551`	`}`
`551`	`552`	`}`
`@@ -803,7 +804,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char el, const XML_Char *a`
`803`	`804`	`if ( !mGeometryString.empty() )`
`804`	`805`	`isGeom = true;`
`805`	`806`
`806`		`- if ( mDimension == 0 && isGeom )`
	`807`	`+ if ( elDimension == 0 && isGeom )`
`807`	`808`	`{`
`808`	`809`	`// srsDimension can also be set on the top geometry element`
`809`	`810`	`// e.g. https://data.linz.govt.nz/services;key=XXXXXXXX/wfs?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=data.linz.govt.nz:layer-524`
`@@ -812,10 +813,16 @@ void QgsGmlStreamingParser::startElement( const XML_Char el, const XML_Char *a`
`812`	`813`	`int dimension = srsDimension.toInt( &ok );`
`813`	`814`	`if ( ok )`
`814`	`815`	`{`
`815`		`- mDimension = dimension;`
	`816`	`+ elDimension = dimension;`
`816`	`817`	`}`
`817`	`818`	`}`
`818`	`819`
	`820`	`+ if ( elDimension != 0 )`
	`821`	`+ {`
	`822`	`+ mDimension = elDimension;`
	`823`	`+ }`
	`824`	`+ mDimensionStack.push( mDimension );`
	`825`	`+`
`819`	`826`	`if ( mEpsg == 0 && isGeom )`
`820`	`827`	`{`
`821`	`828`	`if ( readEpsgFromAttribute( mEpsg, attr ) != 0 )`
`@@ -842,6 +849,8 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )`
`842`	`849`	`const int localNameLen = ( pszSep ) ? ( int )( elLen - nsLen ) - 1 : elLen;`
`843`	`850`	`ParseMode parseMode( mParseModeStack.isEmpty() ? None : mParseModeStack.top() );`
`844`	`851`
	`852`	`+ mDimension = mDimensionStack.isEmpty() ? 0 : mDimensionStack.top() ;`
	`853`	`+`
`845`	`854`	`const bool isGMLNS = ( nsLen == mGMLNameSpaceURI.size() && mGMLNameSpaceURIPtr && memcmp( el, mGMLNameSpaceURIPtr, nsLen ) == 0 );`
`846`	`855`
`847`	`856`	`if ( parseMode == Coordinate && isGMLNS && LOCALNAME_EQUALS( "coordinates" ) )`