fix detection of 2.x project crs (followup f2b5a59)

jef-n · jef-n · commit 8c96eec25e4f · 2018-01-24T19:15:25.000+01:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -905,21 +905,25 @@ bool QgsProject::readProjectFile( const QString &filename )
 
     if ( !projectCrs.isValid() )
     {
-      // else we try using the stored proj4 string - it's consistent across different QGIS installs,
-      // whereas the srsid can vary (e.g. for custom projections)
       QString projCrsString = readEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSProj4String" ) );
-      if ( !projCrsString.isEmpty() )
+      long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );
+
+      // try the CRS
+      if ( currentCRS >= 0 )
+      {
+        projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );
+      }
+
+      // if that didn't produce a match, try the proj.4 string
+      if ( !projCrsString.isEmpty() && ( !projectCrs.isValid() || projectCrs.toProj4() != projCrsString ) )
       {
         projectCrs = QgsCoordinateReferenceSystem::fromProj4( projCrsString );
       }
-      // last try using crs id - most fragile
+
+      // last just take the given id
       if ( !projectCrs.isValid() )
       {
-        long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );
-        if ( currentCRS != -1 && currentCRS < USER_CRS_START_ID )
-        {
-          projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );
-        }
+        projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );
       }
     }
   }
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -79,6 +79,7 @@ class TestQgsCoordinateReferenceSystem: public QObject
     void bounds();
     void saveAsUserCrs();
     void projectWithCustomCrs();
+    void projectEPSG25833();
 
   private:
     void debugPrint( QgsCoordinateReferenceSystem &crs );
@@ -882,5 +883,15 @@ void TestQgsCoordinateReferenceSystem::projectWithCustomCrs()
   QCOMPARE( spyCrsChanged.count(), 1 );
 }
 
+void TestQgsCoordinateReferenceSystem::projectEPSG25833()
+{
+  // tests loading a 2.x project with a predefined EPSG that has non unique proj.4 string
+  QgsProject p;
+  QSignalSpy spyCrsChanged( &p, &QgsProject::crsChanged );
+  QVERIFY( p.read( TEST_DATA_DIR + QStringLiteral( "/projects/epsg25833.qgs" ) ) );
+  QVERIFY( p.crs().isValid() );
+  QVERIFY( p.crs().authid() == QStringLiteral( "EPSG:25833" ) );
+  QCOMPARE( spyCrsChanged.count(), 1 );
+}
 QGSTEST_MAIN( TestQgsCoordinateReferenceSystem )
 #include "testqgscoordinatereferencesystem.moc"
diff --git a/tests/testdata/projects/epsg25833.qgs b/tests/testdata/projects/epsg25833.qgs
@@ -0,0 +1,43 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis projectname="" version="2.18.16">
+  <title></title>
+  <autotransaction active="0"/>
+  <evaluateDefaultValues active="0"/>
+  <layer-tree-group expanded="1" checked="Qt::PartiallyChecked" name="">
+    <customproperties/>
+  </layer-tree-group>
+  <relations/>
+  <mapcanvas>
+    <units>meters</units>
+    <extent>
+      <xmin>423939.41302644077222794</xmin>
+      <ymin>5645532.31057187728583813</ymin>
+      <xmax>426709.05210548255126923</xmax>
+      <ymax>5647280.68408176116645336</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <projections>1</projections>
+    <destinationsrs>
+      <spatialrefsys>
+        <proj4>+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs</proj4>
+        <srsid>2106</srsid>
+        <srid>25833</srid>
+        <authid>EPSG:25833</authid>
+        <description>ETRS89 / UTM zone 33N</description>
+        <projectionacronym>utm</projectionacronym>
+        <ellipsoidacronym>GRS80</ellipsoidacronym>
+        <geographicflag>false</geographicflag>
+      </spatialrefsys>
+    </destinationsrs>
+    <rendermaptile>0</rendermaptile>
+    <layer_coordinate_transform_info/>
+  </mapcanvas>
+  <layer-tree-canvas>
+    <custom-order enabled="0"/>
+  </layer-tree-canvas>
+  <legend updateDrawingOrder="true">
+  </legend>
+  <projectlayers/>
+  <properties/>
+  <visibility-presets/>
+</qgis>

Original file line number	Diff line number	Diff line change
`@@ -905,21 +905,25 @@ bool QgsProject::readProjectFile( const QString &filename )`
`905`	`905`
`906`	`906`	`if ( !projectCrs.isValid() )`
`907`	`907`	`{`
`908`		`- // else we try using the stored proj4 string - it's consistent across different QGIS installs,`
`909`		`- // whereas the srsid can vary (e.g. for custom projections)`
`910`	`908`	`QString projCrsString = readEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSProj4String" ) );`
`911`		`- if ( !projCrsString.isEmpty() )`
	`909`	`+ long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );`
	`910`	`+`
	`911`	`+ // try the CRS`
	`912`	`+ if ( currentCRS >= 0 )`
	`913`	`+ {`
	`914`	`+ projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );`
	`915`	`+ }`
	`916`	`+`
	`917`	`+ // if that didn't produce a match, try the proj.4 string`
	`918`	`+ if ( !projCrsString.isEmpty() && ( !projectCrs.isValid() \|\| projectCrs.toProj4() != projCrsString ) )`
`912`	`919`	`{`
`913`	`920`	`projectCrs = QgsCoordinateReferenceSystem::fromProj4( projCrsString );`
`914`	`921`	`}`
`915`		`- // last try using crs id - most fragile`
	`922`	`+`
	`923`	`+ // last just take the given id`
`916`	`924`	`if ( !projectCrs.isValid() )`
`917`	`925`	`{`
`918`		`- long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );`
`919`		`- if ( currentCRS != -1 && currentCRS < USER_CRS_START_ID )`
`920`		`- {`
`921`		`- projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );`
`922`		`- }`
	`926`	`+ projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );`
`923`	`927`	`}`
`924`	`928`	`}`
`925`	`929`	`}`