sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix build, fix test on proj < 6

Browse Source
This commit is contained in:
Nyall Dawson 2019-12-19 13:49:09 +10:00
parent dc3846544e
commit 4fd9619ebc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/core/testqgscoordinatereferencesystem.cpp
View File

@ -23,7 +23,9 @@ Email : sherman at mrcc dot com
#include "qgis.h"
#include "qgsvectorlayer.h"
#include "qgsproject.h"
#if PROJ_VERSION_MAJOR>=6
#include "qgsprojutils.h"
#endif
#if PROJ_VERSION_MAJOR > 4
#include <proj.h>
#else

2
tests/src/core/testqgsdistancearea.cpp
View File

@ -341,7 +341,7 @@ void TestQgsDistanceArea::measureAreaAndUnits()
poly << ring;
polygon = QgsGeometry::fromPolygonXY( poly );
da.setSourceCrs( QgsCoordinateReferenceSystem( QStringLiteral( "ESRI:102635" ) ), QgsProject::instance()->transformContext() );
da.setSourceCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:102635" ) ), QgsProject::instance()->transformContext() );
da.setEllipsoid( QStringLiteral( "NONE" ) );
// measurement should be in square feet
area = da.measureArea( polygon );