X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/8e7edb262748daafe03bf79fb5d9acbdd3f1b23c..4c21c2fab138702d6c77705a227202e994391bf8:/src/osm.c diff --git a/src/osm.c b/src/osm.c index 6294e39e..a1eead87 100644 --- a/src/osm.c +++ b/src/osm.c @@ -2,6 +2,7 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2007, Guilhem Bonnefille * * 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,20 +28,94 @@ #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(vik_slippy_map_source_new_with_id(12, "OpenStreetMap (Osmarender)", "tah.openstreetmap.org", "/Tiles/tile/%d/%d/%d.png")); - VikMapSource *mapnik_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 13, "OpenStreetMap (Mapnik)", "tile.openstreetmap.org", "/%d/%d/%d.png")); - VikMapSource *maplint_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 14, "OpenStreetMap (Maplint)", "tah.openstreetmap.org", "/Tiles/maplint.php/%d/%d/%d.png")); - VikMapSource *cycle_type = VIK_MAP_SOURCE(vik_slippy_map_source_new_with_id( 17, "OpenStreetMap (Cycle)", "thunderflames.org/tiles/cycle/", "%d/%d/%d.png" )); + 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, + "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, + "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 *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, + "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, + "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", "© 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 (mapquest_type); maps_layer_register_map_source (osmarender_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 (wms_type); // Webtools VikWebtoolCenter *webtool = NULL; @@ -55,5 +130,33 @@ void osm_init () { 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 ); + + // 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 ); + + 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 ); }