[QA] Limit scope of includes of vikutils header.

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

diff --git a/src/osm.c b/src/osm.c
index 9f34102904d4adfdd021b0e9208d402dc6b5e33a..c7cdf128616d7225824608ce7a12e7f9224bb83b 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -58,7 +58,7 @@ void osm_init () {
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", 17,
                                 "label", "OpenStreetMap (Cycle)",
-                                "hostname", "b.tile.opencyclemap.org",
+                                "hostname", "tile.opencyclemap.org",
                                 "url", "/cycle/%d/%d/%d.png",
                                 "check-file-server-time", TRUE,
                                 "use-etag", FALSE,
@@ -70,7 +70,7 @@ void osm_init () {
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", 20,
                                 "label", "OpenStreetMap (Transport)",
-                                "hostname", "c.tile2.opencyclemap.org",
+                                "hostname", "tile2.opencyclemap.org",
                                 "url", "/transport/%d/%d/%d.png",
                                 "check-file-server-time", TRUE,
                                 "use-etag", FALSE,
@@ -78,7 +78,6 @@ void osm_init () {
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
-
   VikMapSource *mapquest_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", 19,
@@ -114,16 +113,28 @@ void osm_init () {
                                 "use-direct-file-access", TRUE,
                                 NULL));
 
+  // NB no cache needed for this type!!
+  VikMapSource *mbtiles_type =
+    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+                                "id", 23,
+                                "label", _("MBTiles File"),
+                                // For using your own generated data assumed you know the license already!
+                                "copyright", "© OpenStreetMap contributors", // probably
+                                "use-direct-file-access", TRUE,
+                                "is-mbtiles", TRUE,
+                                NULL));
+
   maps_layer_register_map_source (mapquest_type);
   maps_layer_register_map_source (mapnik_type);
   maps_layer_register_map_source (cycle_type);
   maps_layer_register_map_source (transport_type);
   maps_layer_register_map_source (hot_type);
   maps_layer_register_map_source (direct_type);
+  maps_layer_register_map_source (mbtiles_type);
 
   // Webtools
   VikWebtoolCenter *webtool = NULL;
-  webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d&layers=B000FTF" );
+  webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d" );
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) );
   g_object_unref ( webtool );
 
@@ -148,10 +159,6 @@ void osm_init () {
   vik_ext_tool_datasources_register ( VIK_EXT_TOOL ( vwtds ) );
   g_object_unref ( vwtds );
 
-  vwtds = vik_webtool_datasource_new_with_members ( _("OpenStreetBugs"), "http://openstreetbugs.schokokeks.org/api/0.1/getGPX?l=%s&r=%s&b=%s&t=%s&open=only_open_bugs", "LRBT", NULL );
-  vik_ext_tool_datasources_register ( VIK_EXT_TOOL ( vwtds ) );
-  g_object_unref ( vwtds );
-
   // Goto
   VikGotoXmlTool *nominatim = VIK_GOTO_XML_TOOL ( g_object_new ( VIK_GOTO_XML_TOOL_TYPE, "label", "OSM Nominatim",
     "url-format", "http://nominatim.openstreetmap.org/search?q=%s&format=xml",