Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
allow space in mesh name
  • Loading branch information
vcloarec authored and nyalldawson committed Jan 24, 2022
1 parent e0474b7 commit b847dca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/providers/mdal/qgsmdalprovider.cpp
Expand Up @@ -1079,7 +1079,7 @@ QVariantMap QgsMdalProviderMetadata::decodeUri( const QString &uri ) const
{
QVariantMap uriComponents;

const QRegularExpression layerRegex( QStringLiteral( "^([a-zA-Z0-9_]+?):\"(.*)\"(?::([a-zA-Z0-9_]+?$)|($))" ) );
const QRegularExpression layerRegex( QStringLiteral( "^([a-zA-Z0-9_]+?):\"(.*)\"(?::([a-zA-Z0-9_ ]+?$)|($))" ) );
const QRegularExpressionMatch layerNameMatch = layerRegex.match( uri );
if ( layerNameMatch.hasMatch() )
{
Expand Down
7 changes: 7 additions & 0 deletions tests/src/providers/testqgsmdalprovider.cpp
Expand Up @@ -104,6 +104,13 @@ void TestQgsMdalProvider::encodeDecodeUri()
QCOMPARE( parts.value( QStringLiteral( "layerName" ) ).toString(), QStringLiteral( "layer3" ) );
QCOMPARE( mdalMetadata->encodeUri( parts ), QStringLiteral( "netcdf:\"/home/data/test.nc\":layer3" ) );

// uri with driver and layer name with space
parts = mdalMetadata->decodeUri( QStringLiteral( "netcdf:\"/home/data/test.nc\":layer 3" ) );
QCOMPARE( parts.value( QStringLiteral( "path" ) ).toString(), QStringLiteral( "/home/data/test.nc" ) );
QCOMPARE( parts.value( QStringLiteral( "driver" ) ).toString(), QStringLiteral( "netcdf" ) );
QCOMPARE( parts.value( QStringLiteral( "layerName" ) ).toString(), QStringLiteral( "layer 3" ) );
QCOMPARE( mdalMetadata->encodeUri( parts ), QStringLiteral( "netcdf:\"/home/data/test.nc\":layer 3" ) );

// uri with driver
parts = mdalMetadata->decodeUri( QStringLiteral( "Ugrid:\"/home/data/test.nc\"" ) );
QCOMPARE( parts.value( QStringLiteral( "path" ) ).toString(), QStringLiteral( "/home/data/test.nc" ) );
Expand Down

0 comments on commit b847dca

Please sign in to comment.