Tidy up type usage

[andy/viking.git] / src / osm.c

diff --git a/src/osm.c b/src/osm.c
index 59ac6c3297cc872dd5d5288fd904b9a558260dd5..48c5ef2344e1b6c65ea34944ecef21ebf89fafa5 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -47,7 +47,7 @@ void osm_init () {
   VikMapSource *mapnik_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", MAP_ID_OSM_MAPNIK,
-                                "label", "OpenStreetMap (Mapnik)",
+                                "label", _("OpenStreetMap (Mapnik)"),
                                 "name", "OSM-Mapnik",
                                 "hostname", "tile.openstreetmap.org",
                                 "url", "/%d/%d/%d.png",
@@ -62,7 +62,7 @@ void osm_init () {
   VikMapSource *cycle_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", MAP_ID_OSM_CYCLE,
-                                "label", "OpenStreetMap (Cycle)",
+                                "label", _("OpenStreetMap (Cycle)"),
                                 "name", "OSM-Cycle",
                                 "hostname", "tile.opencyclemap.org",
                                 "url", "/cycle/%d/%d/%d.png",
@@ -77,7 +77,7 @@ void osm_init () {
   VikMapSource *transport_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", MAP_ID_OSM_TRANSPORT,
-                                "label", "OpenStreetMap (Transport)",
+                                "label", _("OpenStreetMap (Transport)"),
                                 "name", "OSM-Transport",
                                 "hostname", "tile2.opencyclemap.org",
                                 "url", "/transport/%d/%d/%d.png",
@@ -89,26 +89,11 @@ void osm_init () {
                                 "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)",
+                                "label", _("OpenStreetMap (Humanitarian)"),
                                 "hostname", "c.tile.openstreetmap.fr",
                                 "url", "/hot/%d/%d/%d.png",
                                 "check-file-server-time", TRUE,
@@ -152,7 +137,27 @@ void osm_init () {
                                 "is-osm-meta-tiles", TRUE,
                                 NULL));
 
-  maps_layer_register_map_source (mapquest_type);
+  // 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 (cycle_type);
   maps_layer_register_map_source (transport_type);
@@ -163,7 +168,7 @@ void osm_init () {
 
   // Webtools
   VikWebtoolCenter *webtool = NULL;
-  webtool = vik_webtool_center_new_with_members ( _("OSM (view)"), "http://openstreetmap.org/?lat=%s&lon=%s&zoom=%d" );
+  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 );
 
@@ -171,6 +176,11 @@ 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 );
@@ -217,21 +227,8 @@ void osm_init () {
     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" );
+  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 );
-  
-  /* 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 );
 }