* viking -- GPS Data and Topo Analyzer, Explorer, and Manager
*
* Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2007, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (c) 2012, Rob Norris <rw_norris@hotmail.com>
*
* 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
#include "config.h"
#endif
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
-#include "viking.h"
-#include "coords.h"
-#include "vikcoord.h"
-#include "mapcoord.h"
+
+#include "osm.h"
#include "vikmapslayer.h"
+#include "vikslippymapsource.h"
+#include "vikwmscmapsource.h"
#include "vikwebtoolcenter.h"
+#include "vikwebtoolbounds.h"
#include "vikexttools.h"
-
-#include "osm.h"
-
-static guint8 osm_zoom ( gdouble mpp );
-
-static gboolean osm_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest );
-static void osm_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
-static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn );
-static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn );
-static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn );
-static int osm_cycle_download ( MapCoord *src, const gchar *dest_fn );
-#ifdef VIK_CONFIG_BLUEMARBLE
-static int bluemarble_download ( MapCoord *src, const gchar *dest_fn );
-#endif
-#ifdef VIK_CONFIG_OPENAERIAL
-static int openaerialmap_download ( MapCoord *src, const gchar *dest_fn );
-#endif
-
-static DownloadOptions osm_options = { TRUE, NULL, 0, a_check_map_file };
+#include "vikgotoxmltool.h"
+#include "vikgoto.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, &osm_options };
- VikMapsLayer_MapType mapnik_type = { 13, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_mapnik_download, &osm_options };
- VikMapsLayer_MapType maplint_type = { 14, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_maplint_download, &osm_options };
- VikMapsLayer_MapType cycle_type = { 17, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_cycle_download, &osm_options };
-
-#ifdef VIK_CONFIG_BLUEMARBLE
- VikMapsLayer_MapType bluemarble_type = { 15, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, bluemarble_download, &osm_options };
-#endif
-
-#ifdef VIK_CONFIG_OPENAERIAL
- VikMapsLayer_MapType openaerialmap_type = { 20, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, openaerialmap_download, &osm_options };
-#endif
-
- maps_layer_register_type("OpenStreetMap (Osmarender)", 12, &osmarender_type);
- maps_layer_register_type("OpenStreetMap (Mapnik)", 13, &mapnik_type);
- maps_layer_register_type("OpenStreetMap (Maplint)", 14, &maplint_type);
- maps_layer_register_type("OpenStreetMap (Cycle)", 17, &cycle_type);
-
-#ifdef VIK_CONFIG_BLUEMARBLE
- maps_layer_register_type("BlueMarble", 15, &bluemarble_type);
-#endif
-#ifdef VIK_CONFIG_OPENAERIAL
- maps_layer_register_type("OpenAerialMap", 20, &openaerialmap_type);
-#endif
+ 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 *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));
+
+ // 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 (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;
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 );
-}
-
-/* 1 << (x) is like a 2**(x) */
-#define GZ(x) (1<<(x))
-
-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) };
-
-static const gint num_scales = (sizeof(scale_mpps) / sizeof(scale_mpps[0]));
-
-#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;
-}
-static gboolean osm_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
-{
- g_assert ( src->mode == VIK_COORD_LATLON );
-
- if ( xzoom != yzoom )
- return FALSE;
-
- dest->scale = osm_zoom ( xzoom );
- if ( dest->scale == 255 )
- return FALSE;
-
- 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;
-}
-
-static 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));
-}
-
-/* Maplint tiles
- * Ex: http://dev.openstreetmap.org/~ojw/Tiles/maplint.php/10/517/375.png
- */
-static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/Tiles/maplint.php/%d/%d/%d.png", 17-src->scale, src->x, src->y );
- res = a_http_download_get_url ( "tah.openstreetmap.org", uri, dest_fn, &osm_options );
- g_free ( uri );
- return res;
-}
-
-static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/%d/%d/%d.png", 17-src->scale, src->x, src->y );
- res = a_http_download_get_url ( "tile.openstreetmap.org", uri, dest_fn, &osm_options );
- g_free ( uri );
- return res;
-}
-
-static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/Tiles/tile/%d/%d/%d.png", 17-src->scale, src->x, src->y );
- res = a_http_download_get_url ( "tah.openstreetmap.org", uri, dest_fn, &osm_options );
- g_free ( uri );
- return res;
-}
-
-#ifdef VIK_CONFIG_BLUEMARBLE
-static int bluemarble_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/com.modestmaps.bluemarble/%d-r%d-c%d.jpg", 17-src->scale, src->y, src->x );
- res = a_http_download_get_url ( "s3.amazonaws.com", uri, dest_fn, &osm_options );
-
- g_free ( uri );
- return res;
-
-}
-#endif
-
-#ifdef VIK_CONFIG_OPENAERIAL
-static int openaerialmap_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg", 17-src->scale, src->x, src->y );
- res = a_http_download_get_url ( "tile.openaerialmap.org", uri, dest_fn, &osm_options );
-
- g_free ( uri );
- return res;
+ 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 );
+
+ // 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 );
}
-#endif
-static int osm_cycle_download ( MapCoord *src, const gchar *dest_fn )
-{
- int res = -1;
- gchar *uri = g_strdup_printf ( "/tiles/cycle/%d/%d/%d.png", 17-src->scale, src->x, src->y );
- res = a_http_download_get_url ( "andy.sandbox.cloudmade.com", uri, dest_fn, &osm_options );
- g_free ( uri );
- return res;
-}
projects / andy / viking.git / blobdiff