Merge branch 'Geotagging'

Conflicts:
	src/file.c

Resolve KML units setting with babel function parameter ordering from commits:
60dbd0ad7333bcc0502106e003ce321dfbf75ea2 + 9181183a2880930d694fddef2582c75ffffa3d53

diff --cc src/file.c
index b7a98b2bbc4187a314fd0dd1be9f8cd24c5dc076,da26c5a2c3b0c0e1ee61d7987d0a317e96f7b2a9..3fb200b36e7d6bb960b9a29db88af079e8bd8943
--- 1/src/file.c
--- 2/src/file.c
+++ b/src/file.c
@@@ -711,19 -711,8 +711,19 @@@ gboolean a_file_export ( VikTrwLayer *v
          case FILE_TYPE_KML:
          fclose ( f );
          f = NULL;
 -          return a_babel_convert_to ( vtl, "-o kml", filename, NULL, NULL );
 -          break;
 +        switch ( a_vik_get_kml_export_units () ) {
 +          case VIK_KML_EXPORT_UNITS_STATUTE:
-             return a_babel_convert_to ( vtl, "-o kml", NULL, filename, NULL );
++            return a_babel_convert_to ( vtl, "-o kml", filename, NULL, NULL );
 +            break;
 +          case VIK_KML_EXPORT_UNITS_NAUTICAL:
-             return a_babel_convert_to ( vtl, "-o kml,units=n", NULL, filename, NULL );
++            return a_babel_convert_to ( vtl, "-o kml,units=n", filename, NULL, NULL );
 +            break;
 +          default:
 +            // VIK_KML_EXPORT_UNITS_METRIC:
-             return a_babel_convert_to ( vtl, "-o kml,units=m", NULL, filename, NULL );
++            return a_babel_convert_to ( vtl, "-o kml,units=m", filename, NULL, NULL );
 +            break;
 +        }
 +        break;
          default:
            g_critical("Houston, we've had a problem. file_type=%d", file_type);
        }

diff --cc src/viktrwlayer.c
Simple merge