Vector tiles: styling panel integration + widget for basic renderer

qgis · Apr 7, 2020 · f713cc3 · f713cc3
1 parent 550cb5d
commit f713cc3
Show file tree

Hide file tree

Showing 12 changed files with 660 additions and 12 deletions.
diff --git a/python/core/auto_generated/vectortile/qgsvectortilebasicrenderer.sip.in b/python/core/auto_generated/vectortile/qgsvectortilebasicrenderer.sip.in
@@ -172,6 +172,14 @@ Sets list of styles of the renderer
     QList<QgsVectorTileBasicRendererStyle> styles() const;
 %Docstring
 Returns list of styles of the renderer
+%End
+    void setStyle( int index, const QgsVectorTileBasicRendererStyle &style );
+%Docstring
+Updates style definition at the paricular index of the list (the index must be in interval [0,N-1] otherwise this function does nothing)
+%End
+    QgsVectorTileBasicRendererStyle style( int index ) const;
+%Docstring
+Returns style definition at the particular index
 %End
 
     static QList<QgsVectorTileBasicRendererStyle> simpleStyle(

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -430,6 +430,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/gui/layertree
   ${CMAKE_SOURCE_DIR}/src/gui/locator
   ${CMAKE_SOURCE_DIR}/src/gui/vector
+  ${CMAKE_SOURCE_DIR}/src/gui/vectortile
   ${CMAKE_SOURCE_DIR}/src/plugins
   ${CMAKE_SOURCE_DIR}/src/python
   ${CMAKE_SOURCE_DIR}/src/native

diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -35,6 +35,8 @@
 #include "qgsmaplayer.h"
 #include "qgsstyle.h"
 #include "qgsvectorlayer.h"
+#include "qgsvectortilelayer.h"
+#include "qgsvectortilebasicrendererwidget.h"
 #include "qgsmeshlayer.h"
 #include "qgsproject.h"
 #include "qgsundowidget.h"
@@ -227,7 +229,11 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
 
     case QgsMapLayerType::VectorTileLayer:
     {
-      // TODO
+      QListWidgetItem *symbolItem = new QListWidgetItem( QgsApplication::getThemeIcon( QStringLiteral( "propertyicons/symbology.svg" ) ), QString() );
+      symbolItem->setData( Qt::UserRole, Symbology );
+      symbolItem->setToolTip( tr( "Symbology" ) );
+      mOptionsListWidget->addItem( symbolItem );
+
       break;
     }
 
@@ -608,7 +614,20 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
 
       case QgsMapLayerType::VectorTileLayer:
       {
-        // TODO
+        QgsVectorTileLayer *vtLayer = qobject_cast<QgsVectorTileLayer *>( mCurrentLayer );
+        switch ( row )
+        {
+          case 0: // Style
+          {
+            mVectorTileStyleWidget = new QgsVectorTileBasicRendererWidget( vtLayer, mMapCanvas, mMessageBar, mWidgetStack );
+            mVectorTileStyleWidget->setDockMode( true );
+            connect( mVectorTileStyleWidget, &QgsPanelWidget::widgetChanged, this, &QgsLayerStylingWidget::autoApply );
+            mWidgetStack->setMainPanel( mVectorTileStyleWidget );
+            break;
+          }
+          default:
+            break;
+        }
         break;
       }
 

diff --git a/src/app/qgslayerstylingwidget.h b/src/app/qgslayerstylingwidget.h
@@ -44,6 +44,7 @@ class QgsMapLayerStyleManagerWidget;
 class QgsVectorLayer3DRendererWidget;
 class QgsMeshLayer3DRendererWidget;
 class QgsMessageBar;
+class QgsVectorTileBasicRendererWidget;
 
 class APP_EXPORT QgsLayerStyleManagerWidgetFactory : public QgsMapLayerConfigWidgetFactory
 {
@@ -149,6 +150,7 @@ class APP_EXPORT QgsLayerStylingWidget : public QWidget, private Ui::QgsLayerSty
 #endif
     QgsRendererRasterPropertiesWidget *mRasterStyleWidget = nullptr;
     QgsRendererMeshPropertiesWidget *mMeshStyleWidget = nullptr;
+    QgsVectorTileBasicRendererWidget *mVectorTileStyleWidget = nullptr;
     QList<QgsMapLayerConfigWidgetFactory *> mPageFactories;
     QMap<int, QgsMapLayerConfigWidgetFactory *> mUserPages;
     QgsLayerStyleManagerWidgetFactory *mStyleManagerFactory = nullptr;

diff --git a/src/core/vectortile/qgsvectortilebasicrenderer.cpp b/src/core/vectortile/qgsvectortilebasicrenderer.cpp
@@ -89,7 +89,7 @@ void QgsVectorTileBasicRendererStyle::readXml( const QDomElement &elem, const Qg
   if ( !symbolsElem.isNull() )
   {
     QgsSymbolMap symbolMap = QgsSymbolLayerUtils::loadSymbols( symbolsElem, context );
-    if ( !symbolMap.contains( QStringLiteral( "0" ) ) )
+    if ( symbolMap.contains( QStringLiteral( "0" ) ) )
     {
       mSymbol.reset( symbolMap.take( QStringLiteral( "0" ) ) );
     }
@@ -219,6 +219,7 @@ void QgsVectorTileBasicRenderer::readXml( const QDomElement &elem, const QgsRead
     QgsVectorTileBasicRendererStyle layerStyle;
     layerStyle.readXml( elemStyle, context );
     mStyles.append( layerStyle );
+    elemStyle = elemStyle.nextSiblingElement( QStringLiteral( "style" ) );
   }
 }
 

diff --git a/src/core/vectortile/qgsvectortilebasicrenderer.h b/src/core/vectortile/qgsvectortilebasicrenderer.h
@@ -142,6 +142,10 @@ class CORE_EXPORT QgsVectorTileBasicRenderer : public QgsVectorTileRenderer
     void setStyles( const QList<QgsVectorTileBasicRendererStyle> &styles );
     //! Returns list of styles of the renderer
     QList<QgsVectorTileBasicRendererStyle> styles() const;
+    //! Updates style definition at the paricular index of the list (the index must be in interval [0,N-1] otherwise this function does nothing)
+    void setStyle( int index, const QgsVectorTileBasicRendererStyle &style ) { mStyles[index] = style; }
+    //! Returns style definition at the particular index
+    QgsVectorTileBasicRendererStyle style( int index ) const { return mStyles[index]; }
 
     //! Returns a list of styles to render all layers with the given fill/stroke colors, stroke widths and marker sizes
     static QList<QgsVectorTileBasicRendererStyle> simpleStyle(

diff --git a/src/core/vectortile/qgsvectortilelayer.cpp b/src/core/vectortile/qgsvectortilelayer.cpp
@@ -29,8 +29,18 @@ QgsVectorTileLayer::QgsVectorTileLayer( const QString &uri, const QString &baseN
 {
   mDataSource = uri;
 
+  mValid = loadDataSource();
+
+  // set a default renderer
+  QgsVectorTileBasicRenderer *renderer = new QgsVectorTileBasicRenderer;
+  renderer->setStyles( QgsVectorTileBasicRenderer::simpleStyleWithRandomColors() );
+  setRenderer( renderer );
+}
+
+bool QgsVectorTileLayer::loadDataSource()
+{
   QgsDataSourceUri dsUri;
-  dsUri.setEncodedUri( uri );
+  dsUri.setEncodedUri( mDataSource );
 
   mSourceType = dsUri.param( QStringLiteral( "type" ) );
   mSourcePath = dsUri.param( QStringLiteral( "url" ) );
@@ -53,7 +63,7 @@ QgsVectorTileLayer::QgsVectorTileLayer( const QString &uri, const QString &baseN
     if ( !reader.open() )
     {
       QgsDebugMsg( QStringLiteral( "failed to open MBTiles file: " ) + mSourcePath );
-      return;
+      return false;
     }
 
     QgsDebugMsgLevel( QStringLiteral( "name: " ) + reader.metadataValue( QStringLiteral( "name" ) ), 2 );
@@ -75,16 +85,11 @@ QgsVectorTileLayer::QgsVectorTileLayer( const QString &uri, const QString &baseN
   else
   {
     QgsDebugMsg( QStringLiteral( "Unknown source type: " ) + mSourceType );
-    return;
+    return false;
   }
 
   setCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3857" ) ) );
-  setValid( true );
-
-  // set a default renderer
-  QgsVectorTileBasicRenderer *renderer = new QgsVectorTileBasicRenderer;
-  renderer->setStyles( QgsVectorTileBasicRenderer::simpleStyleWithRandomColors() );
-  setRenderer( renderer );
+  return true;
 }
 
 QgsVectorTileLayer::~QgsVectorTileLayer() = default;
@@ -104,6 +109,8 @@ QgsMapLayerRenderer *QgsVectorTileLayer::createMapRenderer( QgsRenderContext &re
 
 bool QgsVectorTileLayer::readXml( const QDomNode &layerNode, QgsReadWriteContext &context )
 {
+  mValid = loadDataSource();
+
   QString errorMsg;
   return readSymbology( layerNode, errorMsg, context );
 }
@@ -140,6 +147,7 @@ bool QgsVectorTileLayer::readSymbology( const QDomNode &node, QString &errorMess
   }
 
   r->readXml( elemRenderer, context );
+  setRenderer( r );
   return true;
 }
 

diff --git a/src/core/vectortile/qgsvectortilelayer.h b/src/core/vectortile/qgsvectortilelayer.h
@@ -137,6 +137,9 @@ class CORE_EXPORT QgsVectorTileLayer : public QgsMapLayer
     //! Returns whether to render also borders of tiles (useful for debugging)
     bool isTileBorderRenderingEnabled() const { return mTileBorderRendering; }
 
+  private:
+    bool loadDataSource();
+
   private:
     //! Type of the data source
     QString mSourceType;

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -321,6 +321,7 @@ SET(QGIS_GUI_SRCS
   tableeditor/qgstableeditorformattingwidget.cpp
   tableeditor/qgstableeditorwidget.cpp
 
+  vectortile/qgsvectortilebasicrendererwidget.cpp
   vectortile/qgsvectortileconnectiondialog.cpp
   vectortile/qgsvectortiledataitemguiprovider.cpp
   vectortile/qgsvectortileproviderguimetadata.cpp
@@ -1091,6 +1092,7 @@ SET(QGIS_GUI_HDRS
   tableeditor/qgstableeditorformattingwidget.h
   tableeditor/qgstableeditorwidget.h
 
+  vectortile/qgsvectortilebasicrendererwidget.h
   vectortile/qgsvectortileconnectiondialog.h
   vectortile/qgsvectortiledataitemguiprovider.h
   vectortile/qgsvectortileproviderguimetadata.h