[libchamplain/libchamplain-0-4: 10/10] Fix the OSM licences.
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain/libchamplain-0-4: 10/10] Fix the OSM licences.
- Date: Sat, 17 Oct 2009 08:32:17 +0000 (UTC)
commit 2ef267ae0cb9ae6aaa6680318da55f339d8da80c
Author: Bruce Cowan <bcowan fastmail co uk>
Date: Fri Oct 16 02:04:39 2009 +0100
Fix the OSM licences.
AUTHORS | 1 +
champlain/champlain-map-source-factory.c | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 9502c67..afd91dc 100644
--- 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 5199ba2..7cd3e05 100644
--- 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
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]