Add function to return an average moving speed for a track.

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

diff --git a/src/osm.c b/src/osm.c
index 01d451a5df168eea2a04265c8ffbe94cfccdf50f..a1eead87d29ecd0c57925eb1ba0c79bf5aed1263 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -30,6 +30,7 @@
 #include "vikslippymapsource.h"
 #include "vikwmscmapsource.h"
 #include "vikwebtoolcenter.h"
+#include "vikwebtoolbounds.h"
 #include "vikexttools.h"
 #include "vikgotoxmltool.h"
 #include "vikgoto.h"
@@ -44,6 +45,9 @@ void osm_init () {
                                 "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,
@@ -53,6 +57,9 @@ void osm_init () {
                                 "url", "/%d/%d/%d.png",
                                 "check-file-server-time", FALSE,
                                 "use-etag", TRUE,
+                                "copyright", "© OpenStreetMap contributors",
+                                "license", "CC-BY-SA",
+                                "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
   VikMapSource *maplint_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
@@ -62,6 +69,9 @@ void osm_init () {
                                 "url", "/Tiles/maplint.php/%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 *cycle_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
@@ -71,6 +81,9 @@ void osm_init () {
                                 "url", "/cycle/%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 *wms_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_WMSC_MAP_SOURCE,
@@ -79,8 +92,25 @@ void osm_init () {
                                 "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,
+                                "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));
+
+  maps_layer_register_map_source (mapquest_type);
   maps_layer_register_map_source (osmarender_type);
   maps_layer_register_map_source (mapnik_type);
   maps_layer_register_map_source (maplint_type);
@@ -101,6 +131,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",