Skip to content

Commit

Permalink
Some xml optimisation for WMS server
Browse files Browse the repository at this point in the history
  • Loading branch information
marco committed Oct 15, 2011
1 parent b3bebf3 commit 3d9a0ae
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 139 deletions.
191 changes: 60 additions & 131 deletions src/mapserver/qgsprojectparser.cpp
View file
Expand Up @@ -44,6 +44,31 @@ QgsProjectParser::QgsProjectParser( QDomDocument* xmlDoc, const QString& filePat
mOutputUnits = QgsMapRenderer::Millimeters;
setLegendParametersFromProject();
setSelectionColor();

//accelerate search for layers and groups
if ( mXMLDoc )
{
QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
QDomElement currentElement;
int nNodes = layerNodeList.size();
for ( int i = 0; i < nNodes; ++i )
{
currentElement = layerNodeList.at( i ).toElement();
mProjectLayerElements.push_back( currentElement );
mProjectLayerElementsByName.insert( layerName( currentElement ), currentElement );
mProjectLayerElementsById.insert( layerId( currentElement ), currentElement );
}

QDomElement legendElement = mXMLDoc->documentElement().firstChildElement( "legend" );
if ( !legendElement.isNull() )
{
QDomNodeList groupNodeList = legendElement.elementsByTagName( "legendgroup" );
for ( int i = 0; i < groupNodeList.size(); ++i )
{
mLegendGroupElements.push_back( groupNodeList.at( i ).toElement() );
}
}
}
}

QgsProjectParser::~QgsProjectParser()
Expand All @@ -53,25 +78,22 @@ QgsProjectParser::~QgsProjectParser()

int QgsProjectParser::numberOfLayers() const
{
QList<QDomElement> layerElems = projectLayerElements();
return layerElems.size();
return mProjectLayerElements.size();
}

void QgsProjectParser::layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc ) const
{
QList<QDomElement> layerElems = projectLayerElements();

QStringList nonIdentifiableLayers = identifyDisabledLayers();

if ( layerElems.size() < 1 )
if ( mProjectLayerElements.size() < 1 )
{
return;
}

QMap<QString, QgsMapLayer *> layerMap;

QList<QDomElement>::const_iterator layerIt = layerElems.constBegin();
for ( ; layerIt != layerElems.constEnd(); ++layerIt )
QList<QDomElement>::const_iterator layerIt = mProjectLayerElements.constBegin();
for ( ; layerIt != mProjectLayerElements.constEnd(); ++layerIt )
{
QgsMapLayer *layer = createLayerFromElement( *layerIt );
if ( layer )
Expand Down Expand Up @@ -151,9 +173,8 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
QStringList pIdDisabled = p->identifyDisabledLayers();

QDomElement embeddedGroupElem;
QList<QDomElement> pLegendElems = p->legendGroupElements();
QList<QDomElement>::const_iterator pLegendIt = pLegendElems.constBegin();
for ( ; pLegendIt != pLegendElems.constEnd(); ++pLegendIt )
QList<QDomElement>::const_iterator pLegendIt = mLegendGroupElements.constBegin();
for ( ; pLegendIt != mLegendGroupElements.constEnd(); ++pLegendIt )
{
if ( pLegendIt->attribute( "name" ) == embeddedGroupName )
{
Expand All @@ -162,10 +183,9 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
}
}

QList<QDomElement> pLayerElems = p->projectLayerElements();
QMap<QString, QgsMapLayer *> pLayerMap;
QList<QDomElement>::const_iterator pLayerIt = pLayerElems.constBegin();
for ( ; pLayerIt != pLayerElems.constEnd(); ++pLayerIt )
QList<QDomElement>::const_iterator pLayerIt = mProjectLayerElements.constBegin();
for ( ; pLayerIt != mProjectLayerElements.constEnd(); ++pLayerIt )
{
pLayerMap.insert( layerId( *pLayerIt ), p->createLayerFromElement( *pLayerIt ) );
}
Expand Down Expand Up @@ -308,19 +328,17 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
//Check if layer name refers to the top level group for the project.
if ( lName == projectTitle() )
{
QList<QDomElement> layerElemList = projectLayerElements();
QList<QDomElement>::const_iterator layerElemIt = layerElemList.constBegin();
for ( ; layerElemIt != layerElemList.constEnd(); ++layerElemIt )
QList<QDomElement>::const_iterator layerElemIt = mProjectLayerElements.constBegin();
for ( ; layerElemIt != mProjectLayerElements.constEnd(); ++layerElemIt )
{
layerList.push_back( createLayerFromElement( *layerElemIt, useCache ) );
}
return layerList;
}

//does lName refer to a leaf layer
QMap< QString, QDomElement > layerElemMap = projectLayerElementsByName();
QMap< QString, QDomElement >::const_iterator layerElemIt = layerElemMap.find( lName );
if ( layerElemIt != layerElemMap.constEnd() )
QHash< QString, QDomElement >::const_iterator layerElemIt = mProjectLayerElementsByName.find( lName );
if ( layerElemIt != mProjectLayerElementsByName.constEnd() )
{
QgsMapLayer* layer = createLayerFromElement( layerElemIt.value(), useCache );
if ( layer )
Expand All @@ -331,11 +349,8 @@ 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<QDomElement> legendGroups = legendGroupElements();
QList<QDomElement>::const_iterator groupIt = legendGroups.constBegin();
for ( ; groupIt != legendGroups.constEnd(); ++groupIt )
QList<QDomElement>::const_iterator groupIt = mLegendGroupElements.constBegin();
for ( ; groupIt != mLegendGroupElements.constEnd(); ++groupIt )
{
if ( groupIt->attribute( "name" ) == lName )
{
Expand All @@ -346,11 +361,10 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
if ( p )
{
QList<QDomElement> pGroupElems = p->legendGroupElements();
QList<QDomElement>::const_iterator pGroupIt = pGroupElems.constBegin();
QList<QDomElement>::const_iterator pGroupIt = mLegendGroupElements.constBegin();
QDomElement embeddedGroupElem;

for ( ; pGroupIt != pGroupElems.constEnd(); ++pGroupIt )
for ( ; pGroupIt != mLegendGroupElements.constEnd(); ++pGroupIt )
{
if ( pGroupIt->attribute( "name" ) == lName )
{
Expand All @@ -362,12 +376,11 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
if ( !embeddedGroupElem.isNull() )
{
//add all the layers under the group
QMap< QString, QDomElement > pLayerElems = p->projectLayerElementsById();
QDomNodeList pLayerNodes = embeddedGroupElem.elementsByTagName( "legendlayer" );
for ( int i = 0; i < pLayerNodes.size(); ++i )
{
QString pLayerId = pLayerNodes.at( i ).toElement().firstChildElement( "filegroup" ).firstChildElement( "legendlayerfile" ).attribute( "layerid" );
QgsMapLayer* pLayer = p->createLayerFromElement( pLayerElems[pLayerId], useCache );
QgsMapLayer* pLayer = p->createLayerFromElement( mProjectLayerElementsById[pLayerId], useCache );
if ( pLayer )
{
layerList.push_back( pLayer );
Expand All @@ -381,8 +394,8 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
QDomNodeList layerFileList = groupIt->elementsByTagName( "legendlayerfile" );
for ( int i = 0; i < layerFileList.size(); ++i )
{
QMap< QString, QDomElement >::const_iterator layerEntry = idLayerMap.find( layerFileList.at( i ).toElement().attribute( "layerid" ) );
if ( layerEntry != idLayerMap.constEnd() )
QHash< QString, QDomElement >::const_iterator layerEntry = mProjectLayerElementsById.find( layerFileList.at( i ).toElement().attribute( "layerid" ) );
if ( layerEntry != mProjectLayerElementsById.constEnd() )
{
layerList.push_back( createLayerFromElement( layerEntry.value(), useCache ) );
}
Expand All @@ -393,8 +406,8 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
}

//maybe the layer is embedded from another project
QMap< QString, QDomElement >::const_iterator layerIt = idLayerMap.constBegin();
for ( ; layerIt != idLayerMap.constEnd(); ++layerIt )
QHash< QString, QDomElement >::const_iterator layerIt = mProjectLayerElementsById.constBegin();
for ( ; layerIt != mProjectLayerElementsById.constEnd(); ++layerIt )
{
if ( layerIt.value().attribute( "embedded" ) == "1" )
{
Expand All @@ -407,9 +420,8 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
if ( otherParser )
{
//get element by id
QMap< QString, QDomElement > otherLayerElems = otherParser->projectLayerElementsById();
QMap< QString, QDomElement >::const_iterator otherLayerIt = otherLayerElems.find( id );
if ( otherLayerIt != otherLayerElems.constEnd() )
QHash< QString, QDomElement >::const_iterator otherLayerIt = otherParser->mProjectLayerElementsById.find( id );
if ( otherLayerIt != otherParser->mProjectLayerElementsById.constEnd() )
{
if ( otherLayerIt.value().firstChildElement( "layername" ).text() == lName )
{
Expand All @@ -422,8 +434,8 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
}

//layer still not found. Check if it is a single layer contained in a embedded layer group
groupIt = legendGroups.constBegin();
for ( ; groupIt != legendGroups.constEnd(); ++groupIt )
groupIt = mLegendGroupElements.constBegin();
for ( ; groupIt != mLegendGroupElements.constEnd(); ++groupIt )
{
if ( groupIt->attribute( "embedded" ) == "1" )
{
Expand All @@ -432,9 +444,8 @@ QList<QgsMapLayer*> QgsProjectParser::mapLayerFromStyle( const QString& lName, c
QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
if ( p )
{
QMap< QString, QDomElement > pLayers = p->projectLayerElementsByName();
QMap< QString, QDomElement >::const_iterator pLayerIt = pLayers.find( lName );
if ( pLayerIt != pLayers.constEnd() )
QHash< QString, QDomElement >::const_iterator pLayerIt = mProjectLayerElementsByName.find( lName );
if ( pLayerIt != mProjectLayerElementsByName.constEnd() )
{
QgsMapLayer* layer = p->createLayerFromElement( pLayerIt.value() );
if ( layer )
Expand All @@ -456,12 +467,11 @@ int QgsProjectParser::layersAndStyles( QStringList& layers, QStringList& styles
layers.clear();
styles.clear();

QList<QDomElement> layerElemList = projectLayerElements();
QList<QDomElement>::const_iterator elemIt = layerElemList.constBegin();
QList<QDomElement>::const_iterator elemIt = mProjectLayerElements.constBegin();

QString currentLayerName;

for ( ; elemIt != layerElemList.constEnd(); ++elemIt )
for ( ; elemIt != mProjectLayerElements.constEnd(); ++elemIt )
{
currentLayerName = layerName( *elemIt );
if ( !currentLayerName.isNull() )
Expand Down Expand Up @@ -600,9 +610,8 @@ QMap< QString, QMap< int, QString > > QgsProjectParser::layerAliasInfo() const
{
QMap< QString, QMap< int, QString > > resultMap;

QList<QDomElement> layerElems = projectLayerElements();
QList<QDomElement>::const_iterator layerIt = layerElems.constBegin();
for ( ; layerIt != layerElems.constEnd(); ++layerIt )
QList<QDomElement>::const_iterator layerIt = mProjectLayerElements.constBegin();
for ( ; layerIt != mProjectLayerElements.constEnd(); ++layerIt )
{
QDomNodeList aNodeList = layerIt->elementsByTagName( "aliases" );
if ( aNodeList.size() > 0 )
Expand All @@ -624,9 +633,8 @@ QMap< QString, QMap< int, QString > > QgsProjectParser::layerAliasInfo() const
QMap< QString, QSet<QString> > QgsProjectParser::hiddenAttributes() const
{
QMap< QString, QSet<QString> > resultMap;
QList<QDomElement> layerElems = projectLayerElements();
QList<QDomElement>::const_iterator layerIt = layerElems.constBegin();
for ( ; layerIt != layerElems.constEnd(); ++layerIt )
QList<QDomElement>::const_iterator layerIt = mProjectLayerElements.constBegin();
for ( ; layerIt != mProjectLayerElements.constEnd(); ++layerIt )
{
QDomNodeList editTypesList = layerIt->elementsByTagName( "edittypes" );
if ( editTypesList.size() > 0 )
Expand Down Expand Up @@ -754,84 +762,6 @@ QString QgsProjectParser::projectTitle() const
return projectFileInfo.baseName();
}

QList<QDomElement> QgsProjectParser::projectLayerElements() const
{
QList<QDomElement> layerElemList;
if ( !mXMLDoc )
{
return layerElemList;
}

QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
int nNodes = layerNodeList.size();
for ( int i = 0; i < nNodes; ++i )
{
layerElemList.push_back( layerNodeList.at( i ).toElement() );
}
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() );
}

return groupList;
}

QMap< QString, QDomElement > QgsProjectParser::projectLayerElementsById() const
{
QMap< QString, QDomElement > layerMap;
if ( !mXMLDoc )
{
return layerMap;
}

QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
QDomElement currentElement;
int nNodes = layerNodeList.size();
for ( int i = 0; i < nNodes; ++i )
{
currentElement = layerNodeList.at( i ).toElement();
layerMap.insert( layerId( currentElement ), currentElement );
}
return layerMap;
}

QMap< QString, QDomElement > QgsProjectParser::projectLayerElementsByName() const
{
QMap< QString, QDomElement > layerMap;
if ( !mXMLDoc )
{
return layerMap;
}

QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
QDomElement currentElement;
int nNodes = layerNodeList.size();
for ( int i = 0; i < nNodes; ++i )
{
currentElement = layerNodeList.at( i ).toElement();
layerMap.insert( layerName( currentElement ), currentElement );
}
return layerMap;
}

QgsMapLayer* QgsProjectParser::createLayerFromElement( const QDomElement& elem, bool useCache ) const
{
if ( elem.isNull() || !mXMLDoc )
Expand Down Expand Up @@ -885,9 +815,8 @@ QgsMapLayer* QgsProjectParser::createLayerFromElement( const QDomElement& elem,
return 0;
}

QMap< QString, QDomElement > layerMap = otherConfig->projectLayerElementsById();
QMap< QString, QDomElement >::const_iterator layerIt = layerMap.find( elem.attribute( "id" ) );
if ( layerIt == layerMap.constEnd() )
QHash< QString, QDomElement >::const_iterator layerIt = otherConfig->mProjectLayerElementsById.find( elem.attribute( "id" ) );
if ( layerIt == otherConfig->mProjectLayerElementsById.constEnd() )
{
return 0;
}
Expand Down
17 changes: 9 additions & 8 deletions src/mapserver/qgsprojectparser.h
View file
Expand Up @@ -108,14 +108,15 @@ class QgsProjectParser: public QgsConfigParser
/**Absolute project file path (including file name)*/
QString mProjectPath;

/**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*/
QMap< QString, QDomElement > projectLayerElementsByName() const;
/**List of project layer (ordered same as in the project file)*/
QList<QDomElement> mProjectLayerElements;
/**List of all legend group elements*/
QList<QDomElement> mLegendGroupElements;
/**Project layer elements, accessible by layer id*/
QHash< QString, QDomElement > mProjectLayerElementsById;
/**Project layer elements, accessible by layer name*/
QHash< QString, QDomElement > mProjectLayerElementsByName;

/**Creates a maplayer object from <maplayer> element. The layer cash owns the maplayer, so don't delete it
@return the maplayer or 0 in case of error*/
QgsMapLayer* createLayerFromElement( const QDomElement& elem, bool useCache = true ) const;
Expand Down

0 comments on commit 3d9a0ae

Please sign in to comment.