[QGIS Commit] r11460 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: gcontreras
Date: 2009-08-20 23:42:24 -0400 (Thu, 20 Aug 2009)
New Revision: 11460

Modified:
   trunk/qgis/src/gui/qgsprojectionselector.cpp
Log:
Fix for Ticket #1881. This allows to change the srs for wms based in geoserver.

Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp	2009-08-20 22:17:14 UTC (rev 11459)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp	2009-08-21 03:42:24 UTC (rev 11460)
@@ -195,13 +195,19 @@
   // iterate through all incoming CRSs
 
   QSet<QString>::const_iterator i = crsFilter->begin();
+  QRegExp rx( "[^0-9]" );
   while ( i != crsFilter->end() )
   {
     QStringList parts = i->split( ":" );
 
     if ( parts.at( 0 ) == "EPSG" && parts.size() >= 2 )
     {
-      epsgParts.push_back( parts.at( 1 ) );
+      //this line is neccesary to make change projection work
+      //with geoserver because for some reason geoserver returns
+      //EPSG:WGS84(DD) as the first srs and is invalid because the
+      //epsg database expect an integer string      
+	  if(rx.indexIn(parts.at( 1 )) == -1)
+        epsgParts.push_back( parts.at( 1 ) );
     }
 
     ++i;