aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-05-24 21:35:13 +0200
committerEven Rouault <even.rouault@spatialys.com>2020-05-24 21:35:13 +0200
commitbf50f76e1d1e45d65b79229c060fe66df8ef289c (patch)
tree8105eeac022527c7c35a209f78af8683833c0f58 /src
parentc2654aaf0fc5192b141a5a34f60c226ff45b375c (diff)
downloadPROJ-bf50f76e1d1e45d65b79229c060fe66df8ef289c.tar.gz
PROJ-bf50f76e1d1e45d65b79229c060fe66df8ef289c.zip
Database: import scope and remarks for conversion (fixes #2237)
Diffstat (limited to 'src')
-rw-r--r--src/iso19111/factory.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 9388b196..8fa5a24d 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -2392,7 +2392,8 @@ operation::ConversionNNPtr
AuthorityFactory::createConversion(const std::string &code) const {
static const char *sql =
- "SELECT name, area_of_use_auth_name, area_of_use_code, "
+ "SELECT name, description, scope, "
+ "area_of_use_auth_name, area_of_use_code, "
"method_auth_name, method_code, method_name, "
"param1_auth_name, param1_code, param1_name, param1_value, "
@@ -2441,6 +2442,8 @@ AuthorityFactory::createConversion(const std::string &code) const {
const auto &row = res.front();
size_t idx = 0;
const auto &name = row[idx++];
+ const auto &description = row[idx++];
+ const auto &scope = row[idx++];
const auto &area_of_use_auth_name = row[idx++];
const auto &area_of_use_code = row[idx++];
const auto &method_auth_name = row[idx++];
@@ -2475,8 +2478,9 @@ AuthorityFactory::createConversion(const std::string &code) const {
}
const bool deprecated = row[base_param_idx + N_MAX_PARAMS * 6] == "1";
- auto propConversion = d->createProperties(
- code, name, deprecated, area_of_use_auth_name, area_of_use_code);
+ auto propConversion =
+ d->createProperties(code, name, deprecated, description, scope,
+ area_of_use_auth_name, area_of_use_code);
auto propMethod = util::PropertyMap().set(
common::IdentifiedObject::NAME_KEY, method_name);