fix loading of file-based mbtiles vector MVT package via Data Source

Manager (fix #36449)
qgis · Jan 27, 2022 · f5f4349 · f5f4349
1 parent 80f2443
commit f5f4349
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/src/core/vectortile/qgsvectortileconnection.cpp b/src/core/vectortile/qgsvectortileconnection.cpp
@@ -20,12 +20,25 @@
 #include "qgssettings.h"
 #include "qgshttpheaders.h"
 
+#include <QFileInfo>
+
 ///@cond PRIVATE
 
 QString QgsVectorTileProviderConnection::encodedUri( const QgsVectorTileProviderConnection::Data &conn )
 {
   QgsDataSourceUri uri;
-  uri.setParam( QStringLiteral( "type" ), QStringLiteral( "xyz" ) );
+
+  const QFileInfo info( conn.url );
+  QString suffix = info.suffix().toLower();
+  if ( suffix.startsWith( QStringLiteral( "mbtiles" ) ) )
+  {
+    uri.setParam( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+  }
+  else
+  {
+    uri.setParam( QStringLiteral( "type" ), QStringLiteral( "xyz" ) );
+  }
+
   uri.setParam( QStringLiteral( "url" ), conn.url );
   if ( conn.zMin != -1 )
     uri.setParam( QStringLiteral( "zmin" ), QString::number( conn.zMin ) );
@@ -82,7 +95,18 @@ QString QgsVectorTileProviderConnection::encodedLayerUri( const QgsVectorTilePro
 {
   // compared to encodedUri() this one also adds type=xyz to the URI
   QgsDataSourceUri uri;
-  uri.setParam( QStringLiteral( "type" ), QStringLiteral( "xyz" ) );
+
+  const QFileInfo info( conn.url );
+  QString suffix = info.suffix().toLower();
+  if ( suffix.startsWith( QStringLiteral( "mbtiles" ) ) )
+  {
+    uri.setParam( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+  }
+  else
+  {
+    uri.setParam( QStringLiteral( "type" ), QStringLiteral( "xyz" ) );
+  }
+
   uri.setParam( QStringLiteral( "url" ), conn.url );
   if ( conn.zMin != -1 )
     uri.setParam( QStringLiteral( "zmin" ), QString::number( conn.zMin ) );