[QA] Remove spurious commented out code.

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

diff --git a/src/osm.c b/src/osm.c
index edd9ec98679a136369e0d1d4b4762ca42b08b48b..cff5c39aaa2fb8fe4bc0b915b3e533caeba9c1f2 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (c) 2012, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,7 +58,19 @@ void osm_init () {
                                 "url", "/cycle/%d/%d/%d.png",
                                 "check-file-server-time", TRUE,
                                 "use-etag", FALSE,
-                                "copyright", "© OpenStreetMap contributors",
+                                "copyright", "Tiles courtesy of Andy Allan © OpenStreetMap contributors",
+                                "license", "CC-BY-SA",
+                                "license-url", "http://www.openstreetmap.org/copyright",
+                                NULL));
+  VikMapSource *transport_type =
+    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+                                "id", 20,
+                                "label", "OpenStreetMap (Transport)",
+                                "hostname", "c.tile2.opencyclemap.org",
+                                "url", "/transport/%d/%d/%d.png",
+                                "check-file-server-time", TRUE,
+                                "use-etag", FALSE,
+                                "copyright", "Tiles courtesy of Andy Allan © OpenStreetMap contributors",
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
@@ -86,10 +99,22 @@ void osm_init () {
                                 "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
                                 NULL));
 
+  // NB no cache needed for this type!!
+  VikMapSource *direct_type =
+    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+                                "id", 21,
+                                "label", _("On Disk OSM Tile Format"),
+                                // For using your own generated data assumed you know the license already!
+                                "copyright", "© OpenStreetMap contributors", // probably
+                                "use-direct-file-access", 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 (wms_type);
+  maps_layer_register_map_source (direct_type);
 
   // Webtools
   VikWebtoolCenter *webtool = NULL;
@@ -132,5 +157,10 @@ void osm_init () {
     NULL ) );
     vik_goto_register ( VIK_GOTO_TOOL ( namefinder ) );
     g_object_unref ( namefinder );
+
+  // Not really OSM but can't be bothered to create somewhere else to put it...
+  webtool = vik_webtool_center_new_with_members ( _("Wikimedia Toolserver GeoHack"), "http://toolserver.org/~geohack/geohack.php?params=%s;%s" );
+  vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) );
+  g_object_unref ( webtool );
 }