Clean up handling of inverted axis for CRS, fix detachment issue

nyalldawson · nyalldawson · commit f124b5d09a0a · 2016-07-26T17:11:47.000+10:00
(cherry-picked from 6dac8e1)
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -238,9 +238,12 @@ bool QgsCoordinateReferenceSystem::createFromOgcWmsCrs( const QString& theCrs )
   if ( wmsCrs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 ||
        wmsCrs.compare( "OGC:CRS84", Qt::CaseInsensitive ) == 0 )
   {
-    d.detach();
     createFromOgcWmsCrs( "EPSG:4326" );
-    d->mAxisInverted = 0;
+
+    d.detach();
+    d->mAxisInverted = false;
+    d->mAxisInvertedDirty = false;
+
     return d->mIsValid;
   }
 
@@ -337,7 +340,7 @@ bool QgsCoordinateReferenceSystem::loadFromDb( const QString& db, const QString&
     d->mSRID = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 5 ) ) ).toLong() ;
     d->mAuthId = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 6 ) ) );
     d->mIsGeographic = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 7 ) ) ).toInt() != 0;
-    d->mAxisInverted = -1;
+    d->mAxisInvertedDirty = true;
 
     if ( d->mSrsId >= USER_CRS_START_ID && d->mAuthId.isEmpty() )
     {
@@ -367,7 +370,7 @@ bool QgsCoordinateReferenceSystem::loadFromDb( const QString& db, const QString&
 
 bool QgsCoordinateReferenceSystem::axisInverted() const
 {
-  if ( d->mAxisInverted == -1 )
+  if ( d->mAxisInvertedDirty )
   {
     OGRAxisOrientation orientation;
     OSRGetAxis( d->mCRS, OSRIsGeographic( d->mCRS ) ? "GEOGCS" : "PROJCS", 0, &orientation );
@@ -386,9 +389,10 @@ bool QgsCoordinateReferenceSystem::axisInverted() const
     }
 
     d->mAxisInverted = orientation == OAO_North;
+    d->mAxisInvertedDirty = false;
   }
 
-  return d->mAxisInverted != 0;
+  return d->mAxisInverted;
 }
 
 bool QgsCoordinateReferenceSystem::createFromWkt( const QString &theWkt )
diff --git a/src/core/qgscoordinatereferencesystem_p.h b/src/core/qgscoordinatereferencesystem_p.h
@@ -49,6 +49,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
         , mSRID( 0 )
         , mIsValid( 0 )
         , mCRS( OSRNewSpatialReference( nullptr ) )
+        , mAxisInvertedDirty( false )
         , mAxisInverted( false )
     {
     }
@@ -68,6 +69,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
         , mValidationHint( other.mValidationHint )
         , mWkt( other.mWkt )
         , mProj4( other.mProj4 )
+        , mAxisInvertedDirty( other.mAxisInvertedDirty )
         , mAxisInverted( other.mAxisInverted )
     {
       if ( mIsValid )
@@ -114,8 +116,11 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
     mutable QString mWkt;
     mutable QString mProj4;
 
+    //! True if presence of an inverted axis needs to be recaculated
+    mutable bool mAxisInvertedDirty;
+
     //! Whether this is a coordinate system has inverted axis
-    mutable int mAxisInverted;
+    mutable bool mAxisInverted;
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -238,9 +238,12 @@ bool QgsCoordinateReferenceSystem::createFromOgcWmsCrs( const QString& theCrs )`
`238`	`238`	`if ( wmsCrs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 \|\|`
`239`	`239`	`wmsCrs.compare( "OGC:CRS84", Qt::CaseInsensitive ) == 0 )`
`240`	`240`	`{`
`241`		`- d.detach();`
`242`	`241`	`createFromOgcWmsCrs( "EPSG:4326" );`
`243`		`- d->mAxisInverted = 0;`
	`242`	`+`
	`243`	`+ d.detach();`
	`244`	`+ d->mAxisInverted = false;`
	`245`	`+ d->mAxisInvertedDirty = false;`
	`246`	`+`
`244`	`247`	`return d->mIsValid;`
`245`	`248`	`}`
`246`	`249`
`@@ -337,7 +340,7 @@ bool QgsCoordinateReferenceSystem::loadFromDb( const QString& db, const QString&`
`337`	`340`	`d->mSRID = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 5 ) ) ).toLong() ;`
`338`	`341`	`d->mAuthId = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 6 ) ) );`
`339`	`342`	`d->mIsGeographic = QString::fromUtf8( reinterpret_cast< const char * >( sqlite3_column_text( myPreparedStatement, 7 ) ) ).toInt() != 0;`
`340`		`- d->mAxisInverted = -1;`
	`343`	`+ d->mAxisInvertedDirty = true;`
`341`	`344`
`342`	`345`	`if ( d->mSrsId >= USER_CRS_START_ID && d->mAuthId.isEmpty() )`
`343`	`346`	`{`
`@@ -367,7 +370,7 @@ bool QgsCoordinateReferenceSystem::loadFromDb( const QString& db, const QString&`
`367`	`370`
`368`	`371`	`bool QgsCoordinateReferenceSystem::axisInverted() const`
`369`	`372`	`{`
`370`		`- if ( d->mAxisInverted == -1 )`
	`373`	`+ if ( d->mAxisInvertedDirty )`
`371`	`374`	`{`
`372`	`375`	`OGRAxisOrientation orientation;`
`373`	`376`	`OSRGetAxis( d->mCRS, OSRIsGeographic( d->mCRS ) ? "GEOGCS" : "PROJCS", 0, &orientation );`
`@@ -386,9 +389,10 @@ bool QgsCoordinateReferenceSystem::axisInverted() const`
`386`	`389`	`}`
`387`	`390`
`388`	`391`	`d->mAxisInverted = orientation == OAO_North;`
	`392`	`+ d->mAxisInvertedDirty = false;`
`389`	`393`	`}`
`390`	`394`
`391`		`- return d->mAxisInverted != 0;`
	`395`	`+ return d->mAxisInverted;`
`392`	`396`	`}`
`393`	`397`
`394`	`398`	`bool QgsCoordinateReferenceSystem::createFromWkt( const QString &theWkt )`