sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/proj_transform.cpp: improve error handling of proj_transform()

Browse source 
- set proj log level to PJ_LOG_ERROR
 - let error message indicate whether proj_create_crs_to_crs or
   proj_normalize_for_visualization failed
 - output proj_context_errno_string when an error is thrown
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-04-10 11:55:04 +02:00
parent f3da900c35
commit 4f72043bcd
No known key found for this signature in database
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/proj_transform.cpp
View file

@ -124,17 +124,20 @@ proj_transform::proj_transform(projection const& source, projection const& dest)
{ {
#ifdef MAPNIK_USE_PROJ #ifdef MAPNIK_USE_PROJ
ctx_ = proj_context_create(); ctx_ = proj_context_create();
proj_log_level(ctx_, PJ_LOG_ERROR);
transform_ = proj_create_crs_to_crs(ctx_, source.params().c_str(), dest.params().c_str(), nullptr); transform_ = proj_create_crs_to_crs(ctx_, source.params().c_str(), dest.params().c_str(), nullptr);
if (transform_ == nullptr) if (transform_ == nullptr)
{ {
throw std::runtime_error(std::string("Cannot initialize proj_transform for given projections: '") + throw std::runtime_error(std::string("Cannot initialize proj_transform (crs_to_crs) for given projections: '") +
source.params() + "'->'" + dest.params() + "'"); source.params() + "'->'" + dest.params() +
"' because of " + std::string(proj_context_errno_string(ctx_, proj_context_errno(ctx_))));
} }
PJ* transform_gis = proj_normalize_for_visualization(ctx_, transform_); PJ* transform_gis = proj_normalize_for_visualization(ctx_, transform_);
if (transform_gis == nullptr) if (transform_gis == nullptr)
{ {
throw std::runtime_error(std::string("Cannot initialize proj_transform for given projections: '") + throw std::runtime_error(std::string("Cannot initialize proj_transform (normalize) for given projections: '") +
source.params() + "'->'" + dest.params() + "'"); source.params() + "'->'" + dest.params() +
"' because of " + std::string(proj_context_errno_string(ctx_, proj_context_errno(ctx_))));
} }
proj_destroy(transform_); proj_destroy(transform_);
transform_ = transform_gis; transform_ = transform_gis;