Support loading of VT from MBTiles by drag'n'drop and in browser

wonder-sk · wonder-sk · commit 36a26ee62dd8 · 2020-04-05T12:04:34.000+02:00
+ fix layer extent when reading vector tiles from MBTiles
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -260,6 +260,7 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgsmapoverviewcanvas.h"
 #include "qgsmapsettings.h"
 #include "qgsmaptip.h"
+#include "qgsmbtilesreader.h"
 #include "qgsmenuheader.h"
 #include "qgsmergeattributesdialog.h"
 #include "qgsmessageviewer.h"
@@ -7129,12 +7130,32 @@ bool QgisApp::openLayer( const QString &fileName, bool allowInteractive )
 
   if ( fileName.endsWith( QStringLiteral( ".mbtiles" ), Qt::CaseInsensitive ) )
   {
-    // prefer to use WMS provider's implementation to open MBTiles rasters
-    QUrlQuery uq;
-    uq.addQueryItem( "type", "mbtiles" );
-    uq.addQueryItem( "url", QUrl::fromLocalFile( fileName ).toString() );
-    if ( addRasterLayer( uq.toString(), fileInfo.completeBaseName(), QStringLiteral( "wms" ) ) )
-      return true;
+    QgsMBTilesReader reader( fileName );
+    if ( reader.open() )
+    {
+      if ( reader.metadataValue( "format" ) == QStringLiteral( "pbf" ) )
+      {
+        // these are vector tiles
+        QUrlQuery uq;
+        uq.addQueryItem( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+        uq.addQueryItem( QStringLiteral( "url" ), fileName );
+        std::unique_ptr<QgsVectorTileLayer> vtLayer( new QgsVectorTileLayer( uq.toString(), fileInfo.completeBaseName() ) );
+        if ( vtLayer->isValid() )
+        {
+          QgsProject::instance()->addMapLayer( vtLayer.release() );
+          return true;
+        }
+      }
+      else // raster tiles
+      {
+        // prefer to use WMS provider's implementation to open MBTiles rasters
+        QUrlQuery uq;
+        uq.addQueryItem( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+        uq.addQueryItem( QStringLiteral( "url" ), QUrl::fromLocalFile( fileName ).toString() );
+        if ( addRasterLayer( uq.toString(), fileInfo.completeBaseName(), QStringLiteral( "wms" ) ) )
+          return true;
+      }
+    }
   }
 
   // try to load it as raster
diff --git a/src/core/providers/gdal/qgsgdaldataitems.cpp b/src/core/providers/gdal/qgsgdaldataitems.cpp
@@ -18,10 +18,12 @@
 ///@cond PRIVATE
 #include "qgsgdalprovider.h"
 #include "qgslogger.h"
+#include "qgsmbtilesreader.h"
 #include "qgssettings.h"
 #include "qgsogrutils.h"
 #include "qgsproject.h"
 #include "qgsgdalutils.h"
+#include "qgsvectortiledataitems.h"
 #include "symbology/qgsstyle.h"
 
 #include <QFileInfo>
@@ -263,14 +265,30 @@ QgsDataItem *QgsGdalDataItemProvider::createDataItem( const QString &pathIn, Qgs
 
   if ( suffix == QStringLiteral( "mbtiles" ) )
   {
-    // handled by WMS provider
-    QUrlQuery uq;
-    uq.addQueryItem( "type", "mbtiles" );
-    uq.addQueryItem( "url", QUrl::fromLocalFile( path ).toString() );
-    QString encodedUri = uq.toString();
-    QgsLayerItem *item = new QgsLayerItem( parentItem, name, path, encodedUri, QgsLayerItem::Raster, QStringLiteral( "wms" ) );
-    item->setState( QgsDataItem::Populated );
-    return item;
+    QgsMBTilesReader reader( path );
+    if ( reader.open() )
+    {
+      if ( reader.metadataValue( "format" ) == QStringLiteral( "pbf" ) )
+      {
+        // these are vector tiles
+        QUrlQuery uq;
+        uq.addQueryItem( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+        uq.addQueryItem( QStringLiteral( "url" ), path );
+        QString encodedUri = uq.toString();
+        return new QgsVectorTileLayerItem( parentItem, name, path, encodedUri );
+      }
+      else
+      {
+        // handled by WMS provider
+        QUrlQuery uq;
+        uq.addQueryItem( QStringLiteral( "type" ), QStringLiteral( "mbtiles" ) );
+        uq.addQueryItem( QStringLiteral( "url" ), QUrl::fromLocalFile( path ).toString() );
+        QString encodedUri = uq.toString();
+        QgsLayerItem *item = new QgsLayerItem( parentItem, name, path, encodedUri, QgsLayerItem::Raster, QStringLiteral( "wms" ) );
+        item->setState( QgsDataItem::Populated );
+        return item;
+      }
+    }
   }
 
   // Filters out the OGR/GDAL supported formats that can contain multiple layers
diff --git a/src/core/vectortile/qgsvectortilelayer.cpp b/src/core/vectortile/qgsvectortilelayer.cpp
@@ -67,7 +67,9 @@ QgsVectorTileLayer::QgsVectorTileLayer( const QString &uri, const QString &baseN
     QgsDebugMsgLevel( QStringLiteral( "zoom range: %1 - %2" ).arg( mSourceMinZoom ).arg( mSourceMaxZoom ), 2 );
 
     QgsRectangle r = reader.extent();
-    // TODO: reproject to EPSG:3857
+    QgsCoordinateTransform ct( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) ),
+                               QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) ), transformContext() );
+    r = ct.transformBoundingBox( r );
     setExtent( r );
   }
   else
diff --git a/src/core/vectortile/qgsvectortileprovidermetadata.cpp b/src/core/vectortile/qgsvectortileprovidermetadata.cpp
@@ -34,9 +34,4 @@ QList<QgsDataItemProvider *> QgsVectorTileProviderMetadata::dataItemProviders()
   return providers;
 }
 
-//QString QgsVectorTileProviderMetadata::staticKey()
-//{
-//  return PROVIDER_KEY;
-//}
-
 ///@endcond
diff --git a/src/core/vectortile/qgsvectortileprovidermetadata.h b/src/core/vectortile/qgsvectortileprovidermetadata.h
@@ -33,7 +33,6 @@ class QgsVectorTileProviderMetadata : public QgsProviderMetadata
     QgsVectorTileProviderMetadata();
     QList< QgsDataItemProvider * > dataItemProviders() const override;
 
-    //static QString staticKey();
 };
 
 ///@endcond

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,4 @@ QList<QgsDataItemProvider *> QgsVectorTileProviderMetadata::dataItemProviders()`
`34`	`34`	`return providers;`
`35`	`35`	`}`
`36`	`36`
`37`		`-//QString QgsVectorTileProviderMetadata::staticKey()`
`38`		`-//{`
`39`		`-// return PROVIDER_KEY;`
`40`		`-//}`
`41`		`-`
`42`	`37`	`///@endcond`