Skip to content
Permalink
Browse files

Fix build, fix test on proj < 6

(cherry picked from commit 4fd9619)
  • Loading branch information
nyalldawson committed Dec 19, 2019
1 parent ffe0923 commit 394cbb350f970b9f3ff8ec983ea11916e4867599
Showing with 3 additions and 1 deletion.
  1. +2 −0 tests/src/core/testqgscoordinatereferencesystem.cpp
  2. +1 −1 tests/src/core/testqgsdistancearea.cpp
@@ -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
@@ -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 );

0 comments on commit 394cbb3

Please sign in to comment.
You can’t perform that action at this time.