added new class for wmts collection items

qgis · Dec 17, 2019 · b862d5e · b862d5e
1 parent 28aefe5
commit b862d5e
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 6 deletions.
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -115,7 +115,17 @@ QVector<QgsDataItem *> QgsWMSConnectionItem::createChildren()
     for ( const QgsWmtsTileLayer &l : constTileLayers )
     {
       QString title = l.title.isEmpty() ? l.identifier : l.title;
-      QgsDataItem *layerItem = l.styles.size() == 1 ? this : new QgsDataCollectionItem( this, title, mPath + '/' + l.identifier );
+      QgsDataItem *layerItem;
+
+      if ( l.styles.size() == 1 )
+      {
+        layerItem = this;
+      }
+      else
+      {
+        layerItem = new QgsWMTSRootItem( this, title, mPath + '/' + l.identifier );
+      }
+
       if ( layerItem != this )
       {
         layerItem->setCapabilities( layerItem->capabilities2() & ~QgsDataItem::Fertile );
@@ -139,7 +149,18 @@ QVector<QgsDataItem *> QgsWMSConnectionItem::createChildren()
         }
         styleIdentifiers.push_back( stylePathIdentifier );
 
-        QgsDataItem *styleItem = l.setLinks.size() == 1 ? layerItem : new QgsDataCollectionItem( layerItem, styleName, layerItem->path() + '/' + stylePathIdentifier );
+        QgsDataItem *styleItem;
+
+        // Using if condition, ternary operator leads to type casting issue
+        if ( l.setLinks.size() == 1 )
+        {
+          styleItem = layerItem;
+        }
+        else
+        {
+          styleItem = new QgsWMTSRootItem( layerItem, styleName, layerItem->path() + '/' + stylePathIdentifier );
+        }
+
         if ( styleItem != layerItem )
         {
           styleItem->setCapabilities( styleItem->capabilities2() & ~QgsDataItem::Fertile );
@@ -171,7 +192,18 @@ QVector<QgsDataItem *> QgsWMSConnectionItem::createChildren()
           linkIdentifiers.push_back( linkPathIdentifier );
 
 
-          QgsDataItem *linkItem = l.formats.size() == 1 ? styleItem : new QgsDataCollectionItem( styleItem, linkName, styleItem->path() + '/' + linkPathIdentifier );
+          QgsDataItem *linkItem;
+
+          // Using if condition, ternary operator leads to type casting issue
+          if ( l.formats.size() == 1 )
+          {
+            linkItem = styleItem;
+          }
+          else
+          {
+            linkItem = new QgsWMTSRootItem( styleItem, linkName, styleItem->path() + '/' + linkPathIdentifier );
+          }
+
           if ( linkItem != styleItem )
           {
             linkItem->setCapabilities( linkItem->capabilities2() & ~QgsDataItem::Fertile );
@@ -326,7 +358,6 @@ QgsWMTSLayerItem::QgsWMTSLayerItem( QgsDataItem *parent,
   , mTitle( title )
 {
   mUri = createUri();
-  mIconName = QStringLiteral( "mIconWms.svg" );
   setState( Populated );
 }
 
@@ -369,6 +400,16 @@ QVector<QgsDataItem *> QgsWMSRootItem::createChildren()
 
 // ---------------------------------------------------------------------------
 
+QgsWMTSRootItem::QgsWMTSRootItem( QgsDataItem *parent, QString name, QString path )
+  : QgsDataCollectionItem( parent, name, path )
+{
+  mCapabilities |= Fast;
+  mIconName = QStringLiteral( "mIconDbSchema.svg" );
+  populate();
+
+}
+// ---------------------------------------------------------------------------
+
 
 QgsDataItem *QgsWmsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
 {
@@ -423,8 +464,6 @@ QVector<QgsDataItem *> QgsXyzTileRootItem::createChildren()
 QgsXyzLayerItem::QgsXyzLayerItem( QgsDataItem *parent, QString name, QString path, const QString &encodedUri )
   : QgsLayerItem( parent, name, path, encodedUri, QgsLayerItem::Raster, QStringLiteral( "wms" ) )
 {
-
-  mIconName = QStringLiteral( "mIconWms.svg" );
   setState( Populated );
 }
 

diff --git a/src/providers/wms/qgswmsdataitems.h b/src/providers/wms/qgswmsdataitems.h
@@ -95,6 +95,15 @@ class QgsWMSRootItem : public QgsDataCollectionItem
   public slots:
 };
 
+class QgsWMTSRootItem : public QgsDataCollectionItem
+{
+    Q_OBJECT
+  public:
+    QgsWMTSRootItem( QgsDataItem *parent, QString name, QString path );
+
+  public slots:
+};
+
 
 //! Provider for WMS root data item
 class QgsWmsDataItemProvider : public QgsDataItemProvider