GetStyles: changed layers list from mapLayerFromTypeName to mapLayerFomStyle

elpaso · mhugent · commit b6f9ddcfa503 · 2014-01-12T09:04:22.000+01:00
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -1957,10 +1957,8 @@ QDomDocument QgsProjectParser::getStyles( QStringList& layerList ) const
   for ( int i = 0; i < layerList.size(); i++ )
   {
     QString layerName;
-    QString typeName;
     layerName = layerList.at( i );
-    typeName = layerName.replace( " ", "_" );
-    QList<QgsMapLayer*> currentLayerList = mapLayerFromTypeName( typeName );
+    QList<QgsMapLayer*> currentLayerList = mapLayerFromStyle( layerName, "", true );
     if ( currentLayerList.size() < 1 )
     {
       throw QgsMapServiceException( "Error", QString( "The layer for the TypeName '%1' is not found" ).arg( layerName ) );

Original file line number	Diff line number	Diff line change
`@@ -1957,10 +1957,8 @@ QDomDocument QgsProjectParser::getStyles( QStringList& layerList ) const`
`1957`	`1957`	`for ( int i = 0; i < layerList.size(); i++ )`
`1958`	`1958`	`{`
`1959`	`1959`	`QString layerName;`
`1960`		`- QString typeName;`
`1961`	`1960`	`layerName = layerList.at( i );`
`1962`		`- typeName = layerName.replace( " ", "_" );`
`1963`		`- QList<QgsMapLayer*> currentLayerList = mapLayerFromTypeName( typeName );`
	`1961`	`+ QList<QgsMapLayer*> currentLayerList = mapLayerFromStyle( layerName, "", true );`
`1964`	`1962`	`if ( currentLayerList.size() < 1 )`
`1965`	`1963`	`{`
`1966`	`1964`	`throw QgsMapServiceException( "Error", QString( "The layer for the TypeName '%1' is not found" ).arg( layerName ) );`