Refactor: TrackWaypoint sublayer menu callback functions.

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

diff --git a/src/osm.c b/src/osm.c
index 019dddd8cff97cfdb77bba9ae45367254086407c..7597b5d7a1349b9b2ea9a35875566804cb7f5be2 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -78,18 +78,6 @@ void osm_init () {
                                 "license", "CC-BY-SA",
                                 "license-url", "http://www.openstreetmap.org/copyright",
                                 NULL));
                                 "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,
   VikMapSource *mapquest_type =
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
                                 "id", 19,


@@ -102,6 +90,18 @@ void osm_init () {
                                 "license", "MapQuest Specific",
                                 "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
                                 NULL));
                                 "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", 22,
+                                "label", "OpenStreetMap (Humanitarian)",
+                                "hostname", "c.tile.openstreetmap.fr",
+                                "url", "/hot/%d/%d/%d.png",
+                                "check-file-server-time", TRUE,
+                                "use-etag", FALSE,
+                                "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 =
 
   // NB no cache needed for this type!!
   VikMapSource *direct_type =


@@ -113,16 +113,28 @@ void osm_init () {
                                 "use-direct-file-access", TRUE,
                                 NULL));
 
                                 "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", 23,
+                                "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));
+

   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 (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 (hot_type);

   maps_layer_register_map_source (direct_type);
   maps_layer_register_map_source (direct_type);

+  maps_layer_register_map_source (mbtiles_type);

 
   // Webtools
   VikWebtoolCenter *webtool = NULL;
 
   // 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 );
 
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtool ) );
   g_object_unref ( webtool );
 


@@ -141,9 +153,7 @@ void osm_init () {
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtoolbounds ) );
   g_object_unref ( webtoolbounds );
 
   vik_ext_tools_register ( VIK_EXT_TOOL ( webtoolbounds ) );
   g_object_unref ( webtoolbounds );
 

-  // NB: THERE MUST BE AT LEAST ONE VikWebtoolDatasource defined otherwise the parsing of the datasource.xml will fail
-  //  since it won't know about such a GObject type existing!
-  //   (in fact this is a problem in the vikgobjectbuilder -> g_markup_parse_context_parse -> _start_element -> g_type_from_name )
+  // 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 );
   vik_ext_tool_datasources_register ( VIK_EXT_TOOL ( vwtds ) );
   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 );
   vik_ext_tool_datasources_register ( VIK_EXT_TOOL ( vwtds ) );