X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/218cdecd1e29383f5242fa050d2a6a3be1f20a90..fffcc269ddb7ea0b688ffc2744f7b710453bcb04:/src/osm.c diff --git a/src/osm.c b/src/osm.c index 6811b2d5..cff5c39a 100644 --- a/src/osm.c +++ b/src/osm.c @@ -2,6 +2,8 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2007, Guilhem Bonnefille + * Copyright (c) 2012, Rob Norris * * 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 @@ -27,36 +29,26 @@ #include "osm.h" #include "vikmapslayer.h" #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, - NULL)); VikMapSource *mapnik_type = VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, "id", 13, "label", "OpenStreetMap (Mapnik)", "hostname", "tile.openstreetmap.org", "url", "/%d/%d/%d.png", - "check-file-server-time", TRUE, - NULL)); - VikMapSource *maplint_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", - "check-file-server-time", TRUE, + "check-file-server-time", FALSE, + "use-etag", TRUE, + "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, @@ -65,12 +57,64 @@ void osm_init () { "hostname", "b.tile.opencyclemap.org", "url", "/cycle/%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)); + 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)); + 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, + "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 (osmarender_type); + // 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; @@ -86,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", @@ -106,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 ); }