[BUGFIX] #11484 QGIS server: embedded layers are not published (GetCapabilities, GetMap, etc)

rldhont · rldhont · commit d64525c0b651 · 2014-10-24T11:29:04.000+02:00
Issue #1072 QGIS server: embedded groups do not render in GetMap requests if leave layers are requested has been fixed 40d9145 But another fix about embedded layers lacks. A fixme annotation is in the QgsServerProjectParser::createLayerFromElement. This one is about return the layer if it is embedded. In QgsServerProjectParser::createLayerFromElement, we need to generate a QgsServerProjectParser of the parent project to return the mapLayer for embedded layers. To do it, I use QgsCacheConfig to get the QgsServerProjectParser for the parent project. Funded by 3Liz.
diff --git a/src/mapserver/qgsconfigcache.cpp b/src/mapserver/qgsconfigcache.cpp
@@ -40,6 +40,12 @@ QgsConfigCache::~QgsConfigCache()
 {
 }
 
+QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& filePath )
+{
+  QDomDocument* doc = xmlDocument( filePath );
+  return new QgsServerProjectParser( doc, filePath );
+}
+
 QgsWCSProjectParser* QgsConfigCache::wcsConfiguration( const QString& filePath )
 {
   QgsWCSProjectParser* p = mWCSConfigCache.object( filePath );
diff --git a/src/mapserver/qgsconfigcache.h b/src/mapserver/qgsconfigcache.h
@@ -23,6 +23,7 @@
 #include <QMap>
 #include <QObject>
 
+class QgsServerProjectParser;
 class QgsWCSProjectParser;
 class QgsWFSProjectParser;
 class QgsWMSConfigParser;
@@ -36,6 +37,7 @@ class QgsConfigCache: public QObject
     static QgsConfigCache* instance();
     ~QgsConfigCache();
 
+    QgsServerProjectParser* serverConfiguration( const QString& filePath );
     QgsWCSProjectParser* wcsConfiguration( const QString& filePath );
     QgsWFSProjectParser* wfsConfiguration( const QString& filePath );
     QgsWMSConfigParser* wmsConfiguration( const QString& filePath, const QMap<QString, QString>& parameterMap = ( QMap< QString, QString >() ) );
diff --git a/src/mapserver/qgsserverprojectparser.cpp b/src/mapserver/qgsserverprojectparser.cpp
@@ -225,24 +225,15 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&
   }
   else if ( elem.attribute( "embedded" ) == "1" ) //layer is embedded from another project file
   {
-    //todo: fixme
-    /*
     QString project = convertToAbsolutePath( elem.attribute( "project" ) );
     QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
-
-    QgsProjectParser* otherConfig = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
+    
+    QgsServerProjectParser* otherConfig = QgsConfigCache::instance()->serverConfiguration( project );
     if ( !otherConfig )
     {
       return 0;
     }
-
-    QHash< QString, QDomElement >::const_iterator layerIt = otherConfig->mProjectLayerElementsById.find( elem.attribute( "id" ) );
-    if ( layerIt == otherConfig->mProjectLayerElementsById.constEnd() )
-    {
-      return 0;
-    }
-    return otherConfig->createLayerFromElement( layerIt.value() );
-    */
+    return otherConfig->mapLayerFromLayerId( elem.attribute( "id" ), useCache );
   }
 
   if ( layer )

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ QgsConfigCache::~QgsConfigCache()`
`40`	`40`	`{`
`41`	`41`	`}`
`42`	`42`
	`43`	`+QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& filePath )`
	`44`	`+{`
	`45`	`+ QDomDocument* doc = xmlDocument( filePath );`
	`46`	`+ return new QgsServerProjectParser( doc, filePath );`
	`47`	`+}`
	`48`	`+`
`43`	`49`	`QgsWCSProjectParser* QgsConfigCache::wcsConfiguration( const QString& filePath )`
`44`	`50`	`{`
`45`	`51`	`QgsWCSProjectParser* p = mWCSConfigCache.object( filePath );`
Original file line number	Diff line number	Diff line change
`@@ -225,24 +225,15 @@ QgsMapLayer* QgsServerProjectParser::createLayerFromElement( const QDomElement&`
`225`	`225`	`}`
`226`	`226`	`else if ( elem.attribute( "embedded" ) == "1" ) //layer is embedded from another project file`
`227`	`227`	`{`
`228`		`- //todo: fixme`
`229`		`- /*`
`230`	`228`	`QString project = convertToAbsolutePath( elem.attribute( "project" ) );`
`231`	`229`	`QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );`
`232`		`-`
`233`		`- QgsProjectParser* otherConfig = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );`
	`230`	`+`
	`231`	`+ QgsServerProjectParser* otherConfig = QgsConfigCache::instance()->serverConfiguration( project );`
`234`	`232`	`if ( !otherConfig )`
`235`	`233`	`{`
`236`	`234`	`return 0;`
`237`	`235`	`}`
`238`		`-`
`239`		`- QHash< QString, QDomElement >::const_iterator layerIt = otherConfig->mProjectLayerElementsById.find( elem.attribute( "id" ) );`
`240`		`- if ( layerIt == otherConfig->mProjectLayerElementsById.constEnd() )`
`241`		`- {`
`242`		`- return 0;`
`243`		`- }`
`244`		`- return otherConfig->createLayerFromElement( layerIt.value() );`
`245`		`- */`
	`236`	`+ return otherConfig->mapLayerFromLayerId( elem.attribute( "id" ), useCache );`
`246`	`237`	`}`
`247`	`238`
`248`	`239`	`if ( layer )`