diff options
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 16 | ||||
| -rw-r--r-- | include/proj/crs.hpp | 28 | ||||
| -rw-r--r-- | include/proj/io.hpp | 30 | ||||
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 6 | ||||
| -rw-r--r-- | src/iso19111/factory.cpp | 9 | ||||
| -rw-r--r-- | src/transformations/molodensky.cpp | 4 |
6 files changed, 54 insertions, 39 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index 0ff27203..af1c293f 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -63,15 +63,15 @@ namespace operation { /** \brief Grid description */ struct GridDescription { - std::string shortName{}; /**< Grid short filename */ - std::string fullName{}; /**< Grid full path name (if found) */ - std::string packageName{}; /**< Package name (or empty) */ - std::string url{}; /**< Grid URL (if packageName is empty), or package - URL (or empty) */ - bool directDownload = false; /**< Whether url can be fetched directly. */ + std::string shortName; /**< Grid short filename */ + std::string fullName; /**< Grid full path name (if found) */ + std::string packageName; /**< Package name (or empty) */ + std::string url; /**< Grid URL (if packageName is empty), or package + URL (or empty) */ + bool directDownload; /**< Whether url can be fetched directly. */ /** Whether the grid is released with an open license. */ - bool openLicense = false; - bool available = false; /**< Whether GRID is available. */ + bool openLicense; + bool available; /**< Whether GRID is available. */ //! @cond Doxygen_Suppress bool operator<(const GridDescription &other) const { diff --git a/include/proj/crs.hpp b/include/proj/crs.hpp index 33038683..b9594165 100644 --- a/include/proj/crs.hpp +++ b/include/proj/crs.hpp @@ -1205,23 +1205,23 @@ class PROJ_GCC_DLL DerivedCRSTemplate final : public DerivedCRSTraits::BaseType, typedef util::nn<std::shared_ptr<CSType>> CSNNPtr; /** \brief Return the base CRS of a DerivedCRSTemplate. - * - * @return the base CRS. - */ + * + * @return the base CRS. + */ PROJ_DLL const BaseNNPtr baseCRS() const; /** \brief Instantiate a DerivedCRSTemplate from a base CRS, a deriving - * conversion and a cs::CoordinateSystem. - * - * @param properties See \ref general_properties. - * At minimum the name should be defined. - * @param baseCRSIn base CRS. - * @param derivingConversionIn the deriving conversion from the base CRS to - * this - * CRS. - * @param csIn the coordinate system. - * @return new DerivedCRSTemplate. - */ + * conversion and a cs::CoordinateSystem. + * + * @param properties See \ref general_properties. + * At minimum the name should be defined. + * @param baseCRSIn base CRS. + * @param derivingConversionIn the deriving conversion from the base CRS to + * this + * CRS. + * @param csIn the coordinate system. + * @return new DerivedCRSTemplate. + */ PROJ_DLL static NNPtr create(const util::PropertyMap &properties, const BaseNNPtr &baseCRSIn, const operation::ConversionNNPtr &derivingConversionIn, diff --git a/include/proj/io.hpp b/include/proj/io.hpp index de1c1d1b..8cf8e3c4 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -891,31 +891,35 @@ class PROJ_GCC_DLL AuthorityFactory { /** CRS information */ struct CRSInfo { /** Authority name */ - std::string authName{}; + std::string authName; /** Code */ - std::string code{}; + std::string code; /** Name */ - std::string name{}; + std::string name; /** Type */ - ObjectType type{ObjectType::CRS}; + ObjectType type; /** Whether the object is deprecated */ - bool deprecated{}; + bool deprecated; /** Whereas the west_lon_degree, south_lat_degree, east_lon_degree and - * north_lat_degree fields are valid. */ - bool bbox_valid{}; + * north_lat_degree fields are valid. */ + bool bbox_valid; /** Western-most longitude of the area of use, in degrees. */ - double west_lon_degree{}; + double west_lon_degree; /** Southern-most latitude of the area of use, in degrees. */ - double south_lat_degree{}; + double south_lat_degree; /** Eastern-most longitude of the area of use, in degrees. */ - double east_lon_degree{}; + double east_lon_degree; /** Northern-most latitude of the area of use, in degrees. */ - double north_lat_degree{}; + double north_lat_degree; /** Name of the area of use. */ - std::string areaName{}; + std::string areaName; /** Name of the projection method for a projected CRS. Might be empty * even for projected CRS in some cases. */ - std::string projectionMethodName{}; + std::string projectionMethodName; + + //! @cond Doxygen_Suppress + CRSInfo(); + //! @endcond }; PROJ_DLL std::list<CRSInfo> getCRSInfoList() const; diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index d5bcfa84..575eae39 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -552,7 +552,9 @@ struct CoordinateOperation::Private { // --------------------------------------------------------------------------- -GridDescription::GridDescription() = default; +GridDescription::GridDescription() + : shortName{}, fullName{}, packageName{}, url{}, directDownload(false), + openLicense(false), available(false) {} GridDescription::~GridDescription() = default; @@ -10802,7 +10804,7 @@ struct MyPROJStringExportableHorizVerticalHorizPROJBased final MyPROJStringExportableHorizVerticalHorizPROJBased:: ~MyPROJStringExportableHorizVerticalHorizPROJBased() = default; -} +} // namespace operation NS_PROJ_END #if 0 diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index b00a2c1a..3530f5d8 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -1359,6 +1359,15 @@ const DatabaseContextNNPtr &AuthorityFactory::databaseContext() const { // --------------------------------------------------------------------------- +//! @cond Doxygen_Suppress +AuthorityFactory::CRSInfo::CRSInfo() + : authName{}, code{}, name{}, type{ObjectType::CRS}, deprecated{}, + bbox_valid{}, west_lon_degree{}, south_lat_degree{}, east_lon_degree{}, + north_lat_degree{}, areaName{}, projectionMethodName{} {} +//! @endcond + +// --------------------------------------------------------------------------- + /** \brief Returns an arbitrary object from a code. * * The returned object will typically be an instance of Datum, diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp index 373b1095..289c321e 100644 --- a/src/transformations/molodensky.cpp +++ b/src/transformations/molodensky.cpp @@ -140,7 +140,7 @@ static PJ_LPZ calc_standard_params(PJ_LPZ lpz, PJ *P) { /* ellipsoid radii of curvature */ double rho = RM(a, P->es, lpz.phi); - double nu = RN(a, P->e2s, lpz.phi); + double nu = RN(a, P->es, lpz.phi); /* delta phi */ dphi = (-dx*sphi*clam) - (dy*sphi*slam) + (dz*cphi) @@ -193,7 +193,7 @@ static PJ_LPZ calc_abridged_params(PJ_LPZ lpz, PJ *P) { /* delta lambda */ dlam = -dx*slam + dy*clam; - const double dlam_denom = RN(P->a, P->e2s, lpz.phi)*cphi; + const double dlam_denom = RN(P->a, P->es, lpz.phi)*cphi; if( dlam_denom == 0.0 ) { lpz.lam = HUGE_VAL; return lpz; |