X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/67209ca83325c1986fd194cd71cb4aca1e5e6a81..9cdc601fa56a10312099cfabd16b5c8d628a0e67:/src/osm.c?ds=inline diff --git a/src/osm.c b/src/osm.c index 0c5eed74..7597b5d7 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,2013, 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 @@ -18,79 +20,186 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include -#include -#include "viking.h" -#include "coords.h" -#include "vikcoord.h" -#include "mapcoord.h" -#include "http.h" -#include "vikmapslayer.h" +#include #include "osm.h" +#include "vikmapslayer.h" +#include "vikslippymapsource.h" +#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 () { - VikMapsLayer_MapType osmarender_type = { 12, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_osmarender_download }; - VikMapsLayer_MapType mapnik_type = { 13, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_mapnik_download }; - maps_layer_register_type("OpenStreetMap (Osmarender)", 12, &osmarender_type); - maps_layer_register_type("OpenStreetMap (Mapnik)", 13, &mapnik_type); -} + 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", 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, + "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", "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 *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)); + VikMapSource *hot_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", 22, + "label", "OpenStreetMap (Humanitarian)", + "hostname", "c.tile.openstreetmap.fr", + "url", "/hot/%d/%d/%d.png", + "check-file-server-time", TRUE, + "use-etag", FALSE, + "copyright", "© OpenStreetMap contributors. Tiles courtesy of Humanitarian OpenStreetMap Team", + "license", "CC-BY-SA", + "license-url", "http://www.openstreetmap.org/copyright", + NULL)); -/* 1 << (x) is like a 2**(x) */ -#define GZ(x) (1<<(x)) + // 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)); -static const gdouble scale_mpps[] = { GZ(0), GZ(1), GZ(2), GZ(3), GZ(4), GZ(5), GZ(6), GZ(7), GZ(8), GZ(9), - GZ(10), GZ(11), GZ(12), GZ(13), GZ(14), GZ(15), GZ(16), GZ(17) }; + // NB no cache needed for this type!! + VikMapSource *mbtiles_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", 23, + "label", _("MBTiles File"), + // For using your own generated data assumed you know the license already! + "copyright", "© OpenStreetMap contributors", // probably + "use-direct-file-access", TRUE, + "is-mbtiles", TRUE, + NULL)); -static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0])); + 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 (hot_type); + maps_layer_register_map_source (direct_type); + maps_layer_register_map_source (mbtiles_type); -#define ERROR_MARGIN 0.01 -guint8 osm_zoom ( gdouble mpp ) { - gint i; - for ( i = 0; i < num_scales; i++ ) { - if ( ABS(scale_mpps[i] - mpp) < ERROR_MARGIN ) - return i; - } - return 255; -} + // Webtools + VikWebtoolCenter *webtool = NULL; + webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); -gboolean osm_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest ) -{ - g_assert ( src->mode == VIK_COORD_LATLON ); + webtool = vik_webtool_center_new_with_members ( _("OSM (edit)"), "http://www.openstreetmap.org/edit?lat=%s&lon=%s&zoom=%d" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); - if ( xzoom != yzoom ) - return FALSE; + webtool = vik_webtool_center_new_with_members ( _("OSM (render)"), "http://www.informationfreeway.org/?lat=%s&lon=%s&zoom=%d&layers=B0000F000F" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); - dest->scale = osm_zoom ( xzoom ); - if ( dest->scale == 255 ) - return FALSE; + 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 ); - dest->x = (src->east_west + 180) / 360 * GZ(17) / xzoom; - dest->y = (180 - MERCLAT(src->north_south)) / 360 * GZ(17) / xzoom; - dest->z = 0; - return TRUE; -} + // 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&closed=0", "LBRT", NULL ); + vik_ext_tool_datasources_register ( VIK_EXT_TOOL ( vwtds ) ); + g_object_unref ( vwtds ); -void osm_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest ) -{ - gdouble socalled_mpp = GZ(src->scale); - dest->mode = VIK_COORD_LATLON; - dest->east_west = ((src->x+0.5) / GZ(17) * socalled_mpp * 360) - 180; - dest->north_south = DEMERCLAT(180 - ((src->y+0.5) / GZ(17) * socalled_mpp * 360)); -} + 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 ); -void osm_mapnik_download ( MapCoord *src, const gchar *dest_fn ) -{ - gchar *uri = g_strdup_printf ( "/osamrender/%d/%d/%d.png", 17-src->scale, src->x, src->y ); - a_http_download_get_url ( "tile.openstreetmap.org", uri, dest_fn ); - g_free ( uri ); -} + // 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", + "lat-path", "/searchresults/place", + "lat-attr", "lat", + "lon-path", "/searchresults/place", + "lon-attr", "lon", + NULL ) ); + vik_goto_register ( VIK_GOTO_TOOL ( nominatim ) ); + g_object_unref ( nominatim ); -void osm_osmarender_download ( MapCoord *src, const gchar *dest_fn ) -{ - gchar *uri = g_strdup_printf ( "/~ojw/Tiles/tile.php/%d/%d/%d.png", 17-src->scale, src->x, src->y ); - a_http_download_get_url ( "dev.openstreetmap.org", uri, dest_fn ); - g_free ( uri ); + VikGotoXmlTool *namefinder = VIK_GOTO_XML_TOOL ( g_object_new ( VIK_GOTO_XML_TOOL_TYPE, "label", "OSM Name finder", + "url-format", "http://gazetteer.openstreetmap.org/namefinder/search.xml?find=%s&max=1", + "lat-path", "/searchresults/named", + "lat-attr", "lat", + "lon-path", "/searchresults/named", + "lon-attr", "lon", + 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 ); } +