WMS 1.3.0 compliance: use the reserved word 'None' if no fees

mhugent · mhugent · commit df411eb648c4 · 2016-11-29T11:27:50.000+01:00
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -586,7 +586,7 @@ void QgsServerProjectParser::serviceCapabilities( QDomElement& parentElement, QD
   //Fees
   QDomElement feesElem = propertiesElement.firstChildElement( QStringLiteral( "WMSFees" ) );
   QDomElement wmsFeesElem = doc.createElement( QStringLiteral( "Fees" ) );
-  QDomText wmsFeesText = doc.createTextNode( QStringLiteral( "conditions unknown" ) ); // default value if access conditions are unknown
+  QDomText wmsFeesText = doc.createTextNode( QStringLiteral( "None" ) ); // default value if access conditions are unknown
   if ( !feesElem.isNull() && !feesElem.text().isEmpty() )
   {
     wmsFeesText = doc.createTextNode( feesElem.text() );

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ void QgsServerProjectParser::serviceCapabilities( QDomElement& parentElement, QD`
`586`	`586`	`//Fees`
`587`	`587`	`QDomElement feesElem = propertiesElement.firstChildElement( QStringLiteral( "WMSFees" ) );`
`588`	`588`	`QDomElement wmsFeesElem = doc.createElement( QStringLiteral( "Fees" ) );`
`589`		`- QDomText wmsFeesText = doc.createTextNode( QStringLiteral( "conditions unknown" ) ); // default value if access conditions are unknown`
	`589`	`+ QDomText wmsFeesText = doc.createTextNode( QStringLiteral( "None" ) ); // default value if access conditions are unknown`
`590`	`590`	`if ( !feesElem.isNull() && !feesElem.text().isEmpty() )`
`591`	`591`	`{`
`592`	`592`	`wmsFeesText = doc.createTextNode( feesElem.text() );`