Don't show generic proj error message to users

nyalldawson · nyalldawson · commit a8b5583aab11 · 2019-06-03T16:46:54.000+10:00
diff --git a/src/core/qgscoordinatetransform_p.cpp b/src/core/qgscoordinatetransform_p.cpp
@@ -336,13 +336,14 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
       if ( count < 1 )
       {
         // huh?
-        if ( int errNo = proj_context_errno( context ) )
+        int errNo = proj_context_errno( context );
+        if ( errNo && errNo != -61 )
         {
           nonAvailableError = QString( proj_errno_string( errNo ) );
         }
         else
         {
-          nonAvailableError = QObject::tr( "No coordinate operations are available" );
+          nonAvailableError = QObject::tr( "No coordinate operations are available between these two reference systems" );
         }
       }
       else if ( count == 1 )
@@ -439,13 +440,14 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
 
   if ( !transform && nonAvailableError.isEmpty() )
   {
-    if ( int errNo = proj_context_errno( context ) )
+    int errNo = proj_context_errno( context );
+    if ( errNo && errNo != -61 )
     {
       nonAvailableError = QString( proj_errno_string( errNo ) );
     }
     else
     {
-      nonAvailableError = QObject::tr( "No coordinate operations are available" );
+      nonAvailableError = QObject::tr( "No coordinate operations are available between these two reference systems" );
     }
   }
 
@@ -470,7 +472,7 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
     return nullptr;
   }
 
-  // transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order
+// transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order
   ProjData res = proj_normalize_for_visualization( context, transform.get() );
   mProjProjections.insert( reinterpret_cast< uintptr_t>( context ), res );
 

Original file line number	Diff line number	Diff line change
`@@ -336,13 +336,14 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()`
`336`	`336`	`if ( count < 1 )`
`337`	`337`	`{`
`338`	`338`	`// huh?`
`339`		`- if ( int errNo = proj_context_errno( context ) )`
	`339`	`+ int errNo = proj_context_errno( context );`
	`340`	`+ if ( errNo && errNo != -61 )`
`340`	`341`	`{`
`341`	`342`	`nonAvailableError = QString( proj_errno_string( errNo ) );`
`342`	`343`	`}`
`343`	`344`	`else`
`344`	`345`	`{`
`345`		`- nonAvailableError = QObject::tr( "No coordinate operations are available" );`
	`346`	`+ nonAvailableError = QObject::tr( "No coordinate operations are available between these two reference systems" );`
`346`	`347`	`}`
`347`	`348`	`}`
`348`	`349`	`else if ( count == 1 )`
`@@ -439,13 +440,14 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()`
`439`	`440`
`440`	`441`	`if ( !transform && nonAvailableError.isEmpty() )`
`441`	`442`	`{`
`442`		`- if ( int errNo = proj_context_errno( context ) )`
	`443`	`+ int errNo = proj_context_errno( context );`
	`444`	`+ if ( errNo && errNo != -61 )`
`443`	`445`	`{`
`444`	`446`	`nonAvailableError = QString( proj_errno_string( errNo ) );`
`445`	`447`	`}`
`446`	`448`	`else`
`447`	`449`	`{`
`448`		`- nonAvailableError = QObject::tr( "No coordinate operations are available" );`
	`450`	`+ nonAvailableError = QObject::tr( "No coordinate operations are available between these two reference systems" );`
`449`	`451`	`}`
`450`	`452`	`}`
`451`	`453`
`@@ -470,7 +472,7 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()`
`470`	`472`	`return nullptr;`
`471`	`473`	`}`
`472`	`474`
`473`		`- // transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order`
	`475`	`+// transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order`
`474`	`476`	`ProjData res = proj_normalize_for_visualization( context, transform.get() );`
`475`	`477`	`mProjProjections.insert( reinterpret_cast< uintptr_t>( context ), res );`
`476`	`478`