Fix the OSM licences.

diff --git a/AUTHORS b/AUTHORS
index 9502c6779aaa548a2adddd111b1b760316576273..afd91dc938c6e9a113f8de537bca79e584b0ea54 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,4 @@ Cosimo Cecchi <cosimoc@gnome.org>
 Vincent Untz <vuntz@gnome.org>
 Felix Riemann <friemann@gnome.org>
 Halton Huo <halton.huo@sun.com>
+Bruce Cowan <bcowan@fastmail.co.uk>

diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 5199ba2ad27123c8f044f2771c7643f0a63dd65f..7cd3e05c9e7ca7e61a2dccbb54b8ae64934a8a42 100644 (file)
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -160,8 +160,8 @@ ChamplainMapSourceDesc OSM_MAPNIK_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
     "OpenStreetMap Mapnik",
-    "(CC) BY 2.0 OpenStreetMap contributors",
-    "http://creativecommons.org/licenses/by/2.0/",
+    "CC-BY-SA 2.0 OpenStreetMap contributors",
+    "http://creativecommons.org/licenses/by-sa/2.0/",
     0,
     18,
     CHAMPLAIN_MAP_PROJECTION_MERCATOR,
@@ -175,10 +175,10 @@ ChamplainMapSourceDesc OSM_OSMARENDER_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
     "OpenStreetMap Osmarender",
-    "(CC) BY 2.0 OpenStreetMap contributors",
-    "http://creativecommons.org/licenses/by/2.0/",
+    "CC-BY-SA 2.0 OpenStreetMap contributors",
+    "http://creativecommons.org/licenses/by-sa/2.0/",
     0,
-    18,
+    17,
     CHAMPLAIN_MAP_PROJECTION_MERCATOR,
     champlain_map_source_new_generic,
     "http://tah.openstreetmap.org/Tiles/tile/#Z#/#X#/#Y#.png",
@@ -190,8 +190,8 @@ ChamplainMapSourceDesc OSM_CYCLEMAP_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
     "OpenStreetMap Cycle Map",
-    "(CC) BY 2.0 OpenStreetMap contributors",
-    "http://creativecommons.org/licenses/by/2.0/",
+    "CC-BY-SA 2.0 OpenStreetMap contributors",
+    "http://creativecommons.org/licenses/by-sa/2.0/",
     0,
     18,
     CHAMPLAIN_MAP_PROJECTION_MERCATOR,
@@ -205,13 +205,13 @@ ChamplainMapSourceDesc OSM_TRANSPORTMAP_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP,
     "OpenStreetMap Transport Map",
-    "(CC) BY 2.0 OpenStreetMap contributors",
-    "http://creativecommons.org/licenses/by/2.0/",
+    "CC-BY-SA 2.0 OpenStreetMap contributors",
+    "http://creativecommons.org/licenses/by-sa/2.0/",
     0,
     18,
     CHAMPLAIN_MAP_PROJECTION_MERCATOR,
     champlain_map_source_new_generic,
-       "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png",
+    "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z#/#X#/#Y#.png",
     NULL
   };