1 files changed, 20 insertions, 3 deletions
diff --git a/include/proj/io.hpp b/include/proj/io.hpp
index 689fede1..c649fa9f 100644
--- a/include/proj/io.hpp
+++ b/include/proj/io.hpp
@@ -206,7 +206,19 @@ class PROJ_GCC_DLL WKTFormatter {
 
     PROJ_DLL WKTFormatter &setMultiLine(bool multiLine) noexcept;
     PROJ_DLL WKTFormatter &setIndentationWidth(int width) noexcept;
-    PROJ_DLL WKTFormatter &setOutputAxis(bool outputAxis) noexcept;
+
+    /** Rule for output AXIS nodes */
+    enum class OutputAxisRule {
+        /** Always include AXIS nodes */
+        YES,
+        /** Never include AXIS nodes */
+        NO,
+        /** Includes them only on PROJCS node if it uses Easting/Northing
+         *ordering. Typically used for WKT1_GDAL */
+        WKT1_GDAL_EPSG_STYLE,
+    };
+
+    PROJ_DLL WKTFormatter &setOutputAxis(OutputAxisRule outputAxis) noexcept;
     PROJ_DLL WKTFormatter &setStrict(bool strict) noexcept;
     PROJ_DLL bool isStrict() const noexcept;
 
@@ -273,7 +285,7 @@ class PROJ_GCC_DLL WKTFormatter {
     PROJ_INTERNAL bool isInverted() const;
 #endif
 
-    PROJ_INTERNAL bool outputAxis() const;
+    PROJ_INTERNAL OutputAxisRule outputAxis() const;
     PROJ_INTERNAL bool outputAxisOrder() const;
     PROJ_INTERNAL bool primeMeridianOmittedIfGreenwich() const;
     PROJ_INTERNAL bool ellipsoidUnitOmittedIfMetre() const;
@@ -352,7 +364,7 @@ class PROJ_GCC_DLL PROJStringFormatter {
         startInversion();
     PROJ_DLL void stopInversion();
     PROJ_INTERNAL bool isInverted() const;
-    PROJ_INTERNAL bool getUseETMercForTMerc() const;
+    PROJ_INTERNAL bool getUseETMercForTMerc(bool &settingSetOut) const;
 
     PROJ_DLL void
     ingestPROJString(const std::string &str); // throw ParsingException
@@ -373,6 +385,11 @@ class PROJ_GCC_DLL PROJStringFormatter {
     PROJ_DLL void addParam(const char *paramName,
                            const std::vector<double> &vals);
 
+    PROJ_INTERNAL bool hasParam(const char *paramName) const;
+
+    PROJ_INTERNAL void addNoDefs(bool b);
+    PROJ_INTERNAL bool getAddNoDefs() const;
+
     PROJ_INTERNAL std::set<std::string> getUsedGridNames() const;
 
     PROJ_INTERNAL void setTOWGS84Parameters(const std::vector<double> &params);