X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/09d47ac404e82ab5e7005971c1ccc83f19a21871..93eac03d581e657a4668c02222a1f9704565f0c1:/src/osm.c diff --git a/src/osm.c b/src/osm.c index 1c2a0bcc..59ac6c32 100644 --- 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 - * Copyright (C) 2007, Guilhem Bonnefille + * Copyright (C) 2007,2013, Guilhem Bonnefille + * Copyright (c) 2012-2014, 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 @@ -26,60 +27,143 @@ #include #include "osm.h" +#include "map_ids.h" #include "vikmapslayer.h" #include "vikslippymapsource.h" +#include "vikwmscmapsource.h" #include "vikwebtoolcenter.h" +#include "vikwebtoolbounds.h" +#include "vikwebtoolformat.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 () { - 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, - NULL)); VikMapSource *mapnik_type = VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, - "id", 13, + "id", MAP_ID_OSM_MAPNIK, "label", "OpenStreetMap (Mapnik)", + "name", "OSM-Mapnik", "hostname", "tile.openstreetmap.org", "url", "/%d/%d/%d.png", "check-file-server-time", FALSE, "use-etag", TRUE, + "zoom-min", 0, + "zoom-max", 19, + "copyright", "© OpenStreetMap contributors", + "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", MAP_ID_OSM_CYCLE, + "label", "OpenStreetMap (Cycle)", + "name", "OSM-Cycle", + "hostname", "tile.opencyclemap.org", + "url", "/cycle/%d/%d/%d.png", "check-file-server-time", TRUE, "use-etag", FALSE, + "zoom-min", 0, + "zoom-max", 18, + "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", MAP_ID_OSM_TRANSPORT, + "label", "OpenStreetMap (Transport)", + "name", "OSM-Transport", + "hostname", "tile2.opencyclemap.org", + "url", "/transport/%d/%d/%d.png", + "check-file-server-time", TRUE, + "use-etag", FALSE, + "zoom-min", 0, + "zoom-max", 18, + "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", MAP_ID_MAPQUEST_OSM, + "name", "OSM-MapQuest", + "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, + "zoom-min", 0, + "zoom-max", 19, + "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", MAP_ID_OSM_HUMANITARIAN, + "name", "OSM-Humanitarian", + "label", "OpenStreetMap (Humanitarian)", + "hostname", "c.tile.openstreetmap.fr", + "url", "/hot/%d/%d/%d.png", + "check-file-server-time", TRUE, + "use-etag", FALSE, + "zoom-min", 0, + "zoom-max", 20, // Super detail!! + "copyright", "© OpenStreetMap contributors. Tiles courtesy of Humanitarian OpenStreetMap Team", + "license", "CC-BY-SA", + "license-url", "http://www.openstreetmap.org/copyright", + NULL)); + + // NB no cache needed for this type!! + VikMapSource *direct_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", MAP_ID_OSM_ON_DISK, + "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)); + + // NB no cache needed for this type!! + VikMapSource *mbtiles_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", MAP_ID_MBTILES, + "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)); + + // NB no cache needed for this type!! + VikMapSource *metatiles_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", MAP_ID_OSM_METATILES, + "label", _("OSM Metatiles"), + // For using your own generated data assumed you know the license already! + "copyright", "© OpenStreetMap contributors", // probably + "use-direct-file-access", TRUE, + "is-osm-meta-tiles", TRUE, NULL)); - maps_layer_register_map_source (osmarender_type); + 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 (hot_type); + maps_layer_register_map_source (direct_type); + maps_layer_register_map_source (mbtiles_type); + maps_layer_register_map_source (metatiles_type); // Webtools VikWebtoolCenter *webtool = NULL; - webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d&layers=B000FTF" ); + 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 ); @@ -91,6 +175,26 @@ 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 ); + + VikWebtoolFormat *vwtf = NULL; + vwtf = vik_webtool_format_new_with_members ( _("Geofabrik Map Compare"), + "http://tools.geofabrik.de/mc/#%s/%s/%s", + "ZAO" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( vwtf ) ); + g_object_unref ( vwtf ); + + // 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, NULL, 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", @@ -111,5 +215,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 ); }