Adding works again

qgis · Dec 23, 2020 · b45280e8b378ea96609e7847e6e1d06e6c7b2b09 · b45280e
1 parent 8904919
commit b45280e8b378ea96609e7847e6e1d06e6c7b2b09
Unified Split

Showing with 32 additions and 36 deletions.

+32 −28 src/providers/arcgisrest/qgsarcgisrestsourceselect.cpp

+0 −8 src/ui/qgsarcgisservicesourceselectbase.ui
diff --git a/src/providers/arcgisrest/qgsarcgisrestsourceselect.cpp b/src/providers/arcgisrest/qgsarcgisrestsourceselect.cpp
@@ -113,15 +113,12 @@ QgsArcGisRestSourceSelect::QgsArcGisRestSourceSelect( const QString &serviceName
   lineFilter->setShowSearchIcon( true );
 
   QgsSettings settings;
-  cbxUseTitleLayerName->setChecked( settings.value( QStringLiteral( "Windows/SourceSelectDialog/UseTitleLayerName" ), false ).toBool() );
 
   mImageEncodingGroup = new QButtonGroup( this );
 }
 
 QgsArcGisRestSourceSelect::~QgsArcGisRestSourceSelect()
 {
-  QgsSettings settings;
-  settings.setValue( QStringLiteral( "Windows/SourceSelectDialog/UseTitleLayerName" ), cbxUseTitleLayerName->isChecked() );
 }
 
 void QgsArcGisRestSourceSelect::populateImageEncodings( const QStringList &availableEncodings )
@@ -374,40 +371,47 @@ void QgsArcGisRestSourceSelect::addButtonClicked()
   }
 
   //create layers that user selected from this feature source
-  QModelIndexList list = mBrowserView->selectionModel()->selectedRows();
-  for ( int i = 0; i < list.size(); i++ )
+  const QModelIndexList list = mBrowserView->selectionModel()->selectedRows();
+  for ( const QModelIndex &proxyIndex : list )
   {
-    //add a wfs layer to the map
-    QModelIndex idx; // = mModelProxy->mapToSource( list[i] );
-    if ( !idx.isValid() )
+    const QModelIndex sourceIndex = mProxyModel->mapToSource( proxyIndex );
+    if ( !sourceIndex.isValid() )
     {
       continue;
     }
 
-#if 0
-    int row = idx.row();
-    if ( !mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( IsLayerRole ).toBool() )
+    QgsDataItem *item = mBrowserModel->dataItem( sourceIndex );
+    if ( !item )
       continue;
 
-    QString layerTitle = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->text();  //layer title/id
-    QString layerName = mModel->itemFromIndex( mModel->index( row, 1, idx.parent() ) )->text(); //layer name
-    const QString layerUri = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( UrlRole ).toString();
-    const QString layerId = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( IdRole ).toString();
-    QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->text() : QString(); //optional filter specified by user
-    if ( cbxUseTitleLayerName->isChecked() && !layerTitle.isEmpty() )
-    {
-      layerName = layerTitle;
-    }
-    QgsRectangle layerExtent;
-    if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() ) )
+    if ( QgsLayerItem *layerItem = qobject_cast< QgsLayerItem * >( item ) )
     {
-      layerExtent = extent;
-    }
-    QString uri = getLayerURI( connection, layerUri.isEmpty() ? layerTitle : layerUri, layerName, pCrsString, filter, layerExtent, layerId );
+      const QString layerName = layerItem->name();
+
+      QString filter;// = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->text() : QString(); //optional filter specified by user
+      QgsRectangle layerExtent;
+      if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() ) )
+      {
+        layerExtent = extent;
+      }
 
-    QgsDebugMsg( "Layer " + layerName + ", uri: " + uri );
-    addServiceLayer( uri, layerName );
-#endif
+      QgsDataSourceUri uri( layerItem->uri() );
+      uri.setParam( QStringLiteral( "crs" ), pCrsString );
+      if ( qobject_cast< QgsArcGisFeatureServiceLayerItem *>( layerItem ) )
+      {
+        uri.setParam( QStringLiteral( "filter" ), filter );
+        if ( !layerExtent.isEmpty() )
+        {
+          uri.setParam( QStringLiteral( "bbox" ), QStringLiteral( "%1,%2,%3,%4" ).arg( layerExtent.xMinimum() ).arg( layerExtent.yMinimum() ).arg( layerExtent.xMaximum() ).arg( layerExtent.yMaximum() ) );
+        }
+        emit addVectorLayer( uri.uri( false ), layerName );
+      }
+      else if ( qobject_cast< QgsArcGisMapServiceLayerItem *>( layerItem ) )
+      {
+        uri.setParam( QStringLiteral( "format" ), getSelectedImageEncoding() );
+        emit addRasterLayer( uri.uri( false ), layerName, QStringLiteral( "arcgismapserver" ) );
+      }
+    }
   }
   accept();
 }

diff --git a/src/ui/qgsarcgisservicesourceselectbase.ui b/src/ui/qgsarcgisservicesourceselectbase.ui
@@ -171,13 +171,6 @@
      </attribute>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="cbxUseTitleLayerName">
-     <property name="text">
-      <string>Use title for layer name</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QCheckBox" name="cbxFeatureCurrentViewExtent">
      <property name="text">
@@ -283,7 +276,6 @@
   <tabstop>btnSave</tabstop>
   <tabstop>lineFilter</tabstop>
   <tabstop>mBrowserView</tabstop>
-  <tabstop>cbxUseTitleLayerName</tabstop>
   <tabstop>cbxFeatureCurrentViewExtent</tabstop>
   <tabstop>btnChangeSpatialRefSys</tabstop>
  </tabstops>