diff options
| -rw-r--r-- | include/proj/coordinateoperation.hpp | 6 | ||||
| -rw-r--r-- | include/proj/crs.hpp | 28 | ||||
| -rw-r--r-- | include/proj/io.hpp | 2 | ||||
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 15 | ||||
| -rw-r--r-- | src/iso19111/factory.cpp | 18 |
5 files changed, 26 insertions, 43 deletions
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp index 3111a2a3..af1c293f 100644 --- a/include/proj/coordinateoperation.hpp +++ b/include/proj/coordinateoperation.hpp @@ -66,9 +66,9 @@ 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; /**< Whether url can be fetched directly. */ + 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; bool available; /**< Whether GRID is available. */ 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 2fef0f9c..8cf8e3c4 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -901,7 +901,7 @@ class PROJ_GCC_DLL AuthorityFactory { /** Whether the object is deprecated */ bool deprecated; /** Whereas the west_lon_degree, south_lat_degree, east_lon_degree and - * north_lat_degree fields are valid. */ + * north_lat_degree fields are valid. */ bool bbox_valid; /** Western-most longitude of the area of use, in degrees. */ double west_lon_degree; diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index 0eef9954..575eae39 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -552,16 +552,9 @@ struct CoordinateOperation::Private { // --------------------------------------------------------------------------- -GridDescription::GridDescription(): - shortName{}, - fullName{}, - packageName{}, - url{}, - directDownload(false), - openLicense(false), - available(false) -{} - +GridDescription::GridDescription() + : shortName{}, fullName{}, packageName{}, url{}, directDownload(false), + openLicense(false), available(false) {} GridDescription::~GridDescription() = default; @@ -10811,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 d1fd4d0b..3530f5d8 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -1360,20 +1360,10 @@ 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{} -{} +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 // --------------------------------------------------------------------------- |