Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Added temporal, engineering, and parametric datum PJ_TYPE enumerations #2274

Merged
merged 2 commits into from
Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/iso19111/c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions src/proj.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
34 changes: 33 additions & 1 deletion test/unit/test_c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,34 @@ TEST_F(CApi, proj_get_type) {
ASSERT_NE(obj, nullptr);
EXPECT_EQ(proj_get_type(obj), PJ_TYPE_VERTICAL_CRS);
}
{
auto wkt = "TDATUM[\"Gregorian calendar\",\n"
" CALENDAR[\"proleptic Gregorian\"],\n"
" TIMEORIGIN[0000-01-01]]";

auto datum = proj_create_from_wkt(
m_ctxt, wkt,
nullptr, nullptr, nullptr);
ObjectKeeper keeper(datum);
ASSERT_NE(datum, nullptr);
EXPECT_EQ(proj_get_type(datum), PJ_TYPE_TEMPORAL_DATUM);
}
{
auto wkt = "ENGINEERINGDATUM[\"Engineering datum\"]";
auto datum = proj_create_from_wkt(
m_ctxt, wkt,
nullptr, nullptr, nullptr);
ObjectKeeper keeper(datum);
EXPECT_EQ(proj_get_type(datum), PJ_TYPE_ENGINEERING_DATUM);
}
{
auto wkt = "PDATUM[\"Mean Sea Level\",ANCHOR[\"1013.25 hPa at 15°C\"]]";
auto datum = proj_create_from_wkt(
m_ctxt, wkt,
nullptr, nullptr, nullptr);
ObjectKeeper keeper(datum);
EXPECT_EQ(proj_get_type(datum), PJ_TYPE_PARAMETRIC_DATUM);
}
{
auto obj = proj_create_from_wkt(
m_ctxt, createVerticalCRS()
Expand Down Expand Up @@ -1132,6 +1160,9 @@ TEST_F(CApi, proj_get_codes_from_database) {
PJ_TYPE_VERTICAL_REFERENCE_FRAME,
PJ_TYPE_DYNAMIC_VERTICAL_REFERENCE_FRAME,
PJ_TYPE_DATUM_ENSEMBLE,
PJ_TYPE_TEMPORAL_DATUM,
PJ_TYPE_ENGINEERING_DATUM,
PJ_TYPE_PARAMETRIC_DATUM,

PJ_TYPE_CRS,
PJ_TYPE_GEODETIC_CRS,
Expand All @@ -1156,7 +1187,8 @@ TEST_F(CApi, proj_get_codes_from_database) {
auto list = proj_get_codes_from_database(m_ctxt, "EPSG", type, true);
ListFreer feer(list);
if (type == PJ_TYPE_TEMPORAL_CRS || type == PJ_TYPE_BOUND_CRS ||
type == PJ_TYPE_UNKNOWN) {
type == PJ_TYPE_UNKNOWN || type == PJ_TYPE_TEMPORAL_DATUM ||
type == PJ_TYPE_ENGINEERING_DATUM || type == PJ_TYPE_PARAMETRIC_DATUM) {
EXPECT_EQ(list, nullptr) << type;
} else {
ASSERT_NE(list, nullptr) << type;
Expand Down