X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/37dd047d3bdd3ff58320c691545d5e6cf160738c..3a574b5bdd2274d0e908dfef14934c24dda123b3:/src/osm.c diff --git a/src/osm.c b/src/osm.c index 295d1ed2..858dc668 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-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 @@ -25,56 +27,147 @@ #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, - NULL)); VikMapSource *mapnik_type = VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, - "id", 13, - "label", "OpenStreetMap (Mapnik)", + "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 *cycle_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", MAP_ID_OSM_CYCLE, + "label", _("OpenStreetMap (Cycle)"), + "name", "OSM-Cycle", + "url", "https://tile.thunderforest.com/cycle/%d/%d/%d.png?apikey="VIK_CONFIG_THUNDERFOREST_KEY, "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 *maplint_type = + VikMapSource *transport_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_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 *cycle_type = + VikMapSource *hot_type = VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, - "id", 17, - "label", "OpenStreetMap (Cycle)", - "hostname", "thunderflames.org/tiles/cycle/", - "url", "%d/%d/%d.png", + "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)); - 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", 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)); + + // Note using a registered token for the Mapbox Tileservice + // Thus not only will the (free) service allocation limit be reached by normal users + // but by anymore who cares to read these sources and use the default themselves. + VikMapSource *mapbox_type = + VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE, + "id", MAP_ID_MAPBOX_OUTDOORS, + "name", "Mapbox-Outdoors", + "label", _("Mapbox Outdoors"), + "url", "https://api.tiles.mapbox.com/styles/v1/mapbox/outdoors-v9/tiles/256/%d/%d/%d?access_token="VIK_CONFIG_MAPBOX_TOKEN, + "check-file-server-time", TRUE, + "use-etag", FALSE, + "zoom-min", 0, + "zoom-max", 19, + "copyright", "© Mapbox © OpenStreetMap", + "license", _("Mapbox Specific"), + "license-url", "https://www.mapbox.com/tos", + NULL)); + + // NB The first registered map source is the default + // (unless the user has specified Map Layer defaults) + maps_layer_register_map_source (mapbox_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://www.openstreetmap.org/?lat=%s&lon=%s&zoom=%d" ); vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); g_object_unref ( webtool ); @@ -82,10 +175,35 @@ void osm_init () { vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); g_object_unref ( webtool ); + // Note the use of positional parameters + webtool = vik_webtool_center_new_with_members ( _("OSM (query)"), "http://www.openstreetmap.org/query?lat=%1$s&lon=%2$s#map=%3$d/%1$s/%2$s" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); + 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 ); + 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", @@ -106,5 +224,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://tools.wmflabs.org/geohack/geohack.php?params=%s;%s" ); + vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) ); + g_object_unref ( webtool ); }