Be less fussy when matching proj strings to auth/code from qgis db on proj 6

nyalldawson · nyalldawson · commit d42baf49316f · 2019-05-13T10:38:26.000+10:00
The db has many more entries, and ideally the matching using qgis db
is going to be removed asap (as soon as proj can correctly perform
this identification itself)
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1062,7 +1062,10 @@ QgsCoordinateReferenceSystem::RecordMap QgsCoordinateReferenceSystem::getRecord(
     if ( statement.step() != SQLITE_DONE )
     {
       QgsDebugMsgLevel( QStringLiteral( "Multiple records found in srs.db" ), 4 );
+      //be less fussy on proj 6 -- the db has MANY more entries!
+#if PROJ_VERSION_MAJOR<6
       myMap.clear();
+#endif
     }
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -1062,7 +1062,10 @@ QgsCoordinateReferenceSystem::RecordMap QgsCoordinateReferenceSystem::getRecord(`
`1062`	`1062`	`if ( statement.step() != SQLITE_DONE )`
`1063`	`1063`	`{`
`1064`	`1064`	`QgsDebugMsgLevel( QStringLiteral( "Multiple records found in srs.db" ), 4 );`
	`1065`	`+ //be less fussy on proj 6 -- the db has MANY more entries!`
	`1066`	`+#if PROJ_VERSION_MAJOR<6`
`1065`	`1067`	`myMap.clear();`
	`1068`	`+#endif`
`1066`	`1069`	`}`
`1067`	`1070`	`}`
`1068`	`1071`	`else`