Add some safety checks and don't add the pixbuf into the cache if it's invalid.

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

diff --git a/src/osm.c b/src/osm.c
index 32f78e1c8c914a8214cc15c266f9af00f6f43fe4..d919288df4f896ecbc1026025bbe558ba5e1cd1a 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -2,7 +2,8 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
- * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2007,2013, 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
@@ -31,9 +32,13 @@
 #include "vikwmscmapsource.h"
 #include "vikwebtoolcenter.h"
 #include "vikwebtoolbounds.h"
+#include "vikwebtool_datasource.h"
 #include "vikexttools.h"
+#include "vikexttool_datasources.h"
 #include "vikgotoxmltool.h"
 #include "vikgoto.h"
+#include "vikrouting.h"
+#include "vikroutingwebengine.h"
 
 /* initialisation */
 void osm_init () {
@@ -57,7 +62,7 @@ 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));
@@ -73,17 +78,6 @@ void osm_init () {
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
-  VikMapSource *wms_type =
-    VIK_MAP_SOURCE(g_object_new(VIK_TYPE_WMSC_MAP_SOURCE,
-                                "id", 18,
-                                "label", "OpenStreetMap (WMS)",
-                                "hostname", "full.wms.geofabrik.de",
-                                "url", "/std/demo_key?LAYERS=osm-full&FORMAT=image/png&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&STYLES=&EXCEPTIONS=&SRS=EPSG:4326&BBOX=%s,%s,%s,%s&WIDTH=256&HEIGHT=256",
-                                "check-file-server-time", FALSE,
-                                "copyright", "© OpenStreetMap contributors",
-                                "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,
@@ -98,11 +92,21 @@ 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;
@@ -125,6 +129,16 @@ void osm_init () {
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtoolbounds ) );
   g_object_unref ( webtoolbounds );
 
+  // Datasource
+  VikWebtoolDatasource *vwtds = NULL;
+  vwtds = vik_webtool_datasource_new_with_members ( _("OpenStreetMap Notes"), "http://api.openstreetmap.org/api/0.6/notes.gpx?bbox=%s,%s,%s,%s&amp;closed=0", "LBRT", NULL );
+  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",
@@ -145,5 +159,23 @@ 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 );
+  
+  /* See API references: https://github.com/DennisOSRM/Project-OSRM/wiki/Server-api */
+  VikRoutingEngine *osrm = g_object_new ( VIK_ROUTING_WEB_ENGINE_TYPE,
+    "id", "osrm",
+    "label", "OSRM",
+    "format", "gpx",
+    "url-base", "http://router.project-osrm.org/viaroute?output=gpx",
+    "url-start-ll", "&loc=%s,%s",
+    "url-stop-ll", "&loc=%s,%s",
+    "url-via-ll", "&loc=%s,%s",
+    NULL);
+  vik_routing_register ( VIK_ROUTING_ENGINE ( osrm ) );
+  g_object_unref ( osrm );
 }