Skip to content

Commit

Permalink
[Bugfix] QgsVectorLayer: Read SLD Labeling
Browse files Browse the repository at this point in the history 
The error was:
* QgsRenderer did not exclude SLD TextSymbolzer as a rendering configuration.
* QgsVectorLayer did not well detect SLD Text Symbolizer
* QgsVectorLayer did not well read SLD Labeling produced by QgsVectorLayer

The QgsOgcUtils and QgsSymbolLayerUtils classes have to be enhanced for a better homogenized capabilities.
  • Loading branch information
@rldhont @nyalldawson
rldhont authored and nyalldawson committed Dec 4, 2019
1 parent 66ba86f commit e6559ca
Show file tree
Hide file tree
Showing 3 changed files with 291 additions and 67 deletions.
308 changes: 255 additions & 53 deletions src/core/qgsvectorlayer.cpp
View file
Expand Up @@ -85,6 +85,7 @@
#include "qgsdiagramrenderer.h"
#include "qgsstyle.h"
#include "qgspallabeling.h"
#include "qgsrulebasedlabeling.h"
#include "qgssimplifymethod.h"
#include "qgsstoredexpressionmanager.h"
#include "qgsexpressioncontext.h"
Expand Down Expand Up @@ -4081,31 +4082,207 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
return;
}

QDomElement featureTypeStyleElem = userStyleElem.firstChildElement( QStringLiteral( "FeatureTypeStyle" ) );
if ( featureTypeStyleElem.isNull() )
QDomElement featTypeStyleElem = userStyleElem.firstChildElement( QStringLiteral( "FeatureTypeStyle" ) );
if ( featTypeStyleElem.isNull() )
{
QgsDebugMsgLevel( QStringLiteral( "Info: FeatureTypeStyle element not found." ), 4 );
return;
}

// use last rule
QDomElement ruleElem = featureTypeStyleElem.lastChildElement( QStringLiteral( "Rule" ) );
if ( ruleElem.isNull() )
// create empty FeatureTypeStyle element to merge TextSymbolizer's Rule's from all FeatureTypeStyle's
QDomElement mergedFeatTypeStyle = featTypeStyleElem.cloneNode( false ).toElement();

// use the RuleRenderer when more rules are present or the rule
// has filters or min/max scale denominators set,
// otherwise use the Simple labeling
bool needRuleBasedLabeling = false;
int ruleCount = 0;

while ( !featTypeStyleElem.isNull() )
{
QgsDebugMsgLevel( QStringLiteral( "Info: Rule element not found." ), 4 );
return;
QDomElement ruleElem = featTypeStyleElem.firstChildElement( QStringLiteral( "Rule" ) );
while ( !ruleElem.isNull() )
{
// test rule children element to check if we need to create RuleRenderer
// and if the rule has a symbolizer
bool hasTextSymbolizer = false;
bool hasRuleBased = false;
QDomElement ruleChildElem = ruleElem.firstChildElement();
while ( !ruleChildElem.isNull() )
{
// rule has filter or min/max scale denominator, use the RuleRenderer
if ( ruleChildElem.localName() == QLatin1String( "Filter" ) ||
ruleChildElem.localName() == QLatin1String( "MinScaleDenominator" ) ||
ruleChildElem.localName() == QLatin1String( "MaxScaleDenominator" ) )
{
hasRuleBased = true;
}
// rule has a renderer symbolizer, not a text symbolizer
else if ( ruleChildElem.localName() == QLatin1String( "TextSymbolizer" ) )
{
QgsDebugMsg( QStringLiteral( "TextSymbolizer element found" ) );
hasTextSymbolizer = true;
}

ruleChildElem = ruleChildElem.nextSiblingElement();
}

if ( hasTextSymbolizer )
{
ruleCount++;

// append a clone of all Rules to the merged FeatureTypeStyle element
mergedFeatTypeStyle.appendChild( ruleElem.cloneNode().toElement() );

if ( hasRuleBased )
{
QgsDebugMsg( QStringLiteral( "Filter or Min/MaxScaleDenominator element found: need a RuleBasedLabeling" ) );
needRuleBasedLabeling = true;
}
}

// more rules present, use the RuleRenderer
if ( ruleCount > 1 )
{
QgsDebugMsg( QStringLiteral( "more Rule elements found: need a RuleBasedLabeling" ) );
needRuleBasedLabeling = true;
}

// not use the rule based labeling if no rules with textSymbolizer
if ( ruleCount == 0 )
{
needRuleBasedLabeling = false;
}

ruleElem = ruleElem.nextSiblingElement( QStringLiteral( "Rule" ) );
}
featTypeStyleElem = featTypeStyleElem.nextSiblingElement( QStringLiteral( "FeatureTypeStyle" ) );
}

// use last text symbolizer
QDomElement textSymbolizerElem = ruleElem.lastChildElement( QStringLiteral( "TextSymbolizer" ) );
if ( textSymbolizerElem.isNull() )
if ( ruleCount == 0 )
{
QgsDebugMsgLevel( QStringLiteral( "Info: TextSymbolizer element not found." ), 4 );
QgsDebugMsgLevel( QStringLiteral( "Info: No TextSymbolizer element." ), 4 );
return;
}

QgsPalLayerSettings settings;
QDomElement ruleElem = mergedFeatTypeStyle.firstChildElement( QStringLiteral( "Rule" ) );

if ( needRuleBasedLabeling )
{
QgsDebugMsg( QStringLiteral( "Info: rule based labeling" ) );
QgsRuleBasedLabeling::Rule *rootRule = new QgsRuleBasedLabeling::Rule( nullptr );
while ( !ruleElem.isNull() )
{

QString label, description, filterExp;
int scaleMinDenom = 0, scaleMaxDenom = 0;
QgsPalLayerSettings settings;

// retrieve the Rule element child nodes
QDomElement childElem = ruleElem.firstChildElement();
while ( !childElem.isNull() )
{
if ( childElem.localName() == QLatin1String( "Name" ) )
{
// <se:Name> tag contains the rule identifier,
// so prefer title tag for the label property value
if ( label.isEmpty() )
label = childElem.firstChild().nodeValue();
}
else if ( childElem.localName() == QLatin1String( "Description" ) )
{
// <se:Description> can contains a title and an abstract
QDomElement titleElem = childElem.firstChildElement( QStringLiteral( "Title" ) );
if ( !titleElem.isNull() )
{
label = titleElem.firstChild().nodeValue();
}

QDomElement abstractElem = childElem.firstChildElement( QStringLiteral( "Abstract" ) );
if ( !abstractElem.isNull() )
{
description = abstractElem.firstChild().nodeValue();
}
}
else if ( childElem.localName() == QLatin1String( "Abstract" ) )
{
// <sld:Abstract> (v1.0)
description = childElem.firstChild().nodeValue();
}
else if ( childElem.localName() == QLatin1String( "Title" ) )
{
// <sld:Title> (v1.0)
label = childElem.firstChild().nodeValue();
}
else if ( childElem.localName() == QLatin1String( "Filter" ) )
{
QgsExpression *filter = QgsOgcUtils::expressionFromOgcFilter( childElem );
if ( filter )
{
if ( filter->hasParserError() )
{
QgsDebugMsg( "parser error: " + filter->parserErrorString() );
}
else
{
filterExp = filter->expression();
}
delete filter;
}
}
else if ( childElem.localName() == QLatin1String( "MinScaleDenominator" ) )
{
bool ok;
int v = childElem.firstChild().nodeValue().toInt( &ok );
if ( ok )
scaleMinDenom = v;
}
else if ( childElem.localName() == QLatin1String( "MaxScaleDenominator" ) )
{
bool ok;
int v = childElem.firstChild().nodeValue().toInt( &ok );
if ( ok )
scaleMaxDenom = v;
}
else if ( childElem.localName() == QLatin1String( "TextSymbolizer" ) )
{
readSldTextSymbolizer( childElem, settings );
}

childElem = childElem.nextSiblingElement();
}

QgsRuleBasedLabeling::Rule *ruleLabeling = new QgsRuleBasedLabeling::Rule( &settings, scaleMinDenom, scaleMaxDenom, filterExp, label );
rootRule->appendChild( ruleLabeling );

ruleElem = ruleElem.nextSiblingElement();
}

setLabeling( new QgsRuleBasedLabeling( rootRule ) );
setLabelsEnabled( true );
}
else
{
QgsDebugMsg( QStringLiteral( "Info: simple labeling" ) );
// retrieve the TextSymbolizer element child node
QDomElement textSymbolizerElem = ruleElem.firstChildElement( QStringLiteral( "TextSymbolizer" ) );
QgsPalLayerSettings s;
if ( readSldTextSymbolizer( textSymbolizerElem, s ) )
{
setLabeling( new QgsVectorLayerSimpleLabeling( s ) );
setLabelsEnabled( true );
}
}
}

bool QgsVectorLayer::readSldTextSymbolizer( const QDomNode &node, QgsPalLayerSettings &settings ) const
{
if ( node.localName() != QLatin1String( "TextSymbolizer" ) )
{
QgsDebugMsg( QStringLiteral( "Not a TextSymbolizer element: %1" ).arg( node.localName() ) );
return false;
}
QDomElement textSymbolizerElem = node.toElement();
// Label
QDomElement labelElem = textSymbolizerElem.firstChildElement( QStringLiteral( "Label" ) );
if ( !labelElem.isNull() )
Expand All @@ -4132,19 +4309,22 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
else
{
QgsDebugMsgLevel( QStringLiteral( "SLD label attribute error: %1" ).arg( exp.evalErrorString() ), 3 );
QgsDebugMsg( QStringLiteral( "SLD label attribute error: %1" ).arg( exp.evalErrorString() ) );

This comment has been minimized.

Sign in to view

Copy link
@jef-n

jef-n Dec 4, 2019

Member

two messages?

This comment has been minimized.

Sign in to view

Copy link
@rldhont

rldhont Dec 4, 2019

Author Contributor

I think it's an error of mine during a conflict resolution.
}
}
}
else
{
QgsDebugMsgLevel( QStringLiteral( "Info: PropertyName element not found." ), 4 );
return;
QgsDebugMsg( QStringLiteral( "Info: PropertyName element not found." ) );
return false;
}
}
else
{
QgsDebugMsgLevel( QStringLiteral( "Info: Label element not found." ), 4 );
return;
QgsDebugMsg( QStringLiteral( "Info: Label element not found." ) );
return false;
}

QString fontFamily = QStringLiteral( "Sans-Serif" );
Expand All @@ -4157,44 +4337,35 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
QDomElement fontElem = textSymbolizerElem.firstChildElement( QStringLiteral( "Font" ) );
if ( !fontElem.isNull() )
{
QString cssName;
QString elemText;
QDomElement cssElem = fontElem.firstChildElement( QStringLiteral( "CssParameter" ) );
while ( !cssElem.isNull() )
QgsStringMap fontSvgParams = QgsSymbolLayerUtils::getSvgParameterList( fontElem );
for ( QgsStringMap::iterator it = fontSvgParams.begin(); it != fontSvgParams.end(); ++it )
{
cssName = cssElem.attribute( QStringLiteral( "name" ), QStringLiteral( "not_found" ) );
if ( cssName != QLatin1String( "not_found" ) )
QgsDebugMsg( QStringLiteral( "found fontSvgParams %1: %2" ).arg( it.key(), it.value() ) );

if ( it.key() == QLatin1String( "font-family" ) )
{
elemText = cssElem.text();
if ( cssName == QLatin1String( "font-family" ) )
{
fontFamily = elemText;
}
else if ( cssName == QLatin1String( "font-style" ) )
{
fontItalic = ( elemText == QLatin1String( "italic" ) ) || ( elemText == QLatin1String( "Italic" ) );
}
else if ( cssName == QLatin1String( "font-size" ) )
{
bool ok;
int fontSize = elemText.toInt( &ok );
if ( ok )
{
fontPointSize = fontSize;
}
}
else if ( cssName == QLatin1String( "font-weight" ) )
{
if ( ( elemText == QLatin1String( "bold" ) ) || ( elemText == QLatin1String( "Bold" ) ) )
fontWeight = QFont::Bold;
}
else if ( cssName == QLatin1String( "font-underline" ) )
{
fontUnderline = ( elemText == QLatin1String( "underline" ) ) || ( elemText == QLatin1String( "Underline" ) );
}
fontFamily = it.value();
}
else if ( it.key() == QLatin1String( "font-style" ) )
{
fontItalic = ( it.value() == QLatin1String( "italic" ) ) || ( it.value() == QLatin1String( "Italic" ) );
}
else if ( it.key() == QLatin1String( "font-size" ) )
{
bool ok;
int fontSize = it.value().toInt( &ok );
if ( ok )
fontPointSize = fontSize;
}
else if ( it.key() == QLatin1String( "font-weight" ) )
{
if ( ( it.value() == QLatin1String( "bold" ) ) || ( it.value() == QLatin1String( "Bold" ) ) )
fontWeight = QFont::Bold;
}
else if ( it.key() == QLatin1String( "font-underline" ) )
{
fontUnderline = ( it.value() == QLatin1String( "underline" ) ) || ( it.value() == QLatin1String( "Underline" ) );
}

cssElem = cssElem.nextSiblingElement( QStringLiteral( "CssParameter" ) );
}
}

Expand All @@ -4205,9 +4376,13 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
format.setSize( fontPointSize );

// Fill
QColor textColor = QgsOgcUtils::colorFromOgcFill( textSymbolizerElem.firstChildElement( QStringLiteral( "Fill" ) ) );
QDomElement fillElem = textSymbolizerElem.firstChildElement( QStringLiteral( "Fill" ) );
QColor textColor;
Qt::BrushStyle textBrush = Qt::SolidPattern;
QgsSymbolLayerUtils::fillFromSld( fillElem, textBrush, textColor );
if ( textColor.isValid() )
{
QgsDebugMsg( QStringLiteral( "Info: textColor %1." ).arg( QVariant( textColor ).toString() ) );
format.setColor( textColor );
}

Expand All @@ -4231,9 +4406,13 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
}
}

QColor bufferColor = QgsOgcUtils::colorFromOgcFill( haloElem.firstChildElement( QStringLiteral( "Fill" ) ) );
QDomElement haloFillElem = haloElem.firstChildElement( QStringLiteral( "Fill" ) );
QColor bufferColor;
Qt::BrushStyle bufferBrush = Qt::SolidPattern;
QgsSymbolLayerUtils::fillFromSld( haloFillElem, bufferBrush, bufferColor );
if ( bufferColor.isValid() )
{
QgsDebugMsg( QStringLiteral( "Info: bufferColor %1." ).arg( QVariant( bufferColor ).toString() ) );
bufferSettings.setColor( bufferColor );
}
}
Expand Down Expand Up @@ -4272,6 +4451,30 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )
}
}
}
QDomElement anchorPointElem = pointPlacementElem.firstChildElement( QStringLiteral( "AnchorPoint" ) );
if ( !anchorPointElem.isNull() )
{
QDomElement anchorPointXElem = anchorPointElem.firstChildElement( QStringLiteral( "AnchorPointX" ) );
if ( !anchorPointXElem.isNull() )
{
bool ok;
double xOffset = anchorPointXElem.text().toDouble( &ok );
if ( ok )
{
settings.xOffset = xOffset;
}
}
QDomElement anchorPointYElem = anchorPointElem.firstChildElement( QStringLiteral( "AnchorPointY" ) );
if ( !anchorPointYElem.isNull() )
{
bool ok;
double yOffset = anchorPointYElem.text().toDouble( &ok );
if ( ok )
{
settings.yOffset = yOffset;
}
}
}

QDomElement rotationElem = pointPlacementElem.firstChildElement( QStringLiteral( "Rotation" ) );
if ( !rotationElem.isNull() )
Expand All @@ -4288,8 +4491,7 @@ void QgsVectorLayer::readSldLabeling( const QDomNode &node )

format.setBuffer( bufferSettings );
settings.setFormat( format );
setLabeling( new QgsVectorLayerSimpleLabeling( settings ) );
setLabelsEnabled( true );
return true;
}

QgsEditFormConfig QgsVectorLayer::editFormConfig() const
Expand Down

0 comments on commit e6559ca

Please sign in to comment.