X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/10a64d33f744b0b04592fce080053a8ae3ee3a49..3ceb0792a9dca925baca43dab19d87f7bf27ae9e:/src/osm.c

diff --git a/src/osm.c b/src/osm.c
index b933c543..d5a7c6d2 100644
--- 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
@@ -30,24 +31,13 @@
 #include "vikslippymapsource.h"
 #include "vikwmscmapsource.h"
 #include "vikwebtoolcenter.h"
+#include "vikwebtoolbounds.h"
 #include "vikexttools.h"
 #include "vikgotoxmltool.h"
 #include "vikgoto.h"
 
 /* initialisation */
 void osm_init () {
-  VikMapSource *osmarender_type = 
-    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
-                                "id", 12,
-                                "label", "OpenStreetMap (Osmarender)",
-                                "hostname", "tah.openstreetmap.org",
-                                "url", "/Tiles/tile/%d/%d/%d.png",
-                                "check-file-server-time", TRUE,
-                                "use-etag", FALSE,
-                                "copyright", "© OpenStreetMap contributors",
-                                "license", "CC-BY-SA",
-                                "license-url", "http://www.openstreetmap.org/copyright",
-                                NULL));
   VikMapSource *mapnik_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", 13,
@@ -60,27 +50,27 @@ void osm_init () {
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
-  VikMapSource *maplint_type =
+  VikMapSource *cycle_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
-                                "id", 14,
-                                "label", "OpenStreetMap (Maplint)",
-                                "hostname", "tah.openstreetmap.org",
-                                "url", "/Tiles/maplint.php/%d/%d/%d.png",
+                                "id", 17,
+                                "label", "OpenStreetMap (Cycle)",
+                                "hostname", "b.tile.opencyclemap.org",
+                                "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 *cycle_type =
+  VikMapSource *transport_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
-                                "id", 17,
-                                "label", "OpenStreetMap (Cycle)",
-                                "hostname", "b.tile.opencyclemap.org",
-                                "url", "/cycle/%d/%d/%d.png",
+                                "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", "© OpenStreetMap contributors",
+                                "copyright", "Tiles courtesy of Andy Allan © OpenStreetMap contributors",
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
@@ -96,11 +86,35 @@ void osm_init () {
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
 
-  maps_layer_register_map_source (osmarender_type);
+  VikMapSource *mapquest_type =
+    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
+                                "id", 19,
+                                "label", "OpenStreetMap (MapQuest)",
+                                "hostname", "otile1.mqcdn.com",
+                                "url", "/tiles/1.0.0/osm/%d/%d/%d.png",
+                                "check-file-server-time", TRUE,
+                                "use-etag", FALSE,
+                                "copyright", "Tiles Courtesy of MapQuest © OpenStreetMap contributors",
+                                "license", "MapQuest Specific",
+                                "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 (maplint_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;
@@ -116,6 +130,13 @@ void osm_init () {
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) );
   g_object_unref ( webtool );
 
+  VikWebtoolBounds *webtoolbounds = NULL;
+  // Example: http://127.0.0.1:8111/load_and_zoom?left=8.19&right=8.20&top=48.605&bottom=48.590&select=node413602999
+  // JOSM or merkaartor must already be running with remote interface enabled
+  webtoolbounds = vik_webtool_bounds_new_with_members ( _("Local port 8111 (eg JOSM)"), "http://localhost:8111/load_and_zoom?left=%s&right=%s&bottom=%s&top=%s" );
+  vik_ext_tools_register ( VIK_EXT_TOOL ( webtoolbounds ) );
+  g_object_unref ( webtoolbounds );
+
   // 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",