Add tilemap information to layer properties dialog

qgis · May 16, 2023 · 7d7c580 · 7d7c580
1 parent bc2cc98
commit 7d7c580
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 1 deletion.
diff --git a/src/core/vectortile/qgsarcgisvectortileservicedataprovider.cpp b/src/core/vectortile/qgsarcgisvectortileservicedataprovider.cpp
@@ -156,6 +156,16 @@ QString QgsArcGisVectorTileServiceDataProvider::styleUrl() const
          + '/' + mArcgisLayerConfiguration.value( QStringLiteral( "defaultStyles" ) ).toString();
 }
 
+QString QgsArcGisVectorTileServiceDataProvider::htmlMetadata() const
+{
+  QString metadata;
+
+  if ( !mTileMapUrl.isEmpty() )
+    metadata += QStringLiteral( "<tr><td class=\"highlight\">" ) % tr( "Tilemap" ) % QStringLiteral( "</td><td><a href=\"%1\">%1</a>" ).arg( mTileMapUrl ) % QStringLiteral( "</td></tr>\n" );
+
+  return metadata;
+}
+
 bool QgsArcGisVectorTileServiceDataProvider::setupArcgisVectorTileServiceConnection()
 {
   QGIS_PROTECT_QOBJECT_THREAD_ACCESS
@@ -261,7 +271,8 @@ bool QgsArcGisVectorTileServiceDataProvider::setupArcgisVectorTileServiceConnect
   const QString tileMapEndpoint = mArcgisLayerConfiguration.value( QStringLiteral( "tileMap" ) ).toString();
   if ( !tileMapEndpoint.isEmpty() )
   {
-    QUrl tilemapUrl( tileServiceUri + '/' + tileMapEndpoint );
+    mTileMapUrl = tileServiceUri + '/' + tileMapEndpoint;
+    QUrl tilemapUrl( mTileMapUrl );
     tilemapUrl.setQuery( query );
 
     QNetworkRequest tileMapRequest = QNetworkRequest( tilemapUrl );

diff --git a/src/core/vectortile/qgsarcgisvectortileservicedataprovider.h b/src/core/vectortile/qgsarcgisvectortileservicedataprovider.h
@@ -53,6 +53,7 @@ class CORE_EXPORT QgsArcGisVectorTileServiceDataProvider : public QgsXyzVectorTi
     QgsLayerMetadata layerMetadata() const override;
     QVariantMap styleDefinition() const override;
     QString styleUrl() const override;
+    QString htmlMetadata() const override;
 
     static QString ARCGIS_VT_SERVICE_DATA_PROVIDER_KEY;
     static QString ARCGIS_VT_SERVICE_DATA_PROVIDER_DESCRIPTION;
@@ -73,6 +74,7 @@ class CORE_EXPORT QgsArcGisVectorTileServiceDataProvider : public QgsXyzVectorTi
     QgsCoordinateReferenceSystem mCrs;
 
     QgsLayerMetadata mLayerMetadata;
+    QString mTileMapUrl;
 };
 
 

diff --git a/src/core/vectortile/qgsvectortiledataprovider.cpp b/src/core/vectortile/qgsvectortiledataprovider.cpp
@@ -96,5 +96,12 @@ QImage QgsVectorTileDataProvider::spriteImage() const
   return QImage();
 }
 
+QString QgsVectorTileDataProvider::htmlMetadata() const
+{
+  QGIS_PROTECT_QOBJECT_THREAD_ACCESS
+
+  return QString();
+}
+
 
 
diff --git a/src/core/vectortile/qgsvectortiledataprovider.h b/src/core/vectortile/qgsvectortiledataprovider.h
@@ -149,6 +149,12 @@ class CORE_EXPORT QgsVectorTileDataProvider : public QgsDataProvider
      * \see spriteDefinition()
      */
     virtual QImage spriteImage() const;
+
+    /**
+     * Returns metadata in a format suitable for feeding directly
+     * into a subset of the GUI properties "Metadata" tab.
+     */
+    virtual QString htmlMetadata() const;
 };
 
 

diff --git a/src/core/vectortile/qgsvectortilelayer.cpp b/src/core/vectortile/qgsvectortilelayer.cpp
@@ -518,6 +518,9 @@ QString QgsVectorTileLayer::htmlMetadata() const
 
   info += QStringLiteral( "<tr><td class=\"highlight\">" ) % tr( "Zoom levels" ) % QStringLiteral( "</td><td>" ) % QStringLiteral( "%1 - %2" ).arg( sourceMinZoom() ).arg( sourceMaxZoom() ) % QStringLiteral( "</td></tr>\n" );
 
+  if ( mDataProvider )
+    info += qobject_cast< const QgsVectorTileDataProvider * >( mDataProvider.get() )->htmlMetadata();
+
   info += QLatin1String( "</table>\n<br>" );
 
   // CRS

diff --git a/src/core/vectortile/qgsvtpkvectortiledataprovider.cpp b/src/core/vectortile/qgsvtpkvectortiledataprovider.cpp
@@ -208,6 +208,23 @@ QList<QgsVectorTileRawData> QgsVtpkVectorTileDataProvider::readTiles( const QgsT
   return rawTiles;
 }
 
+QString QgsVtpkVectorTileDataProvider::htmlMetadata() const
+{
+  QString metadata;
+
+  QgsDataSourceUri dsUri;
+  dsUri.setEncodedUri( dataSourceUri() );
+  QgsVtpkTiles reader( dsUri.param( QStringLiteral( "url" ) ) );
+  reader.open();
+
+  if ( !reader.rootTileMap().isEmpty() )
+    metadata += QStringLiteral( "<tr><td class=\"highlight\">" ) % tr( "VTPK storage" ) % QStringLiteral( "</td><td>" ) % tr( "Indexed VTPK (tilemap is present)" ) % QStringLiteral( "</td></tr>\n" );
+  else
+    metadata += QStringLiteral( "<tr><td class=\"highlight\">" ) % tr( "VTPK storage" ) % QStringLiteral( "</td><td>" ) % tr( "Flat VTPK (no tilemap)" ) % QStringLiteral( "</td></tr>\n" );
+
+  return metadata;
+}
+
 QByteArray QgsVtpkVectorTileDataProvider::loadFromVtpk( QgsVtpkTiles &vtpkTileReader, const QgsTileXYZ &id, QgsFeedback * )
 {
   const QByteArray tileData = vtpkTileReader.tileData( id.zoomLevel(), id.column(), id.row() );

diff --git a/src/core/vectortile/qgsvtpkvectortiledataprovider.h b/src/core/vectortile/qgsvtpkvectortiledataprovider.h
@@ -60,6 +60,7 @@ class CORE_EXPORT QgsVtpkVectorTileDataProvider : public QgsVectorTileDataProvid
     QImage spriteImage() const override;
     QByteArray readTile( const QgsTileMatrixSet &tileMatrix, const QgsTileXYZ &id, QgsFeedback *feedback = nullptr ) const override;
     QList<QgsVectorTileRawData> readTiles( const QgsTileMatrixSet &, const QVector<QgsTileXYZ> &tiles, QgsFeedback *feedback = nullptr ) const override;
+    QString htmlMetadata() const override;
 
     static QString DATA_PROVIDER_KEY;
     static QString DATA_PROVIDER_DESCRIPTION;