]> err.no Git - libchamplain/commitdiff
The predefined map sources have the same in formation in the desc as in the map source.
authorEmmanuel Rodriguez <emmanuel.rodriguez@gmail.com>
Tue, 19 May 2009 09:22:37 +0000 (11:22 +0200)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Fri, 12 Jun 2009 03:20:45 +0000 (23:20 -0400)
The map names and licenses are the same now.

champlain/champlain-map-source-factory.c

index a39bea51bcccaf0e75536a029218842448107e08..0863e4936fe63bdf2bbcd082909c78008f063176 100644 (file)
@@ -168,7 +168,7 @@ ChamplainMapSourceDesc OSM_MAPNIK_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
     "OpenStreetMap Mapnik",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -182,7 +182,7 @@ ChamplainMapSourceDesc OSM_OSMARENDER_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
     "OpenStreetMap Osmarender",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -196,7 +196,7 @@ ChamplainMapSourceDesc OSM_CYCLEMAP_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
     "OpenStreetMap Cycle Map",
-    "(CC) BY 2.0 OpenStreetMap contributor",
+    "(CC) BY 2.0 OpenStreetMap contributors",
     "http://creativecommons.org/licenses/by/2.0/",
     0,
     18,
@@ -210,7 +210,7 @@ ChamplainMapSourceDesc OAM_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_OAM,
     "OpenAerialMap",
-    "(CC) BY 3.0 OpenAerialMap contributor",
+    "(CC) BY 3.0 OpenAerialMap contributors",
     "http://creativecommons.org/licenses/by/3.0/",
     0,
     17,
@@ -223,8 +223,8 @@ static
 ChamplainMapSourceDesc MFF_RELIEF_DESC =
   {
     CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
-    "Maps For Free Relief",
-    "GNU Free Documentation Licence, version 1.2 or later",
+    "Maps for Free Relief",
+    "Map data available under GNU Free Documentation license, Version 1.2 or later",
     "http://www.gnu.org/copyleft/fdl.html",
     0,
     11,