aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/iso19111/factory.cpp61
-rw-r--r--test/unit/test_factory.cpp91
2 files changed, 141 insertions, 11 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 1ec741e1..86c7b840 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -2171,13 +2171,44 @@ std::vector<std::string> DatabaseContext::Private::getInsertStatementsFor(
{
const auto &method = conversion->method();
const auto &methodIds = method->identifiers();
+ std::string methodAuthName;
+ std::string methodCode;
if (methodIds.empty()) {
- throw FactoryException(
- "Cannot insert projection with method without identifier");
+ const int epsgCode = method->getEPSGCode();
+ if (epsgCode > 0) {
+ methodAuthName = metadata::Identifier::EPSG;
+ methodCode = toString(epsgCode);
+ } else {
+ const auto &methodName = method->nameStr();
+ size_t nProjectionMethodMappings = 0;
+ const auto projectionMethodMappings =
+ operation::getProjectionMethodMappings(
+ nProjectionMethodMappings);
+ const operation::MethodMapping *methodMapping = nullptr;
+ for (size_t i = 0; i < nProjectionMethodMappings; ++i) {
+ const auto &mapping = projectionMethodMappings[i];
+ if (metadata::Identifier::isEquivalentName(
+ mapping.wkt2_name, methodName.c_str())) {
+ methodMapping = &mapping;
+ }
+ }
+ if (methodMapping == nullptr ||
+ methodMapping->proj_name_main == nullptr) {
+ throw FactoryException("Cannot insert projection with "
+ "method without identifier");
+ }
+ methodAuthName = "PROJ";
+ methodCode = methodMapping->proj_name_main;
+ if (methodMapping->proj_name_aux) {
+ methodCode += ' ';
+ methodCode += methodMapping->proj_name_aux;
+ }
+ }
+ } else {
+ const auto &methodId = methodIds.front();
+ methodAuthName = *(methodId->codeSpace());
+ methodCode = methodId->code();
}
- const auto &methodId = methodIds.front();
- const auto &methodAuthName = *(methodId->codeSpace());
- const auto &methodCode = methodId->code();
auto sql = formatStatement("INSERT INTO conversion VALUES("
"'%q','%q','%q','','%q','%q','%q'",
convAuthName.c_str(), convCode.c_str(),
@@ -2200,14 +2231,22 @@ std::vector<std::string> DatabaseContext::Private::getInsertStatementsFor(
}
const auto &param = opParamValue->parameter();
const auto &paramIds = param->identifiers();
+ std::string paramAuthName;
+ std::string paramCode;
if (paramIds.empty()) {
- throw FactoryException(
- "Cannot insert projection with method parameter "
- "without identifier");
+ const int paramEPSGCode = param->getEPSGCode();
+ if (paramEPSGCode == 0) {
+ throw FactoryException(
+ "Cannot insert projection with method parameter "
+ "without identifier");
+ }
+ paramAuthName = metadata::Identifier::EPSG;
+ paramCode = toString(paramEPSGCode);
+ } else {
+ const auto &paramId = paramIds.front();
+ paramAuthName = *(paramId->codeSpace());
+ paramCode = paramId->code();
}
- const auto &paramId = paramIds.front();
- const auto &paramAuthName = *(paramId->codeSpace());
- const auto &paramCode = paramId->code();
const auto &value = opParamValue->parameterValue()->value();
const auto &unit = value.unit();
std::string uomAuthName;
diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
index e0616baa..d153d401 100644
--- a/test/unit/test_factory.cpp
+++ b/test/unit/test_factory.cpp
@@ -4086,6 +4086,97 @@ TEST(factory, objectInsertion) {
ensemble.get(), IComparable::Criterion::EQUIVALENT));
ctxt->stopInsertStatementsSession();
}
+
+ // non-EPSG projection method
+ {
+ auto ctxt = DatabaseContext::create();
+ ctxt->startInsertStatementsSession();
+ const auto crs = nn_dynamic_pointer_cast<CRS>(
+ PROJStringParser().createFromPROJString(
+ "+proj=sinu +lon_0=195 +x_0=0 +y_0=0 +R=3396000 +units=m "
+ "+no_defs +type=crs"));
+ ASSERT_TRUE(crs != nullptr);
+ const auto statements = ctxt->getInsertStatementsFor(
+ NN_NO_CHECK(crs), "HOBU", "XXXX", false);
+ bool found = false;
+ for (const auto &sql : statements) {
+ if (sql.find("INSERT INTO conversion") != std::string::npos) {
+ found = true;
+ const char *expected =
+ "VALUES('HOBU','CONVERSION_XXXX',"
+ "'unknown','','PROJ','sinu','Sinusoidal',";
+ EXPECT_TRUE(sql.find(expected) != std::string::npos) << sql;
+ }
+ }
+ EXPECT_TRUE(found);
+ const auto crsNew =
+ AuthorityFactory::create(ctxt, "HOBU")->createProjectedCRS("XXXX");
+ EXPECT_TRUE(crsNew->isEquivalentTo(crs.get(),
+ IComparable::Criterion::EQUIVALENT));
+ ctxt->stopInsertStatementsSession();
+ }
+
+ // Missing projection method and parameter id
+ {
+ auto ctxt = DatabaseContext::create();
+ ctxt->startInsertStatementsSession();
+ const auto wkt =
+ "PROJCRS[\"unknown\",\n"
+ " BASEGEOGCRS[\"unknown\",\n"
+ " DATUM[\"World Geodetic System 1984\",\n"
+ " ELLIPSOID[\"WGS 84\",6378137,298.257223563,\n"
+ " LENGTHUNIT[\"metre\",1]]],\n"
+ " PRIMEM[\"Greenwich\",0,\n"
+ " ANGLEUNIT[\"degree\",0.0174532925199433]]],\n"
+ " CONVERSION[\"UTM zone 31N\",\n"
+ " METHOD[\"Transverse Mercator\"],\n"
+ " PARAMETER[\"Latitude of natural origin\",0,\n"
+ " ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+ " PARAMETER[\"Longitude of natural origin\",3,\n"
+ " ANGLEUNIT[\"degree\",0.0174532925199433]],\n"
+ " PARAMETER[\"Scale factor at natural origin\",0.9996,\n"
+ " SCALEUNIT[\"unity\",1]],\n"
+ " PARAMETER[\"False easting\",500000,\n"
+ " LENGTHUNIT[\"metre\",1]],\n"
+ " PARAMETER[\"False northing\",0,\n"
+ " LENGTHUNIT[\"metre\",1]]],\n"
+ " CS[Cartesian,2],\n"
+ " AXIS[\"(E)\",east,\n"
+ " ORDER[1],\n"
+ " LENGTHUNIT[\"metre\",1]],\n"
+ " AXIS[\"(N)\",north,\n"
+ " ORDER[2],\n"
+ " LENGTHUNIT[\"metre\",1]]]";
+ const auto crs =
+ nn_dynamic_pointer_cast<CRS>(WKTParser().createFromWKT(wkt));
+ ASSERT_TRUE(crs != nullptr);
+ const auto statements = ctxt->getInsertStatementsFor(
+ NN_NO_CHECK(crs), "HOBU", "XXXX", false);
+ bool found = false;
+ const char *expected =
+ "INSERT INTO conversion VALUES('HOBU','CONVERSION_XXXX',"
+ "'UTM zone 31N','','EPSG','9807','Transverse Mercator',"
+ "'EPSG','8801','Latitude of natural origin',0,'EPSG','9102',"
+ "'EPSG','8802','Longitude of natural origin',3,'EPSG','9102',"
+ "'EPSG','8805','Scale factor at natural origin',0.9996,"
+ "'EPSG','9201',"
+ "'EPSG','8806','False easting',500000,'EPSG','9001',"
+ "'EPSG','8807','False northing',0,'EPSG','9001',"
+ "NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,"
+ "NULL,0)";
+ for (const auto &sql : statements) {
+ if (sql.find("INSERT INTO conversion") != std::string::npos) {
+ found = true;
+ EXPECT_TRUE(sql.find(expected) != std::string::npos) << sql;
+ }
+ }
+ EXPECT_TRUE(found);
+ const auto crsNew =
+ AuthorityFactory::create(ctxt, "HOBU")->createProjectedCRS("XXXX");
+ EXPECT_TRUE(crsNew->isEquivalentTo(crs.get(),
+ IComparable::Criterion::EQUIVALENT));
+ ctxt->stopInsertStatementsSession();
+ }
}
} // namespace
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 08:23:22 +0000