diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-07-06 11:25:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 11:25:59 +0200 |
| commit | 7cfde8d0b30c267aa1c5c64db0f0c5a5099c52a3 (patch) | |
| tree | cbfc84f87dc33837e675314900f3402dd4f2a7d0 /src | |
| parent | b8fef0901bd92056b92b028476d160e0804de16b (diff) | |
| parent | 71ddcf9757725b5c43b1e550c2b6d0a78c5a6e47 (diff) | |
| download | PROJ-7cfde8d0b30c267aa1c5c64db0f0c5a5099c52a3.tar.gz PROJ-7cfde8d0b30c267aa1c5c64db0f0c5a5099c52a3.zip | |
Merge pull request #2274 from snowman2/pjtype
ENH: Added temporal, engineering, and parametric datum PJ_TYPE enumerations
Diffstat (limited to 'src')
| -rw-r--r-- | src/iso19111/c_api.cpp | 21 | ||||
| -rw-r--r-- | src/proj.h | 4 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 24724c70..9219f767 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -915,6 +915,18 @@ convertPJObjectTypeToObjectType(PJ_TYPE type, bool &valid) { cppType = AuthorityFactory::ObjectType::DATUM; break; + case PJ_TYPE_TEMPORAL_DATUM: + valid = false; + break; + + case PJ_TYPE_ENGINEERING_DATUM: + valid = false; + break; + + case PJ_TYPE_PARAMETRIC_DATUM: + valid = false; + break; + case PJ_TYPE_CRS: cppType = AuthorityFactory::ObjectType::CRS; break; @@ -1084,6 +1096,15 @@ PJ_TYPE proj_get_type(const PJ *obj) { if (dynamic_cast<DatumEnsemble *>(ptr)) { return PJ_TYPE_DATUM_ENSEMBLE; } + if (dynamic_cast<TemporalDatum *>(ptr)) { + return PJ_TYPE_TEMPORAL_DATUM; + } + if (dynamic_cast<EngineeringDatum *>(ptr)) { + return PJ_TYPE_ENGINEERING_DATUM; + } + if (dynamic_cast<ParametricDatum *>(ptr)) { + return PJ_TYPE_PARAMETRIC_DATUM; + } { auto crs = dynamic_cast<GeographicCRS *>(ptr); @@ -735,6 +735,10 @@ typedef enum PJ_TYPE_TRANSFORMATION, PJ_TYPE_CONCATENATED_OPERATION, PJ_TYPE_OTHER_COORDINATE_OPERATION, + + PJ_TYPE_TEMPORAL_DATUM, + PJ_TYPE_ENGINEERING_DATUM, + PJ_TYPE_PARAMETRIC_DATUM, } PJ_TYPE; /** Comparison criterion. */ |
