Remove dependencies to gob2

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

diff --git a/src/osm.c b/src/osm.c
index 5fc9043d60d6e5d7b2add41c61e1e43a267518cd..f8586f3f8460ea33761503edc3df50d876d6282d 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -21,18 +21,18 @@
 
 #include "osm.h"
 #include "vikmapslayer.h"
-#include "slippy-map-type.h"
+#include "vikslippymapsource.h"
 
 /* initialisation */
 void osm_init () {
-  VikMapType *osmarender_type = VIK_MAP_TYPE(slippy_map_type_new_with_id(12, "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png"));
-  VikMapType *mapnik_type = VIK_MAP_TYPE(slippy_map_type_new_with_id( 13, "tile.openstreetmap.org", "/%d/%d/%d.png"));
-  VikMapType *maplint_type = VIK_MAP_TYPE(slippy_map_type_new_with_id( 14, "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png"));
-  VikMapType *cycle_type = VIK_MAP_TYPE(slippy_map_type_new_with_id( 17, "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" ));
+  VikMapSource *osmarender_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id(12, "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png"));
+  VikMapSource *mapnik_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 13, "tile.openstreetmap.org", "/%d/%d/%d.png"));
+  VikMapSource *maplint_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 14, "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png"));
+  VikMapSource *cycle_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 17, "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" ));
 
-  maps_layer_register_type("OpenStreetMap (Osmarender)", 12, osmarender_type);
-  maps_layer_register_type("OpenStreetMap (Mapnik)", 13, mapnik_type);
-  maps_layer_register_type("OpenStreetMap (Maplint)", 14, maplint_type);
-  maps_layer_register_type("OpenStreetMap (Cycle)", 17, cycle_type);
+  maps_layer_register_map_source ("OpenStreetMap (Osmarender)", osmarender_type);
+  maps_layer_register_map_source ("OpenStreetMap (Mapnik)", mapnik_type);
+  maps_layer_register_map_source ("OpenStreetMap (Maplint)", maplint_type);
+  maps_layer_register_map_source ("OpenStreetMap (Cycle)", cycle_type);
 }