Merge commit 'viking-0.9.9' into gobjectify-map-type

[andy/viking.git] / test / degrees_converter.c

diff --git a/test/degrees_converter.c b/test/degrees_converter.c
index a45b06e6dfdc1d8e7e1e653ae66c6d9007b62c8b..113dbb9b2e650daed29785501759ee49bf8ebba4 100644 (file)
--- a/test/degrees_converter.c
+++ b/test/degrees_converter.c
@@ -3,14 +3,21 @@
 int main(int argc, char *argv[]) {
        int i;
        gdouble value;
+       gchar *latDDD, *lonDDD;
+       gchar *latDMM, *lonDMM;
        gchar *latDMS, *lonDMS;
        for (i=1 ; i < argc ; i++) {
                value = convert_dms_to_dec(argv[i]);
+               latDDD = convert_lat_dec_to_ddd(value);
+               lonDDD = convert_lon_dec_to_ddd(value);
+               latDMM = convert_lat_dec_to_dmm(value);
+               lonDMM = convert_lon_dec_to_dmm(value);
                latDMS = convert_lat_dec_to_dms(value);
                lonDMS = convert_lon_dec_to_dms(value);
-               printf("'%s' -> %f %s %s\n", argv[i], value,
-                          latDMS, lonDMS);
-               free(latDMS); 
-               free(lonDMS); 
+               printf("'%s' -> %f %s %s %s %s %s %s\n", argv[i], value,
+                          latDDD, lonDDD, latDMM, lonDMM, latDMS, lonDMS);
+               free(latDMS); free(lonDMS); 
+               free(latDMM); free(lonDMM); 
+               free(latDDD); free(lonDDD); 
        }
 }
\ No newline at end of file