From 2c3a7c8bcc711cf34b79885edbf1e5dccacc5757 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 10 Dec 2019 14:36:07 +0100 Subject: ob_tran: restore traditional handling of +to_meter with pj_transform() and proj utility (fixes #1782) Fixes side-effect of https://github.com/OSGeo/PROJ/issues/1525 that went in 6.1.1 The correction is horribly hacky. Sorry... --- src/apps/proj.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/apps/proj.cpp') diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp index 7fe08023..09c8a81d 100644 --- a/src/apps/proj.cpp +++ b/src/apps/proj.cpp @@ -490,6 +490,14 @@ int main(int argc, char **argv) { exit(0); } + // Ugly hack. See https://github.com/OSGeo/PROJ/issues/1782 + if( Proj->right == PJ_IO_UNITS_WHATEVER && Proj->descr && + strncmp(Proj->descr, "General Oblique Transformation", + strlen("General Oblique Transformation")) == 0 ) + { + Proj->right = PJ_IO_UNITS_PROJECTED; + } + if (inverse) { if (!Proj->inv) emess(3,"inverse projection not available"); -- cgit v1.2.3 From a955947c1f3279e51d1272df0cb6aa61ce4b85ee Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 13 Jan 2020 22:04:01 +0100 Subject: Remove -ld option from proj and cs2cs It promotes use of deprecated paramters +datum and +towgs84 which we don't want to encourage. Closes #1308 --- src/apps/proj.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/apps/proj.cpp') diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp index 09c8a81d..852cea04 100644 --- a/src/apps/proj.cpp +++ b/src/apps/proj.cpp @@ -385,17 +385,6 @@ int main(int argc, char **argv) { for (lu = proj_list_units(); lu->id ; ++lu) (void)printf("%12s %-20s %s\n", lu->id, lu->to_meter, lu->name); - } else if (arg[1] == 'd') { /* list datums */ - const struct PJ_DATUMS *ld; - - printf("__datum_id__ __ellipse___ __definition/comments______________________________\n" ); - for (ld = pj_get_datums_ref(); ld->id ; ++ld) - { - printf("%12s %-12s %-30s\n", - ld->id, ld->ellipse_id, ld->defn); - if( ld->comments != nullptr && strlen(ld->comments) > 0 ) - printf( "%25s %s\n", " ", ld->comments ); - } } else emess(1,"invalid list option: l%c",arg[1]); exit(0); -- cgit v1.2.3