sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[BACKPORT] Naming consistency for GEOWkt global (renamed to GEOWKT)

Browse Source
This commit is contained in:
Tim Sutton 2012-04-06 23:38:27 +02:00
parent 55d92681d7
commit 845856e637
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/core/qgis.sip
View File

@ -100,8 +100,15 @@ public:
};
/** Wkt string that represents a geographic coord sys */
const QString GEOWkt;
/** Wkt string that represents a geographic coord sys
* @note added in 1.8 to replace GEOWkt
*/
const QString GEOWKT;
/** Wkt string that represents a geographic coord sys
* @note deprecated in 1.8 due to violation of coding conventions (globals
* should be in all caps).
*/
const QString GEOWkt /Deprecated/;
/** PROJ4 string that represents a geographic coord sys */
const QString GEOPROJ4;

11
src/core/qgis.h
View File

@ -133,8 +133,10 @@ inline bool doubleNear( double a, double b, double epsilon = 4 * DBL_EPSILON )
return diff > -epsilon && diff <= epsilon;
}
/** Wkt string that represents a geographic coord sys */
const QString GEOWkt =
/** Wkt string that represents a geographic coord sys
* @note added in 1.8 to replace GEOWkt
*/
const QString GEOWKT =
"GEOGCS[\"WGS 84\", "
" DATUM[\"WGS_1984\", "
" SPHEROID[\"WGS 84\",6378137,298.257223563, "
@ -146,6 +148,11 @@ const QString GEOWkt =
" AXIS[\"Lat\",NORTH], "
" AXIS[\"Long\",EAST], "
" AUTHORITY[\"EPSG\",4326]]";
/** Wkt string that represents a geographic coord sys
* @note deprecated in 1.8 due to violation of coding conventions (globals
* should be in all caps).
*/
Q_DECL_DEPRECATED const QString GEOWkt = GEOWKT;
/** PROJ4 string that represents a geographic coord sys */
const QString GEOPROJ4 = "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs";
/** Magic number for a geographic coord sys in POSTGIS SRID */