From: Emmanuel Rodriguez Date: Mon, 4 May 2009 12:03:45 +0000 (+0200) Subject: API update for the incoming version 0.3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c7fc36bd9760f66da64637aa2f8907e91a00a5c;p=libchamplain API update for the incoming version 0.3 Remove champlain_network_map_source_set_tile_uri champlain_network_map_source_get_tile Add champlain_network_map_source_fill_tile --- diff --git a/bindings/perl/Champlain/t/ChamplainNetworkMapSource.t b/bindings/perl/Champlain/t/ChamplainNetworkMapSource.t index 8976778..33fb4ea 100644 --- a/bindings/perl/Champlain/t/ChamplainNetworkMapSource.t +++ b/bindings/perl/Champlain/t/ChamplainNetworkMapSource.t @@ -3,7 +3,7 @@ use strict; use warnings; -use Clutter::TestHelper tests => 3; +use Clutter::TestHelper tests => 4; use Champlain ':coords'; @@ -37,12 +37,8 @@ sub test_all { "get_tile_uri()" ); - - # Change the tile URI and check that there's a change - $map_source->set_tile_uri('http://www.it-is-not-free.org/hidden/#X#-#Y#_#Z#.png'); - is( - $map_source->get_tile_uri(50, 75, 6), - 'http://www.it-is-not-free.org/hidden/50-75_6.png', - "get_tile_uri() changed" - ); + my $tile = Champlain::Tile->new(); + is($tile->get_state(), 'init'); + $map_source->fill_tile($tile); + is($tile->get_state(), 'loading'); } diff --git a/bindings/perl/Champlain/xs/ChamplainNetworkMapSource.xs b/bindings/perl/Champlain/xs/ChamplainNetworkMapSource.xs index 47233e5..07c0f33 100644 --- a/bindings/perl/Champlain/xs/ChamplainNetworkMapSource.xs +++ b/bindings/perl/Champlain/xs/ChamplainNetworkMapSource.xs @@ -13,10 +13,9 @@ const gchar* champlain_network_map_source_get_tile_uri (ChamplainNetworkMapSource *source, gint x, gint y, gint z) -#void -#champlain_network_map_source_set_tile_uri (ChamplainNetworkMapSource *source, const gchar *uri_format) +void +champlain_network_map_source_set_uri_format (ChamplainNetworkMapSource *source, const gchar *uri_format) -#void -#champlain_network_map_source_get_tile (ChamplainMapSource *source, ChamplainView *view, ChamplainZoomLevel *level, ChamplainTile *tile) - +void +champlain_network_map_source_fill_tile (ChamplainMapSource *source, ChamplainTile *tile)