From c82f9c94454402ea5d6c3c9e54178ff7eb2474f8 Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Tue, 27 Jan 2015 20:57:50 +0000
Subject: [PATCH] [QA] Fix vik_maps_layer_get_map_type() and improve return
 type.

---
 src/vikmapslayer.c | 9 +++++++--
 src/vikmapslayer.h | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c
index 2f45d159..778c2eac 100644
--- a/src/vikmapslayer.c
+++ b/src/vikmapslayer.c
@@ -412,9 +412,14 @@ void maps_layer_register_map_source ( VikMapSource *map )
 #define MAPS_LAYER_NTH_ID(n) (params_maptypes_ids[n])
 #define MAPS_LAYER_NTH_TYPE(n) (VIK_MAP_SOURCE(g_list_nth_data(__map_types, (n))))
 
-gint vik_maps_layer_get_map_type(VikMapsLayer *vml)
+/**
+ * vik_maps_layer_get_map_type:
+ *
+ * Returns the actual map id (rather than the internal type index value)
+ */
+guint vik_maps_layer_get_map_type(VikMapsLayer *vml)
 {
-  return(vml->maptype);
+  return MAPS_LAYER_NTH_ID(vml->maptype);
 }
 
 gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml)
diff --git a/src/vikmapslayer.h b/src/vikmapslayer.h
index 15a569fa..10e70f7e 100644
--- a/src/vikmapslayer.h
+++ b/src/vikmapslayer.h
@@ -63,7 +63,7 @@ void maps_layer_set_autodownload_default ( gboolean autodownload );
 void maps_layer_set_cache_default ( VikMapsCacheLayout layout );
 void maps_layer_register_map_source ( VikMapSource *map );
 void vik_maps_layer_download_section ( VikMapsLayer *vml, VikViewport *vvp, VikCoord *ul, VikCoord *br, gdouble zoom );
-gint vik_maps_layer_get_map_type(VikMapsLayer *vml);
+guint vik_maps_layer_get_map_type(VikMapsLayer *vml);
 gchar *vik_maps_layer_get_map_label(VikMapsLayer *vml);
 gchar *maps_layer_default_dir ();
 void vik_maps_layer_download ( VikMapsLayer *vml, VikViewport *vvp, gboolean only_new );
-- 
2.39.5