diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2019-03-26 12:07:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 12:07:27 +0100 |
| commit | d21fb4e9abd3246fcbece6724dd3d014c35df25e (patch) | |
| tree | ee4ba388d7d9507397b5cbad5814cb7e1ee540c0 /include | |
| parent | 66774791d16d1b197911e595aaaceb9690c8ca14 (diff) | |
| parent | 09db4826d4a1e5df900cb4b93a4b3eae2c487cb9 (diff) | |
| download | PROJ-d21fb4e9abd3246fcbece6724dd3d014c35df25e.tar.gz PROJ-d21fb4e9abd3246fcbece6724dd3d014c35df25e.zip | |
Merge pull request #1366 from rouault/ogc_18_010r6_further_fixes
OGC 18-010r6 further fixes regarding WKT2:2018 export
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/crs.hpp | 2 | ||||
| -rw-r--r-- | include/proj/io.hpp | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index b9594165..ed3463cd 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -503,7 +503,7 @@ class PROJ_GCC_DLL DerivedCRS : virtual public SingleCRS { PROJ_INTERNAL void setDerivingConversionCRS(); PROJ_INTERNAL void baseExportToWKT( - io::WKTFormatter *&formatter, const std::string &keyword, + io::WKTFormatter *formatter, const std::string &keyword, const std::string &baseKeyword) const; // throw(FormattingException) PROJ_INTERNAL bool diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 8cf8e3c4..5386ca6c 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -195,8 +195,7 @@ class PROJ_GCC_DLL WKTFormatter { WKT2_2018_SIMPLIFIED, /** WKT1 as traditionally output by GDAL, deriving from OGC 01-009. - A notable departuPROJ_GCC_DLLre from WKT1_GDAL with respect to OGC - 01-009 is + A notable departure from WKT1_GDAL with respect to OGC 01-009 is that in WKT1_GDAL, the unit of the PRIMEM value is always degrees. */ WKT1_GDAL, @@ -262,6 +261,13 @@ class PROJ_GCC_DLL WKTFormatter { PROJ_INTERNAL void popOutputId(); PROJ_INTERNAL bool outputId() const; + PROJ_INTERNAL void pushHasId(bool hasId); + PROJ_INTERNAL void popHasId(); + + PROJ_INTERNAL void pushDisableUsage(); + PROJ_INTERNAL void popDisableUsage(); + PROJ_INTERNAL bool outputUsage() const; + PROJ_INTERNAL void pushAxisLinearUnit(const common::UnitOfMeasureNNPtr &unit); PROJ_INTERNAL void popAxisLinearUnit(); @@ -303,6 +309,8 @@ class PROJ_GCC_DLL WKTFormatter { PROJ_INTERNAL bool primeMeridianOrParameterUnitOmittedIfSameAsAxis() const; PROJ_INTERNAL bool primeMeridianInDegree() const; PROJ_INTERNAL bool outputCSUnitOnlyOnceIfSame() const; + PROJ_INTERNAL bool idOnTopLevelOnly() const; + PROJ_INTERNAL bool topLevelHasId() const; /** WKT version. */ enum class Version { |