No longer provide support for google satellite maps.

[andy/viking.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index 2b56aeffe500d5c51b979a6fc27a1b99db80ece5..0320ad7deb6712618a55abf50ef0167134934e03 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -28,15 +28,17 @@
 #include "google.h"
 #include "googlemaps.h"
 #include "terraserver.h"
-#include "khmaps.h"
 #include "expedia.h"
+#include "osm.h"
+#include "osm-traces.h"
 
 void modules_init()
 {
+#ifdef VIK_CONFIG_OLD_GOOGLE 
+  googlemaps_init();
+#endif
 #ifdef VIK_CONFIG_GOOGLE 
   google_init();
-  googlemaps_init();
-  khmaps_init();
 #endif
 #ifdef VIK_CONFIG_EXPEDIA
   expedia_init();
@@ -44,5 +46,9 @@ void modules_init()
 #ifdef VIK_CONFIG_TERRASERVER
   terraserver_init();
 #endif
+#ifdef VIK_CONFIG_OPENSTREETMAP
+  osm_init();
+  osm_traces_init();
+#endif
 }