split proj4string on spaces followed by '+' (instead of spaces only).

see http://trac.osgeo.org/proj/ticket/132
qgis · Dec 28, 2011 · 2a83033 · 2a83033
1 parent 4629900
commit 2a83033
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -455,15 +455,18 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString theProj4String
 
   if ( myRecord.empty() )
   {
-    // match all arameters individually:
+    // match all parameters individually:
     // - order of parameters doesn't matter
     // - found definition may have more parameters (like +towgs84 in GDAL)
     // - retry without datum, if no match is found (looks like +datum<>WGS84 was dropped in GDAL)
 
     QString sql = "SELECT * FROM tbl_srs WHERE ";
     QString delim = "";
     QString datum;
-    foreach( QString param, theProj4String.split( " ", QString::SkipEmptyParts ) )
+
+    // split on spaces followed by a plus sign (+) to deal
+    // also with parameters containing spaces (e.g. +nadgrids)
+    foreach( QString param, theProj4String.split( QRegExp( "\\s+(?=\\+)" ), QString::SkipEmptyParts ) )
     {
       QString arg = QString( "' '||parameters||' ' LIKE %1" ).arg( quotedValue( QString( "% %1 %" ).arg( param ) ) );
       if ( param.startsWith( "+datum=" ) )