Revert "[grass] Use better approach to retrieve CRS information for mapsets"

This reverts commit 40e9710.

Author: nyalldawson

src/providers/grass/qgis.g.info.c

@@ -53,7 +53,7 @@ int main( int argc, char **argv )
   info_opt->key = "info";
   info_opt->type = TYPE_STRING;
   info_opt->description = "info key";
-  info_opt->options = "proj,wkt,srid,window,size,query,info,colors,stats";
+  info_opt->options = "proj,window,size,query,info,colors,stats";
 
   rast_opt = G_define_standard_option( G_OPT_R_INPUT );
   rast_opt->key = "rast";
@@ -107,6 +107,7 @@ int main( int argc, char **argv )
   if ( strcmp( "proj", info_opt->answer ) == 0 )
   {
     G_get_window( &window );
+    /* code from g.proj */
     if ( window.proj != PROJECTION_XY )
     {
       struct Key_Value *projinfo, *projunits;
@@ -117,30 +118,6 @@ int main( int argc, char **argv )
       fprintf( stdout, "%s", wkt );
     }
   }
-  else if ( strcmp( "wkt", info_opt->answer ) == 0 )
-  {
-    G_get_window( &window );
-    if ( window.proj != PROJECTION_XY )
-    {
-      char *wkt = G_get_projwkt();
-      if ( wkt )
-      {
-        fprintf( stdout, "%s", wkt );
-      }
-    }
-  }
-  else if ( strcmp( "srid", info_opt->answer ) == 0 )
-  {
-    G_get_window( &window );
-    if ( window.proj != PROJECTION_XY )
-    {
-      char *srid = G_get_projsrid();
-      if ( srid )
-      {
-        fprintf( stdout, "%s", srid );
-      }
-    }
-  }
   else if ( strcmp( "window", info_opt->answer ) == 0 )
   {
     if ( rast_opt->answer )

src/providers/grass/qgsgrass.cpp

@@ -2068,48 +2068,13 @@ QgsCoordinateReferenceSystem QgsGrass::crs( const QString &gisdbase, const QStri
     QString &error )
 {
   QgsDebugMsgLevel( QStringLiteral( "gisdbase = %1 location = %2" ).arg( gisdbase, location ), 2 );
-  QgsCoordinateReferenceSystem crs;
-
-  // try getting SRID directly first
-  try
-  {
-    const QString srid = getInfo( QStringLiteral( "srid" ), gisdbase, location );
-    QgsDebugMsgLevel( QStringLiteral( "srid: %1" ).arg( srid ), 2 );
-    crs = QgsCoordinateReferenceSystem( srid );
-    if ( crs.isValid() )
-      return crs;
-  }
-  catch ( QgsGrass::Exception &e )
-  {
-    error = tr( "Cannot get SRID" ) + "\n" + e.what();
-    QgsDebugError( error );
-  }
-
-  // else try WKT
+  QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem();
   try
   {
-    const QString wkt = getInfo( QStringLiteral( "wkt" ), gisdbase, location );
-    QgsDebugMsgLevel( QStringLiteral( "wkt: %1" ).arg( wkt ), 2 );
+    QString wkt = getInfo( QStringLiteral( "proj" ), gisdbase, location );
+    QgsDebugMsgLevel( "wkt: " + wkt, 2 );
     crs = QgsCoordinateReferenceSystem::fromWkt( wkt );
     QgsDebugMsgLevel( "crs.toWkt: " + crs.toWkt(), 2 );
-    if ( crs.isValid() )
-      return crs;
-  }
-  catch ( QgsGrass::Exception &e )
-  {
-    error = tr( "Cannot get projection" ) + "\n" + e.what();
-    QgsDebugError( error );
-  }
-
-  //else try lossy old proj properties approach
-  try
-  {
-    const QString wktFromProjString = getInfo( QStringLiteral( "proj" ), gisdbase, location );
-    QgsDebugMsgLevel( QStringLiteral( "WKT from proj string: %1" ).arg( wktFromProjString ), 2 );
-    crs = QgsCoordinateReferenceSystem::fromWkt( wktFromProjString );
-    QgsDebugMsgLevel( "crs.toWkt: " + crs.toWkt(), 2 );
-    if ( crs.isValid() )
-      return crs;
   }
   catch ( QgsGrass::Exception &e )
   {