Merge pull request #2065 from rouault/add_proj_get_units_from_database

Add proj_get_units_from_database() (fixes #2004)

1 files changed, 12 insertions, 5 deletions

diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
index 852cea04..0bf98b3a 100644
--- a/src/apps/proj.cpp
+++ b/src/apps/proj.cpp
@@ -380,11 +380,18 @@ int main(int argc, char **argv) {
                         (void)printf("%9s %-16s %-16s %s\n",
                                      le->id, le->major, le->ell, le->name);
                 } else if (arg[1] == 'u') { /* list units */
-                    const struct PJ_UNITS *lu;
-
-                    for (lu = proj_list_units(); lu->id ; ++lu)
-                        (void)printf("%12s %-20s %s\n",
-                                     lu->id, lu->to_meter, lu->name);
+                    auto units = proj_get_units_from_database(nullptr, nullptr, "linear", false, nullptr);
+                    for( int i = 0; units && units[i]; i++ )
+                    {
+                        if( units[i]->proj_short_name )
+                        {
+                            (void)printf("%12s %-20.15g %s\n",
+                                            units[i]->proj_short_name,
+                                            units[i]->conv_factor,
+                                            units[i]->name);
+                        }
+                    }
+                    proj_unit_list_destroy(units);
                 } else
                     emess(1,"invalid list option: l%c",arg[1]);
                 exit(0);