sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Issue #1072 QGIS server: embedded groups do not render in GetMap requests if
 leave layers are requested has been fixed 40d91457f6f069886c5ba1c28db1efb2ff4ccac7

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.
This commit is contained in:
rldhont 2014-10-24 11:29:04 +02:00
parent 6bde8a2015
commit d64525c0b6
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mapserver/qgsconfigcache.cpp
View File

@ -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 );

2
src/mapserver/qgsconfigcache.h
View File

@ -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 >() ) );

13
src/mapserver/qgsserverprojectparser.cpp
View File

@ -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 )