Replace OpenAerialMap by OpenStreetMap Mapnik

diff --git a/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t b/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
index 2e917336a5bebe03833ef841282dede5864a9d69..593cc86611626f2677b1848807fa28d4cc978dd9 100644 (file)
--- a/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
+++ b/bindings/perl/Champlain/t/ChamplainMapSourceDesc.t
@@ -25,7 +25,7 @@ sub test_get_set {
        ok(@maps >= 5, "Maps factory has the default maps");
        
        # Find the OAM map and check that the it's properly described
-       my @found = grep { $_->id eq Champlain::MapSourceFactory->OAM } @maps;
+       my @found = grep { $_->id eq Champlain::MapSourceFactory->OSM_MAPNIK } @maps;
        is(scalar(@found), 1, "Found a single map matching OAM");
        if (! @found) {
                fail("Can't test a Champlain::MapSourceDesc without a map description") for 1 .. 22;
@@ -33,45 +33,45 @@ sub test_get_set {
        }
 
        # Getters
-       my ($oam) = @found;
-       isa_ok($oam, 'Champlain::MapSourceDesc');
-       is($oam->id, Champlain::MapSourceFactory->OAM, "get id()");
-       is($oam->name, 'OpenAerialMap', "get name()");
-       is($oam->license, "(CC) BY 3.0 OpenAerialMap contributors", "get license()");
-       is($oam->license_uri, 'http://creativecommons.org/licenses/by/3.0/', "get license_uri()");
-       is($oam->min_zoom_level, 0, "get min_zoom_level()");
-       is($oam->max_zoom_level, 17, "get max_zoom_level()");
-       is($oam->projection, 'mercator', "get projection()");
-       is($oam->uri_format, 'http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg', "get uri_format()");
+       my ($source) = @found;
+       isa_ok($source, 'Champlain::MapSourceDesc');
+       is($source->id, Champlain::MapSourceFactory->OSM_MAPNIK, "get id()");
+       is($source->name, 'OpenStreetMap Mapnik', "get name()");
+       is($source->license, "(CC) BY 2.0 OpenStreetMap contributors", "get license()");
+       is($source->license_uri, 'http://creativecommons.org/licenses/by/2.0/', "get license_uri()");
+       is($source->min_zoom_level, 0, "get min_zoom_level()");
+       is($source->max_zoom_level, 18, "get max_zoom_level()");
+       is($source->projection, 'mercator', "get projection()");
+       is($source->uri_format, 'http://tile.openstreetmap.org/#Z#/#X#/#Y#.png', "get uri_format()");
        
        # Setters
-       $oam->id('test');
-       is($oam->id, 'test', "set id()");
+       $source->id('test');
+       is($source->id, 'test', "set id()");
        
-       $oam->name("new name");
-       is($oam->name, "new name", "set name()");
+       $source->name("new name");
+       is($source->name, "new name", "set name()");
        
-       $oam->license("free for all");
-       is($oam->license, "free for all", "set license()");
+       $source->license("free for all");
+       is($source->license, "free for all", "set license()");
        
-       $oam->license_uri('file:///tmp/free.txt');
-       is($oam->license_uri, 'file:///tmp/free.txt', "set license_uri()");
+       $source->license_uri('file:///tmp/free.txt');
+       is($source->license_uri, 'file:///tmp/free.txt', "set license_uri()");
        
-       $oam->min_zoom_level(2);
-       is($oam->min_zoom_level, 2, "set min_zoom_level()");
+       $source->min_zoom_level(2);
+       is($source->min_zoom_level, 2, "set min_zoom_level()");
        
-       $oam->max_zoom_level(4);
-       is($oam->max_zoom_level, 4, "set max_zoom_level()");
+       $source->max_zoom_level(4);
+       is($source->max_zoom_level, 4, "set max_zoom_level()");
        
        # There are no other projections now, we have to trust that the setter works
-       $oam->projection('mercator');
-       is($oam->projection, 'mercator', "set projection()");
+       $source->projection('mercator');
+       is($source->projection, 'mercator', "set projection()");
 
-       $oam->uri_format('http://tile.oam.org/tiles/#Z#/#X#/#Y#.jpg');
-       is($oam->uri_format, 'http://tile.oam.org/tiles/#Z#/#X#/#Y#.jpg', "set uri_format()");
+       $source->uri_format('http://tile.oam.org/tiles/#Z#/#X#/#Y#.jpg');
+       is($source->uri_format, 'http://tile.oam.org/tiles/#Z#/#X#/#Y#.jpg', "set uri_format()");
        
        
        # The constructor is not yet available in the perl bindings
-       throws_ok { $oam->constructor } qr/\Qdesc->constructor() isn't implemented yet/, "get constructor() isn't implemented";
-       throws_ok { $oam->constructor(sub{}) } qr/\Qdesc->constructor(\&code_ref)/, "set constructor() isn't implemented";
+       throws_ok { $source->constructor } qr/\Qdesc->constructor() isn't implemented yet/, "get constructor() isn't implemented";
+       throws_ok { $source->constructor(sub{}) } qr/\Qdesc->constructor(\&code_ref)/, "set constructor() isn't implemented";
 }