Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Raster Layer: do not include credentials in layer name #60380

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Add Raster Layer: do not include credentials in layer name #60380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/app/layers/qgsapplayerhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,8 +1128,6 @@ QList<QgsMapLayer *> QgsAppLayerHandling::addGdalRasterLayers( const QStringList

if ( QgsRasterLayer::isValidRasterFileName( uri, errMsg ) )
{
QFileInfo myFileInfo( uri );

// set the layer name to the file base name unless provided explicitly
QString layerName;
const QVariantMap uriDetails = QgsProviderRegistry::instance()->decodeUri( QStringLiteral( "gdal" ), uri );
Expand All @@ -1139,7 +1137,7 @@ QList<QgsMapLayer *> QgsAppLayerHandling::addGdalRasterLayers( const QStringList
}
else
{
layerName = QgsProviderUtils::suggestLayerNameFromFilePath( uri );
layerName = QgsProviderUtils::suggestLayerNameFromFilePath( uriDetails[QStringLiteral( "path" )].toString() );
}

// try to create the layer
Expand All @@ -1157,7 +1155,7 @@ QList<QgsMapLayer *> QgsAppLayerHandling::addGdalRasterLayers( const QStringList
//only allow one copy of a ai grid file to be loaded at a
//time to prevent the user selecting all adfs in 1 dir which
//actually represent 1 coverage,

const QFileInfo myFileInfo( uriDetails[QStringLiteral( "path" )].toString() );
if ( myFileInfo.fileName().endsWith( QLatin1String( ".adf" ), Qt::CaseInsensitive ) )
{
break;
Expand Down
Loading