Remove dependencies to gob2

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

diff --git a/src/terraserver.c b/src/terraserver.c
index 78c148672fa6c6563b829628ffee08aeca2571ab..c79fb34c4e2ab62a98ad7f286bd4085f6310aa4b 100644 (file)
--- a/src/terraserver.c
+++ b/src/terraserver.c
@@ -20,15 +20,15 @@
  */
 
 #include "terraserver.h"
  */
 
 #include "terraserver.h"

-#include "terraserver-map-type.h"
+#include "terraservermapsource.h"

 #include "vikmapslayer.h"
 
 void terraserver_init () {
 #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, 2 ));
+  VikMapSource *map_type_2 = VIK_MAP_SOURCE(terraserver_map_source_new_with_id( 1, 1 ));
+  VikMapSource *map_type_3 = VIK_MAP_SOURCE(terraserver_map_source_new_with_id( 4, 4 ));

 
 

-  maps_layer_register_type("Terraserver Topos", 2, map_type_1);
-  maps_layer_register_type("Terraserver Aerials", 1, map_type_2);
-  maps_layer_register_type("Terraserver Urban Areas", 4, map_type_3);
+  maps_layer_register_map_source ("Terraserver Topos", map_type_1);
+  maps_layer_register_map_source ("Terraserver Aerials", map_type_2);
+  maps_layer_register_map_source ("Terraserver Urban Areas", map_type_3);

 }
 }