use project projections instead of WGS84 for WMS crs preselection (fixes

#6939)
qgis · Jan 3, 2013 · a575711 · a575711
1 parent 5fefe38
commit a575711
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp
@@ -59,6 +59,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma
     , mManagerMode( managerMode )
     , mEmbeddedMode( embeddedMode )
     , mCurrentTileset( 0 )
+    , mDefaultCRS( GEO_EPSG_CRS_AUTHID )
 {
   setupUi( this );
 
@@ -117,7 +118,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma
       QgsCoordinateReferenceSystem currentRefSys( currentCRS, QgsCoordinateReferenceSystem::InternalCrsId );
       if ( currentRefSys.isValid() )
       {
-        mCRS = currentRefSys.authid();
+        mDefaultCRS = mCRS = currentRefSys.authid();
       }
     }
 
@@ -409,6 +410,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
     lstLayers->expandItem( lstLayers->topLevelItem( 0 ) );
   }
 
+  on_lstLayers_itemSelectionChanged();
+
   return true;
 }
 
@@ -741,7 +744,6 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
   mCurrentSelection = lstLayers->selectedItems();
   lstLayers->blockSignals( false );
 
-
   // selected layers with styles
   QStringList layers;
   QStringList styles;
@@ -801,7 +803,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
         defaultCRS = *it;
 
       // prefer value of DEFAULT_GEO_EPSG_CRS_ID if available
-      if ( *it == GEO_EPSG_CRS_AUTHID )
+      if ( *it == mDefaultCRS )
         defaultCRS = *it;
     }
 
@@ -813,7 +815,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
     }
 
   }
-  else if ( mCRSs.isEmpty() )
+  else if ( layers.isEmpty() || mCRSs.isEmpty() )
   {
     mCRS = "";
     labelCoordRefSys->setText( "" );

diff --git a/src/providers/wms/qgswmssourceselect.h b/src/providers/wms/qgswmssourceselect.h
@@ -133,6 +133,9 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
     //! Selected CRS
     QString mCRS;
 
+    //! Default CRS
+    QString mDefaultCRS;
+
     //! Common CRSs for selected layers
     QSet<QString> mCRSs;