Restore projects with OTF off to "no projection" (fix #16338)

nyalldawson · nyalldawson · commit 1aee4246e083 · 2017-03-14T16:44:54.000+10:00
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -419,22 +419,16 @@ QFileInfo QgsProject::fileInfo() const
 
 QgsCoordinateReferenceSystem QgsProject::crs() const
 {
-  QgsCoordinateReferenceSystem projectCrs;
-  long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );
-  if ( currentCRS != -1 )
-  {
-    projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );
-  }
-  return projectCrs;
+  return mCrs;
 }
 
 void QgsProject::setCrs( const QgsCoordinateReferenceSystem &crs )
 {
+  mCrs = crs;
   writeEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSProj4String" ), crs.toProj4() );
   writeEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), static_cast< int >( crs.srsid() ) );
   writeEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCrs" ), crs.authid() );
   setDirty( true );
-
   emit crsChanged();
 }
 
@@ -816,6 +810,19 @@ bool QgsProject::read()
   // now get project title
   _getTitle( *doc, mTitle );
 
+  //crs
+  QgsCoordinateReferenceSystem projectCrs;
+  if ( QgsProject::instance()->readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectionsEnabled" ), 0 ) )
+  {
+    long currentCRS = readNumEntry( QStringLiteral( "SpatialRefSys" ), QStringLiteral( "/ProjectCRSID" ), -1 );
+    if ( currentCRS != -1 )
+    {
+      projectCrs = QgsCoordinateReferenceSystem::fromSrsId( currentCRS );
+    }
+  }
+  mCrs = projectCrs;
+  emit crsChanged();
+
   QDomNodeList nl = doc->elementsByTagName( QStringLiteral( "autotransaction" ) );
   if ( nl.count() )
   {
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -1009,6 +1009,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     QString mTitle;              // project title
     bool mAutoTransaction;       // transaction grouped editing
     bool mEvaluateDefaultValues; // evaluate default values immediately
+    QgsCoordinateReferenceSystem mCrs;
     bool mDirty;                 // project has been modified since it has been read or saved
 };
 
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -617,6 +617,29 @@ void QgsProjectFileTransform::transform2200to2300()
 
 void QgsProjectFileTransform::transform2990()
 {
+  QDomNodeList srsNodes = mDom.elementsByTagName( QStringLiteral( "SpatialRefSys" ) );
+  if ( srsNodes.count() > 0 )
+  {
+    QDomElement srsElem = srsNodes.at( 0 ).toElement();
+    QDomNodeList projNodes = srsElem.elementsByTagName( "ProjectionsEnabled" );
+    if ( projNodes.count() == 0 )
+    {
+      QDomElement projElem = mDom.createElement( QStringLiteral( "ProjectionsEnabled" ) );
+      projElem.setAttribute( "type", "int" );
+      projElem.setNodeValue( "0" );
+      srsElem.appendChild( projElem );
+    }
+  }
+  else
+  {
+    QDomElement srsElem = mDom.createElement( QStringLiteral( "SpatialRefSys" ) );
+    mDom.appendChild( srsElem );
+    QDomElement projElem = mDom.createElement( QStringLiteral( "ProjectionsEnabled" ) );
+    projElem.setAttribute( "type", "int" );
+    projElem.setNodeValue( "0" );
+    srsElem.appendChild( projElem );
+  }
+
   QDomNodeList mapLayers = mDom.elementsByTagName( QStringLiteral( "maplayer" ) );
 
   for ( int mapLayerIndex = 0; mapLayerIndex < mapLayers.count(); ++mapLayerIndex )
