Fix for accessing groups in mapserver

mhugent · mhugent · commit 55537d6345e8 · 2011-01-24T14:05:05.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15069 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -310,23 +310,24 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
   //maybe the layer is a goup. Check if lName is contained in the group list
   QMap< QString, QDomElement > idLayerMap = projectLayerElementsById();
 
-  QList< GroupLayerInfo > groupInfo = groupLayerRelationshipFromProject();
-  QList< GroupLayerInfo >::const_iterator groupIt = groupInfo.constBegin();
-  for ( ; groupIt != groupInfo.constEnd(); ++groupIt )
+  QList<QDomElement> legendGroups = legendGroupElements();
+  QList<QDomElement>::const_iterator groupIt = legendGroups.constBegin();
+  for ( ; groupIt != legendGroups.constEnd(); ++groupIt )
   {
-    if ( groupIt->first == lName )
+    if ( groupIt->attribute( "name" ) == lName )
     {
-      QList< QString >::const_iterator layerIdIt = groupIt->second.constBegin();
-      for ( ; layerIdIt != groupIt->second.constEnd(); ++layerIdIt )
+      QDomNodeList layerFileList = groupIt->elementsByTagName( "legendlayerfile" );
+      for ( int i = 0; i < layerFileList.size(); ++i )
       {
-        QMap< QString, QDomElement >::const_iterator layerEntry = idLayerMap.find( *layerIdIt );
+        QMap< QString, QDomElement >::const_iterator layerEntry = idLayerMap.find( layerFileList.at( i ).toElement().attribute( "layerid" ) );
         if ( layerEntry != idLayerMap.constEnd() )
         {
           layerList.push_back( createLayerFromElement( layerEntry.value() ) );
         }
       }
     }
   }
+
   return layerList;
 }
 
@@ -609,6 +610,27 @@ QList<QDomElement> QgsProjectParser::projectLayerElements() const
   return layerElemList;
 }
 
+QList<QDomElement> QgsProjectParser::legendGroupElements() const
+{
+  QList<QDomElement> groupList;
+  if ( !mXMLDoc )
+  {
+    return groupList;
+  }
+
+  QDomElement legendElement = mXMLDoc->documentElement().firstChildElement( "legend" );
+  if ( legendElement.isNull() )
+  {
+    return groupList;
+  }
+
+  QDomNodeList groupNodeList = legendElement.elementsByTagName( "legendgroup" );
+  for ( int i = 0; i < groupNodeList.size(); ++i )
+  {
+    groupList.push_back( groupNodeList.at( i ).toElement() );
+  }
+}
+
 QMap< QString, QDomElement > QgsProjectParser::projectLayerElementsById() const
 {
   QMap< QString, QDomElement > layerMap;
diff --git a/src/mapserver/qgsprojectparser.h b/src/mapserver/qgsprojectparser.h
@@ -102,6 +102,8 @@ class QgsProjectParser: public QgsConfigParser
 
     /**Get all layers of the project (ordered same as in the project file)*/
     QList<QDomElement> projectLayerElements() const;
+    /**Returns all legend group elements*/
+    QList<QDomElement> legendGroupElements() const;
     /**Get all layers of the project, accessible by layer id*/
     QMap< QString, QDomElement > projectLayerElementsById() const;
     /**Get all layers of the project, accessible by layer name*/

Original file line number	Diff line number	Diff line change
`@@ -310,23 +310,24 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c`
`310`	`310`	`//maybe the layer is a goup. Check if lName is contained in the group list`
`311`	`311`	`QMap< QString, QDomElement > idLayerMap = projectLayerElementsById();`
`312`	`312`
`313`		`- QList< GroupLayerInfo > groupInfo = groupLayerRelationshipFromProject();`
`314`		`- QList< GroupLayerInfo >::const_iterator groupIt = groupInfo.constBegin();`
`315`		`- for ( ; groupIt != groupInfo.constEnd(); ++groupIt )`
	`313`	`+ QList<QDomElement> legendGroups = legendGroupElements();`
	`314`	`+ QList<QDomElement>::const_iterator groupIt = legendGroups.constBegin();`
	`315`	`+ for ( ; groupIt != legendGroups.constEnd(); ++groupIt )`
`316`	`316`	`{`
`317`		`- if ( groupIt->first == lName )`
	`317`	`+ if ( groupIt->attribute( "name" ) == lName )`
`318`	`318`	`{`
`319`		`- QList< QString >::const_iterator layerIdIt = groupIt->second.constBegin();`
`320`		`- for ( ; layerIdIt != groupIt->second.constEnd(); ++layerIdIt )`
	`319`	`+ QDomNodeList layerFileList = groupIt->elementsByTagName( "legendlayerfile" );`
	`320`	`+ for ( int i = 0; i < layerFileList.size(); ++i )`
`321`	`321`	`{`
`322`		`- QMap< QString, QDomElement >::const_iterator layerEntry = idLayerMap.find( *layerIdIt );`
	`322`	`+ QMap< QString, QDomElement >::const_iterator layerEntry = idLayerMap.find( layerFileList.at( i ).toElement().attribute( "layerid" ) );`
`323`	`323`	`if ( layerEntry != idLayerMap.constEnd() )`
`324`	`324`	`{`
`325`	`325`	`layerList.push_back( createLayerFromElement( layerEntry.value() ) );`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`	`}`
	`330`	`+`
`330`	`331`	`return layerList;`
`331`	`332`	`}`
`332`	`333`
`@@ -609,6 +610,27 @@ QList<QDomElement> QgsProjectParser::projectLayerElements() const`
`609`	`610`	`return layerElemList;`
`610`	`611`	`}`
`611`	`612`
	`613`	`+QList<QDomElement> QgsProjectParser::legendGroupElements() const`
	`614`	`+{`
	`615`	`+ QList<QDomElement> groupList;`
	`616`	`+ if ( !mXMLDoc )`
	`617`	`+ {`
	`618`	`+ return groupList;`
	`619`	`+ }`
	`620`	`+`
	`621`	`+ QDomElement legendElement = mXMLDoc->documentElement().firstChildElement( "legend" );`
	`622`	`+ if ( legendElement.isNull() )`
	`623`	`+ {`
	`624`	`+ return groupList;`
	`625`	`+ }`
	`626`	`+`
	`627`	`+ QDomNodeList groupNodeList = legendElement.elementsByTagName( "legendgroup" );`
	`628`	`+ for ( int i = 0; i < groupNodeList.size(); ++i )`
	`629`	`+ {`
	`630`	`+ groupList.push_back( groupNodeList.at( i ).toElement() );`
	`631`	`+ }`
	`632`	`+}`
	`633`	`+`
`612`	`634`	`QMap< QString, QDomElement > QgsProjectParser::projectLayerElementsById() const`
`613`	`635`	`{`
`614`	`636`	`QMap< QString, QDomElement > layerMap;`