root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-07 12:05:14 +01:00
Code Issues Projects Releases Activity

Handle the WGS84 ellipsoid only definitions like the GRS80 ellipsoid only definitions

Browse Source
This commit is contained in:
Martin Tůma 2018-03-12 20:05:53 +01:00
parent 309fdb675c
commit bf5ae22f0d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/geotiff.cpp
View File

@ -296,14 +296,15 @@ const GCS *GeoTIFF::gcs(QMap<quint16, Value> &kv)
_errorString = QString("%1: unknown GCS") _errorString = QString("%1: unknown GCS")
.arg(kv.value(GeographicTypeGeoKey).SHORT); .arg(kv.value(GeographicTypeGeoKey).SHORT);
} else if (IS_SET(kv, GeogGeodeticDatumGeoKey) } else if (IS_SET(kv, GeogGeodeticDatumGeoKey)
|| kv.value(GeogEllipsoidGeoKey).SHORT == 7019) { || kv.value(GeogEllipsoidGeoKey).SHORT == 7019
|| kv.value(GeogEllipsoidGeoKey).SHORT == 7030) {
int pm = IS_SET(kv, GeogPrimeMeridianGeoKey) int pm = IS_SET(kv, GeogPrimeMeridianGeoKey)
? kv.value(GeogPrimeMeridianGeoKey).SHORT : 8901; ? kv.value(GeogPrimeMeridianGeoKey).SHORT : 8901;
int au = IS_SET(kv, GeogAngularUnitsGeoKey) int au = IS_SET(kv, GeogAngularUnitsGeoKey)
? kv.value(GeogAngularUnitsGeoKey).SHORT : 9102; ? kv.value(GeogAngularUnitsGeoKey).SHORT : 9102;
/* If only the ellipsoid is defined and it is GRS80, handle such // If only the ellipsoid is defined and it is GRS80 or WGS84, handle
definition as a WGS84 geodetic datum. */ // such definition as a WGS84 geodetic datum.
int gd = IS_SET(kv, GeogGeodeticDatumGeoKey) int gd = IS_SET(kv, GeogGeodeticDatumGeoKey)
? kv.value(GeogGeodeticDatumGeoKey).SHORT : 6326; ? kv.value(GeogGeodeticDatumGeoKey).SHORT : 6326;