Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Use proj geodesic.h instead of GeographicLib
Because it contains the same functionality and avoids a new dependency
- Loading branch information
1 parent
9c7be5f
commit c9c502a
Showing
8 changed files
with
22 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c9c502a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something seems to be missing:
src/core/qgsdistancearea.cpp: In member function ‘double QgsDistanceArea::latitudeGeodesicCrossesDateLine(const QgsPointXY&, const QgsPointXY&, double&) const’:
src/core/qgsdistancearea.cpp:482:3: error: ‘geod_inverseline’ was not declared in this scope
geod_inverseline( &line, &geod, p1y, p1x, p2y, p2x, GEOD_ALL );
^~~~~~~~~~~~~~~~
src/core/qgsdistancearea.cpp:482:3: note: suggested alternative: ‘geod_inverse’
geod_inverseline( &line, &geod, p1y, p1x, p2y, p2x, GEOD_ALL );
^~~~~~~~~~~~~~~~
geod_inverse
src/core/qgsdistancearea.cpp:484:33: error: ‘struct geod_geodesicline’ has no member named ‘s13’
const double totalDist = line.s13;
^~~
src/core/qgsdistancearea.cpp:485:34: error: ‘struct geod_geodesicline’ has no member named ‘s13’
double intersectionDist = line.s13;
^~~
src/core/qgsdistancearea.cpp:508:31: error: ‘struct geod_geodesicline’ has no member named ‘s13’
intersectionDist = line.s13 * 0.5;
^~~
src/core/qgsdistancearea.cpp: In member function ‘QVector<QVector > QgsDistanceArea::geodesicLine(const QgsPointXY&, const QgsPointXY&, double, bool) const’:
src/core/qgsdistancearea.cpp:558:3: error: ‘geod_inverseline’ was not declared in this scope
geod_inverseline( &line, &geod, pp1.y(), pp1.x(), pp2.y(), pp2.x(), GEOD_ALL );
^~~~~~~~~~~~~~~~
src/core/qgsdistancearea.cpp:558:3: note: suggested alternative: ‘geod_inverse’
geod_inverseline( &line, &geod, pp1.y(), pp1.x(), pp2.y(), pp2.x(), GEOD_ALL );
^~~~~~~~~~~~~~~~
geod_inverse
src/core/qgsdistancearea.cpp:559:33: error: ‘struct geod_geodesicline’ has no member named ‘s13’
const double totalDist = line.s13;
c9c502a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@marisn You need to upgrade to proj >= 4.9.3
c9c502a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@nyalldawson can you add a CMAKE check for the minimum required proj version?