sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-09 00:35:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[layout] Fix invalid svg exports when including metadata

Browse Source 
The generated svgs with cc:Work elements were failing xml validation,
causing illustrator to reject them. Add the required ns for cc:Work
and also adapt the svg metadata to be compatible both with the svg
spec AND the metadata format Inkscape uses.

Fixes #28130
This commit is contained in:
Nyall Dawson 2019-09-20 09:10:20 +10:00
parent ebdda229d2
commit cc94aebc6f
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/layout/qgslayoutexporter.cpp
View File

@ -1335,16 +1335,24 @@ void QgsLayoutExporter::appendMetadataToSvg( QDomDocument &svg ) const
{
const QgsProjectMetadata &metadata = mLayout->project()->metadata();
QDomElement metadataElement = svg.createElement( QStringLiteral( "metadata" ) );
metadataElement.setAttribute( QStringLiteral( "id" ), QStringLiteral( "qgismetadata" ) );
QDomElement rdfElement = svg.createElement( QStringLiteral( "rdf:RDF" ) );
rdfElement.setAttribute( QStringLiteral( "xmlns:rdf" ), QStringLiteral( "http://www.w3.org/1999/02/22-rdf-syntax-ns#" ) );
rdfElement.setAttribute( QStringLiteral( "xmlns:rdfs" ), QStringLiteral( "http://www.w3.org/2000/01/rdf-schema#" ) );
rdfElement.setAttribute( QStringLiteral( "xmlns:dc" ), QStringLiteral( "http://purl.org/dc/elements/1.1/" ) );
QDomElement descriptionElement = svg.createElement( QStringLiteral( "rdf:Description" ) );
QDomElement workElement = svg.createElement( QStringLiteral( "cc:Work" ) );
workElement.setAttribute( QStringLiteral( "rdf:about" ), QString() );
auto addTextNode = [&workElement, &svg]( const QString & tag, const QString & value )
auto addTextNode = [&workElement, &descriptionElement, &svg]( const QString & tag, const QString & value )
{
// inkscape compatible
QDomElement element = svg.createElement( tag );
QDomText t = svg.createTextNode( value );
element.appendChild( t );
workElement.appendChild( element );
// svg spec compatible
descriptionElement.setAttribute( tag, value );
};
addTextNode( QStringLiteral( "dc:format" ), QStringLiteral( "image/svg+xml" ) );
@ -1353,16 +1361,28 @@ void QgsLayoutExporter::appendMetadataToSvg( QDomDocument &svg ) const
addTextNode( QStringLiteral( "dc:identifier" ), metadata.identifier() );
addTextNode( QStringLiteral( "dc:description" ), metadata.abstract() );
auto addAgentNode = [&workElement, &svg]( const QString & tag, const QString & value )
auto addAgentNode = [&workElement, &descriptionElement, &svg]( const QString & tag, const QString & value )
{
QDomElement element = svg.createElement( tag );
// inkscape compatible
QDomElement inkscapeElement = svg.createElement( tag );
QDomElement agentElement = svg.createElement( QStringLiteral( "cc:Agent" ) );
QDomElement titleElement = svg.createElement( QStringLiteral( "dc:title" ) );
QDomText t = svg.createTextNode( value );
titleElement.appendChild( t );
agentElement.appendChild( titleElement );
element.appendChild( agentElement );
workElement.appendChild( element );
inkscapeElement.appendChild( agentElement );
workElement.appendChild( inkscapeElement );
// svg spec compatible
QDomElement bagElement = svg.createElement( QStringLiteral( "rdf:Bag" ) );
QDomElement liElement = svg.createElement( QStringLiteral( "rdf:li" ) );
t = svg.createTextNode( value );
liElement.appendChild( t );
bagElement.appendChild( liElement );
QDomElement element = svg.createElement( tag );
element.appendChild( bagElement );
descriptionElement.appendChild( element );
};
addAgentNode( QStringLiteral( "dc:creator" ), metadata.author() );
@ -1386,11 +1406,14 @@ void QgsLayoutExporter::appendMetadataToSvg( QDomDocument &svg ) const
}
element.appendChild( bagElement );
workElement.appendChild( element );
descriptionElement.appendChild( element );
}
rdfElement.appendChild( descriptionElement );
rdfElement.appendChild( workElement );
metadataElement.appendChild( rdfElement );
svg.documentElement().appendChild( metadataElement );
svg.documentElement().setAttribute( QStringLiteral( "xmlns:cc" ), QStringLiteral( "http://creativecommons.org/ns#" ) );
}
std::unique_ptr<double[]> QgsLayoutExporter::computeGeoTransform( const QgsLayoutItemMap *map, const QRectF &region, double dpi ) const

1
tests/src/python/test_qgslayoutexporter.py
View File

@ -635,6 +635,7 @@ class TestQgsLayoutExporter(unittest.TestCase):
self.assertEqual('proj abstract' in open(f).read(), expected)
self.assertEqual('kw1' in open(f).read(), expected)
self.assertEqual('kw2' in open(f).read(), expected)
self.assertEqual('xmlns:cc="http://creativecommons.org/ns#"' in open(f).read(), expected)
for f in [svg_file_path, svg_file_path_2]:
checkMetadata(f, True)