- 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 *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));
+
+ 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);