X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/6368f346294a03a4f05a78061c6c6459c2e77f92..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/osm.c

diff --git a/src/osm.c b/src/osm.c
index 18a8f7a5..f8586f3f 100644
--- a/src/osm.c
+++ b/src/osm.c
@@ -19,34 +19,20 @@
  *
  */
 
-#include <gtk/gtk.h>
-#include <math.h>
-#include "viking.h"
-#include "coords.h"
-#include "vikcoord.h"
-#include "mapcoord.h"
-#include "vikmapslayer.h"
-
 #include "osm.h"
-#include "osm-map-type.h"
+#include "vikmapslayer.h"
+#include "vikslippymapsource.h"
 
 /* initialisation */
 void osm_init () {
-  VikMapType *osmarender_type = VIK_MAP_TYPE(osm_map_type_new_with_id(12, "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png"));
-  VikMapType *mapnik_type = VIK_MAP_TYPE(osm_map_type_new_with_id( 13, "tile.openstreetmap.org", "/%d/%d/%d.png"));
-  VikMapType *maplint_type = VIK_MAP_TYPE(osm_map_type_new_with_id( 14, "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png"));
-  VikMapType *cycle_type = VIK_MAP_TYPE(osm_map_type_new_with_id( 17, "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" ));
-
-  VikMapType *bluemarble_type = VIK_MAP_TYPE(osm_map_type_new_with_id( 15, "s3.amazonaws.com", "/com.modestmaps.bluemarble/%d-r%3$d-c%2$d.jpg" ));
-
-  VikMapType *openaerialmap_type = VIK_MAP_TYPE(osm_map_type_new_with_id( 20, "tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg" ));
-
-  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_type("BlueMarble", 15, bluemarble_type);
-  maps_layer_register_type("OpenAerialMap", 20, openaerialmap_type);
+  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_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);
 }