[QGIS Commit] r9296 - in trunk/qgis/src: core plugins/grass

[svn_qgis at osgeo.org]

Author: telwertowski
Date: 2008-09-11 02:14:55 -0400 (Thu, 11 Sep 2008)
New Revision: 9296

Modified:
   trunk/qgis/src/core/qgis.h
   trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
Log:
Update GEOCRS_ID constant to match updated srs.db in r8720. Fix for #1231.


Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h	2008-09-11 06:04:07 UTC (rev 9295)
+++ trunk/qgis/src/core/qgis.h	2008-09-11 06:14:55 UTC (rev 9296)
@@ -128,7 +128,7 @@
 /** Magic number for a geographic coord sys in POSTGIS SRID */
 const long GEOSRID = 4326;
 /** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
-const long GEOCRS_ID = 2585;
+const long GEOCRS_ID = 3344;
 /**  Magic number for a geographic coord sys in EPSG ID format */
 const long GEOEPSG_ID = 4326;
 /** The length of teh string "+proj=" */

Modified: trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp	2008-09-11 06:04:07 UTC (rev 9295)
+++ trunk/qgis/src/plugins/grass/qgsgrassnewmapset.cpp	2008-09-11 06:14:55 UTC (rev 9296)
@@ -431,7 +431,7 @@
   }
 
   // Define projection
-  if ( !proj4.isNull() )
+  if ( !proj4.isEmpty() )
   {
     QgsDebugMsg( QString( "proj4 = %1" ).arg( proj4.toLocal8Bit().constData() ) );
 
@@ -855,11 +855,11 @@
 
 
   // Warning: seems that crashes if source == dest
-  if ( mProjectionSelector->selectedCrsId() != 2585 )
+  if ( mProjectionSelector->selectedCrsId() != GEOCRS_ID )
   {
     // Warning: QgsCoordinateReferenceSystem::EPSG is broken (using epsg_id)
     //QgsCoordinateReferenceSystem source ( 4326, QgsCoordinateReferenceSystem::EPSG );
-    QgsCoordinateReferenceSystem source( 2585, QgsCoordinateReferenceSystem::QGIS_CRSID );
+    QgsCoordinateReferenceSystem source( GEOCRS_ID, QgsCoordinateReferenceSystem::QGIS_CRSID );
 
     if ( !source.isValid() )
     {
@@ -1067,7 +1067,7 @@
   points.push_back( QgsPoint( points[0] ) ); // close polygon
 
   // Warning: seems that crashes if source == dest
-  if ( mProjectionSelector->selectedCrsId() != 2585 )
+  if ( mProjectionSelector->selectedCrsId() != GEOCRS_ID )
   {
     QgsCoordinateReferenceSystem source( mProjectionSelector->selectedCrsId(),
                                          QgsCoordinateReferenceSystem::QGIS_CRSID );
@@ -1079,7 +1079,7 @@
       return;
     }
 
-    QgsCoordinateReferenceSystem dest( 2585, QgsCoordinateReferenceSystem::QGIS_CRSID );
+    QgsCoordinateReferenceSystem dest( GEOCRS_ID, QgsCoordinateReferenceSystem::QGIS_CRSID );
 
     if ( !dest.isValid() )
     {