Remove special characters on wms dimension extent

Samweli · web-flow · commit a001adbdabbc · 2020-05-05T05:52:35.000+10:00
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -1075,7 +1075,7 @@ void QgsWmsCapabilities::parseDimension( const QDomElement &element, QgsWmsDimen
     dimensionProperty.current = ( currentAttribute == QLatin1String( "1" ) || currentAttribute == QLatin1String( "true" ) );
   }
 
-  dimensionProperty.extent = element.text();
+  dimensionProperty.extent = element.text().simplified();
 }
 
 void QgsWmsCapabilities::parseExtent( const QDomElement &element, QVector<QgsWmsDimensionProperty> &dimensionProperties )
@@ -1086,7 +1086,7 @@ void QgsWmsCapabilities::parseExtent( const QDomElement &element, QVector<QgsWms
   {
     if ( it->name == name )
     {
-      it->extent = element.text();
+      it->extent = element.text().simplified();
 
       it->defaultValue = element.attribute( QStringLiteral( "default" ) );
 
diff --git a/tests/src/providers/testqgswmscapabilities.cpp b/tests/src/providers/testqgswmscapabilities.cpp
@@ -184,6 +184,54 @@ class TestQgsWmsCapabilities: public QObject
       QCOMPARE( prop.dimensions.at( 0 ).units, QStringLiteral( "ISO8601" ) );
     }
 
+    void wmsTemporalDimension_data()
+    {
+      QTest::addColumn<QString>( "dimension" );
+      QTest::addColumn<QString>( "extent" );
+
+      QTest::newRow( "single instant" ) << R"""(<Dimension name="time" units="ISO8601">
+                                           2020-01-01
+                                           </Dimension>)"""
+                                        << "2020-01-01";
+
+      QTest::newRow( "interval" ) << R"""(<Dimension name="time" units="ISO8601">
+                                     2020-01-01/2020-12-31/P1M
+                                     </Dimension>)"""
+                                  << "2020-01-01/2020-12-31/P1M";
+
+      QTest::newRow( "list" )     << R"""(<Dimension name="time" units="ISO8601">
+                                     2020-01-01,2020-06-31,2020-12-31
+                                     </Dimension>)"""
+                                  << "2020-01-01,2020-06-31,2020-12-31";
+
+      QTest::newRow( "continuous" ) << R"""(<Dimension name="time" units="ISO8601">
+                                     2020-01-01/2020-06-31
+                                     </Dimension>)"""
+                                    << "2020-01-01/2020-06-31";
+
+      QTest::newRow( "interval with internal newline characters" )
+          << R"""(<Dimension name="time" units="ISO8601">
+             2020-01-01/2020-06-31/P1M,
+             2020-07-01/2020-12-31/P1D
+             </Dimension>)"""
+          << "2020-01-01/2020-06-31/P1M, 2020-07-01/2020-12-31/P1D";
+    }
+
+    void wmsTemporalDimension()
+    {
+      QFETCH( QString, dimension );
+      QFETCH( QString, extent );
+
+      QDomDocument doc;
+      doc.setContent( dimension );
+      QgsWmsCapabilities cap;
+      QgsWmsDimensionProperty dimensionProperty;
+
+      cap.parseDimension( doc.documentElement(), dimensionProperty );
+
+      QCOMPARE( dimensionProperty.extent, extent );
+    }
+
 };
 
 QGSTEST_MAIN( TestQgsWmsCapabilities )

Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,7 @@ void QgsWmsCapabilities::parseDimension( const QDomElement &element, QgsWmsDimen`
`1075`	`1075`	`dimensionProperty.current = ( currentAttribute == QLatin1String( "1" ) \|\| currentAttribute == QLatin1String( "true" ) );`
`1076`	`1076`	`}`
`1077`	`1077`
`1078`		`- dimensionProperty.extent = element.text();`
	`1078`	`+ dimensionProperty.extent = element.text().simplified();`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`	`1081`	`void QgsWmsCapabilities::parseExtent( const QDomElement &element, QVector<QgsWmsDimensionProperty> &dimensionProperties )`
`@@ -1086,7 +1086,7 @@ void QgsWmsCapabilities::parseExtent( const QDomElement &element, QVector<QgsWms`
`1086`	`1086`	`{`
`1087`	`1087`	`if ( it->name == name )`
`1088`	`1088`	`{`
`1089`		`- it->extent = element.text();`
	`1089`	`+ it->extent = element.text().simplified();`
`1090`	`1090`
`1091`	`1091`	`it->defaultValue = element.attribute( QStringLiteral( "default" ) );`
`1092`	`1092`