return empty CRS instead of 4326 if the XML is empty

Gustry · nyalldawson · commit 2c511d25dce2 · 2018-01-16T14:17:42.000+10:00
diff --git a/python/core/qgscoordinatereferencesystem.sip b/python/core/qgscoordinatereferencesystem.sip
@@ -507,7 +507,7 @@ pieces of information about CRS.
     bool readXml( const QDomNode &node );
 %Docstring
 Restores state from the given DOM node.
-If it fails or if the node is empty, a default not empty CRS will be returned.
+If it fails or if the node is empty, a default empty CRS will be returned.
 
 :param node: The node from which state will be restored
 
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1397,9 +1397,6 @@ bool QgsCoordinateReferenceSystem::readXml( const QDomNode &node )
 
         //make sure the map units have been set
         setMapUnits();
-
-        //@TODO this srs needs to be validated!!!
-        d->mIsValid = true; //shamelessly hard coded for now
       }
       //TODO: createFromProj4 used to save to the user database any new CRS
       // this behavior was changed in order to separate creation and saving.
@@ -1417,8 +1414,8 @@ bool QgsCoordinateReferenceSystem::readXml( const QDomNode &node )
   }
   else
   {
-    // Return default CRS if none was found in the XML.
-    createFromId( GEOCRS_ID, InternalCrsId );
+    // Return empty CRS if none was found in the XML.
+    d = new QgsCoordinateReferenceSystemPrivate();
     result = false;
   }
   return result;
diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -466,7 +466,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
 
     /**
      * Restores state from the given DOM node.
-     * If it fails or if the node is empty, a default not empty CRS will be returned.
+     * If it fails or if the node is empty, a default empty CRS will be returned.
      * \param node The node from which state will be restored
      * \returns bool True on success, False on failure
      */
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -62,8 +62,7 @@ class TestQgsCoordinateReferenceSystem: public QObject
     void equality();
     void noEquality();
     void equalityInvalid();
-    void readXml();
-    void writeXml();
+    void readWriteXml();
     void setCustomSrsValidation();
     void customSrsValidation();
     void postgisSrid();
@@ -600,18 +599,38 @@ void TestQgsCoordinateReferenceSystem::equalityInvalid()
   QgsCoordinateReferenceSystem invalidCrs2;
   QVERIFY( invalidCrs1 == invalidCrs2 );
 }
-void TestQgsCoordinateReferenceSystem::readXml()
+void TestQgsCoordinateReferenceSystem::readWriteXml()
 {
-  //QgsCoordinateReferenceSystem myCrs;
-  //myCrs.createFromSrid( GEOSRID );
-  //QgsCoordinateReferenceSystem myCrs2;
-  //QVERIFY( myCrs2.readXml( QDomNode & node ) );
-}
-void TestQgsCoordinateReferenceSystem::writeXml()
-{
-  //QgsCoordinateReferenceSystem myCrs;
-  //bool writeXml( QDomNode & node, QDomDocument & doc ) const;
-  //QVERIFY( myCrs.isValid() );
+  QgsCoordinateReferenceSystem myCrs;
+  myCrs.createFromSrid( GEOSRID );
+  QVERIFY( myCrs.isValid() );
+  QDomDocument document( "test" );
+  QDomElement node = document.createElement( QStringLiteral( "crs" ) );
+  document.appendChild( node );
+  QVERIFY( myCrs.writeXml( node, document ) );
+  QgsCoordinateReferenceSystem myCrs2;
+  QVERIFY( myCrs2.readXml( node ) );
+  QVERIFY( myCrs == myCrs2 );
+
+  // Empty XML made from writeXml operation
+  QgsCoordinateReferenceSystem myCrs3;
+  QDomDocument document2( "test" );
+  QDomElement node2 = document2.createElement( QStringLiteral( "crs" ) );
+  document2.appendChild( node2 );
+  QVERIFY( ! myCrs3.isValid() );
+  QVERIFY( myCrs3.writeXml( node2, document2 ) );
+  QgsCoordinateReferenceSystem myCrs4;
+  QVERIFY( myCrs4.readXml( node2 ) );
+  QVERIFY( ! myCrs4.isValid() );
+  QVERIFY( myCrs3 == myCrs4 );
+
+  // Empty XML node
+  QDomDocument document3( "test" );
+  QDomElement node3 = document3.createElement( QStringLiteral( "crs" ) );
+  document3.appendChild( node3 );
+  QgsCoordinateReferenceSystem myCrs5;
+  QVERIFY( ! myCrs5.readXml( node3 ) );
+  QVERIFY( myCrs5 == QgsCoordinateReferenceSystem() );
 }
 void TestQgsCoordinateReferenceSystem::setCustomSrsValidation()
 {

Original file line number	Diff line number	Diff line change
`@@ -1397,9 +1397,6 @@ bool QgsCoordinateReferenceSystem::readXml( const QDomNode &node )`
`1397`	`1397`
`1398`	`1398`	`//make sure the map units have been set`
`1399`	`1399`	`setMapUnits();`
`1400`		`-`
`1401`		`- //@TODO this srs needs to be validated!!!`
`1402`		`- d->mIsValid = true; //shamelessly hard coded for now`
`1403`	`1400`	`}`
`1404`	`1401`	`//TODO: createFromProj4 used to save to the user database any new CRS`
`1405`	`1402`	`// this behavior was changed in order to separate creation and saving.`
`@@ -1417,8 +1414,8 @@ bool QgsCoordinateReferenceSystem::readXml( const QDomNode &node )`
`1417`	`1414`	`}`
`1418`	`1415`	`else`
`1419`	`1416`	`{`
`1420`		`- // Return default CRS if none was found in the XML.`
`1421`		`- createFromId( GEOCRS_ID, InternalCrsId );`
	`1417`	`+ // Return empty CRS if none was found in the XML.`
	`1418`	`+ d = new QgsCoordinateReferenceSystemPrivate();`
`1422`	`1419`	`result = false;`
`1423`	`1420`	`}`
`1424`	`1421`	`return result;`