diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-01-18 07:10:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-18 07:10:42 +0100 |
| commit | 8584dcd50777355b460b38418cae0db05dcf91bc (patch) | |
| tree | b7335182c91737ceda8518a638ac5a79bd2bc5b2 /src/iso19111/factory.cpp | |
| parent | 3fc48e6146e020b86a0ef87749cc645f9b4fa113 (diff) | |
| parent | 25f8ad123dc5fb7de0ac2fb10b55ae9efd2723a3 (diff) | |
| download | PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.tar.gz PROJ-8584dcd50777355b460b38418cae0db05dcf91bc.zip | |
Merge pull request #1223 from rouault/unify_proj_create
Unify proj_create(), proj_create_from_user_input() and proj_create_from_proj_string() (fixes #1214)
Diffstat (limited to 'src/iso19111/factory.cpp')
| -rw-r--r-- | src/iso19111/factory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp index fb75b7b6..54fc3fd3 100644 --- a/src/iso19111/factory.cpp +++ b/src/iso19111/factory.cpp @@ -2086,7 +2086,8 @@ AuthorityFactory::createGeodeticCRS(const std::string &code, if (!text_definition.empty()) { DatabaseContext::Private::RecursionDetector detector(d->context()); - auto obj = createFromUserInput(text_definition, d->context()); + auto obj = createFromUserInput( + pj_add_type_crs_if_needed(text_definition), d->context()); auto geodCRS = util::nn_dynamic_pointer_cast<crs::GeodeticCRS>(obj); if (geodCRS) { return cloneWithProps(NN_NO_CHECK(geodCRS), props); @@ -2333,7 +2334,8 @@ AuthorityFactory::createProjectedCRS(const std::string &code) const { if (!text_definition.empty()) { DatabaseContext::Private::RecursionDetector detector(d->context()); - auto obj = createFromUserInput(text_definition, d->context()); + auto obj = createFromUserInput( + pj_add_type_crs_if_needed(text_definition), d->context()); auto projCRS = dynamic_cast<const crs::ProjectedCRS *>(obj.get()); if (projCRS) { const auto &conv = projCRS->derivingConversionRef(); |