From: Emmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Date: Sat, 17 Oct 2009 16:40:09 +0000 (+0200)
Subject: Update the OSM license
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52c2ca71f1076da60e0f7c705a9938b94c8998ef;p=libchamplain

Update the OSM license
---

diff --git a/bindings/perl/Champlain/t/ChamplainMapSource.t b/bindings/perl/Champlain/t/ChamplainMapSource.t
index fbaacd8..b43db13 100644
--- a/bindings/perl/Champlain/t/ChamplainMapSource.t
+++ b/bindings/perl/Champlain/t/ChamplainMapSource.t
@@ -7,7 +7,8 @@ use Clutter::TestHelper tests => 165;
 
 use Champlain qw(:coords :maps);
 
-my $OSM_LICENSE = "(CC) BY 2.0 OpenStreetMap contributors";
+my $OSM_LICENSE = "CC-BY-SA 2.0 OpenStreetMap contributors";
+my $OSM_URL_LICENSE = 'http://creativecommons.org/licenses/by-sa/2.0/';
 
 exit tests();
 
@@ -34,7 +35,7 @@ sub test_osm_mapnik {
 	is($map->get_max_zoom_level, 18, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
 	is($map->get_license, $OSM_LICENSE, "$label license");
-	is($map->get_license_uri, 'http://creativecommons.org/licenses/by/2.0/' , "$label license_uri");
+	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
 	generic_map_operations($label, $map);
@@ -54,7 +55,7 @@ sub test_osm_cyclemap {
 	is($map->get_max_zoom_level, 18, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
 	is($map->get_license, $OSM_LICENSE, "$label license");
-	is($map->get_license_uri, 'http://creativecommons.org/licenses/by/2.0/' , "$label license_uri");
+	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
 	generic_map_operations($label, $map);
@@ -74,7 +75,7 @@ sub test_osm_osmarender {
 	is($map->get_max_zoom_level, 18, "$label max zoom");
 	is($map->get_tile_size, 256, "$label tile size");
 	is($map->get_license, $OSM_LICENSE, "$label license");
-	is($map->get_license_uri, 'http://creativecommons.org/licenses/by/2.0/' , "$label license_uri");
+	is($map->get_license_uri, $OSM_URL_LICENSE , "$label license_uri");
 	
 	# Generic map operations
 	generic_map_operations($label, $map);