Tidy up: simpler and better use of trackpoint free methods in TRW Layer.

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

diff --git a/src/terraserver.c b/src/terraserver.c
index 9bbc6abfcdcf8aa9d850dfb78cfe6b12eb3e1b05..9e1636c726ccff055b3368d98da0d7580de356c8 100644 (file)
--- a/src/terraserver.c
+++ b/src/terraserver.c
@@ -18,17 +18,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "terraserver.h"
-#include "terraserver-map-type.h"
+#include "terraservermapsource.h"
 #include "vikmapslayer.h"
 
 void terraserver_init () {
-  VikMapType *map_type_1 = VIK_MAP_TYPE(terraserver_map_type_new_with_id( 2, 2 ));
-  VikMapType *map_type_2 = VIK_MAP_TYPE(terraserver_map_type_new_with_id( 1, 1 ));
-  VikMapType *map_type_3 = VIK_MAP_TYPE(terraserver_map_type_new_with_id( 4, 4 ));
+  VikMapSource *map_type_1 = VIK_MAP_SOURCE(terraserver_map_source_new_with_id( 2, "Terraserver Topos", 2 ));
+  VikMapSource *map_type_2 = VIK_MAP_SOURCE(terraserver_map_source_new_with_id( 1, "Terraserver Aerials", 1 ));
+  VikMapSource *map_type_3 = VIK_MAP_SOURCE(terraserver_map_source_new_with_id( 4, "Terraserver Urban Areas", 4 ));
 
-  maps_layer_register_map_type("Terraserver Topos", map_type_1);
-  maps_layer_register_map_type("Terraserver Aerials", map_type_2);
-  maps_layer_register_map_type("Terraserver Urban Areas", map_type_3);
+  maps_layer_register_map_source (map_type_1);
+  maps_layer_register_map_source (map_type_2);
+  maps_layer_register_map_source (map_type_3);
 }