diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-04-13 10:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 10:32:05 +0200 |
| commit | 031b6ab95e4bedbf2f8f5d55407562b2b69ce98f (patch) | |
| tree | be30b23ad491e2bd2970ee9a281c0867624b5b3b /src/conversions | |
| parent | b0215f78903a0303c8c214119dc1b1508ffef846 (diff) | |
| parent | 925ae56c40b0cfa7d861f55e4332cb5603168a2c (diff) | |
| download | PROJ-031b6ab95e4bedbf2f8f5d55407562b2b69ce98f.tar.gz PROJ-031b6ab95e4bedbf2f8f5d55407562b2b69ce98f.zip | |
Merge pull request #2144 from kbevers/proj_degree_inoutput
Add proj_degree_input() and proj_degree_output()
Diffstat (limited to 'src/conversions')
| -rw-r--r-- | src/conversions/unitconvert.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 609b30e0..172e2c48 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -476,8 +476,12 @@ PJ *CONVERSION(unitconvert,0) { return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } Q->xy_factor = f; - if (normalized_name != nullptr && strcmp(normalized_name, "Radian") == 0) - P->left = PJ_IO_UNITS_RADIANS; + if (normalized_name != nullptr) { + if (strcmp(normalized_name, "Radian") == 0) + P->left = PJ_IO_UNITS_RADIANS; + if (strcmp(normalized_name, "Degree") == 0) + P->left = PJ_IO_UNITS_DEGREES; + } } if ((name = pj_param (P->ctx, P->params, "sxy_out").s) != nullptr) { @@ -491,8 +495,12 @@ PJ *CONVERSION(unitconvert,0) { return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } Q->xy_factor /= f; - if (normalized_name != nullptr && strcmp(normalized_name, "Radian") == 0) - P->right= PJ_IO_UNITS_RADIANS; + if (normalized_name != nullptr) { + if (strcmp(normalized_name, "Radian") == 0) + P->right= PJ_IO_UNITS_RADIANS; + if (strcmp(normalized_name, "Degree") == 0) + P->right= PJ_IO_UNITS_DEGREES; + } } if( xy_in_is_linear >= 0 && xy_out_is_linear >= 0 && |