Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Don't use a boundCRS definition as the WKT definition of EPSG:4326
on proj 6 builds

See OSGeo/PROJ#1804

(cherry picked from commit 550dede)
  • Loading branch information
nyalldawson committed Dec 20, 2019
1 parent 6b7c056 commit 7523d93
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/core/qgis.cpp
Expand Up @@ -50,6 +50,9 @@ const QString Qgis::QGIS_RELEASE_NAME( QString::fromUtf8( RELEASE_NAME ) );

const QString GEOPROJ4 = QStringLiteral( "+proj=longlat +datum=WGS84 +no_defs" );

#if PROJ_VERSION_MAJOR>=6
const QString GEOWKT = R"""(GEOGCRS["WGS 84",DATUM["World Geodetic System 1984",ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["unknown"],AREA["World"],BBOX[-90,-180,90,180]],ID["EPSG",4326]] )""";
#else
const QString GEOWKT =
"GEOGCS[\"WGS 84\", "
" DATUM[\"WGS_1984\", "
Expand All @@ -62,6 +65,7 @@ const QString GEOWKT =
" AXIS[\"Lat\",NORTH], "
" AXIS[\"Long\",EAST], "
" AUTHORITY[\"EPSG\",\"4326\"]]";
#endif

const QString PROJECT_SCALES =
"1:1000000,1:500000,1:250000,1:100000,1:50000,1:25000,"
Expand Down

0 comments on commit 7523d93

Please sign in to comment.