For EPSG initialize GDAL CRS from authid instead of proj.4 string

jef-n · mach0 · commit 49ebe67bbfdf · 2011-11-13T11:37:57.000+01:00
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -263,9 +263,18 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q
     {
       mAuthId = QString( "USER:%1" ).arg( mSrsId );
     }
+    else if ( mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
+    {
+      OSRDestroySpatialReference( mCRS );
+      mCRS = OSRNewSpatialReference( NULL );
+      mIsValidFlag = OSRSetFromUserInput( mCRS, mAuthId.toLower().toAscii() ) == OGRERR_NONE;
+      setMapUnits();
+    }
 
-    setProj4String( toProj4 );
-    setMapUnits();
+    if ( !mIsValidFlag )
+    {
+      setProj4String( toProj4 );
+    }
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -263,9 +263,18 @@ bool QgsCoordinateReferenceSystem::loadFromDb( QString db, QString expression, Q`
`263`	`263`	`{`
`264`	`264`	`mAuthId = QString( "USER:%1" ).arg( mSrsId );`
`265`	`265`	`}`
	`266`	`+ else if ( mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )`
	`267`	`+ {`
	`268`	`+ OSRDestroySpatialReference( mCRS );`
	`269`	`+ mCRS = OSRNewSpatialReference( NULL );`
	`270`	`+ mIsValidFlag = OSRSetFromUserInput( mCRS, mAuthId.toLower().toAscii() ) == OGRERR_NONE;`
	`271`	`+ setMapUnits();`
	`272`	`+ }`
`266`	`273`
`267`		`- setProj4String( toProj4 );`
`268`		`- setMapUnits();`
	`274`	`+ if ( !mIsValidFlag )`
	`275`	`+ {`
	`276`	`+ setProj4String( toProj4 );`
	`277`	`+ }`
`269`	`278`	`}`
`270`	`279`	`else`
`271`	`280`	`{`