[Maposmatic-dev] [PATCH 1/2] Update copyright messages according to osm.org/copyright

[Guttorm Flatabø]

Signed-off-by: Guttorm Flatabø <address@hidden>
---
 ocitysmap/indexlib/indexer.py                |    5 +++--
 ocitysmap/layoutlib/multi_page_renderer.py   |    5 ++---
 ocitysmap/layoutlib/single_page_renderers.py |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ocitysmap/indexlib/indexer.py b/ocitysmap/indexlib/indexer.py
index 98ac775..66b9538 100644
--- a/ocitysmap/indexlib/indexer.py
+++ b/ocitysmap/indexlib/indexer.py
@@ -129,8 +129,9 @@ class StreetIndex:
             return writer.writerow(_r)
 
         copyright_notice = (u'© %(year)d MapOSMatic/ocitysmap authors. '
-                            u'Map data © %(year)d OpenStreetMap.org '
-                            u'and contributors (CC-BY-SA)' %
+                            u'Map data © OpenStreetMap contributors, '
+                            u'under ODbL, '
+                            u'see http://opendatacommons.org/licenses/odbl/' %
                             {'year': datetime.date.today().year})
         if title is not None:
             csv_writerow(['# (UTF-8)', title, copyright_notice])
diff --git a/ocitysmap/layoutlib/multi_page_renderer.py 
b/ocitysmap/layoutlib/multi_page_renderer.py
index e22613a..5d7b29e 100644
--- a/ocitysmap/layoutlib/multi_page_renderer.py
+++ b/ocitysmap/layoutlib/multi_page_renderer.py
@@ -469,9 +469,8 @@ class MultiPageRenderer(Renderer):
         notice = \
             _(u'Copyright © %(year)d MapOSMatic/OCitySMap developers.\n'
               u'http://www.maposmatic.org\n\n'
-              u'Map data © %(year)d OpenStreetMap.org '
-              u'and contributors (cc-by-sa).\n'
-              u'http://www.openstreetmap.org\n\n'
+              u'Map data © OpenStreetMap contributors.\n'
+              u'http://osm.org/copyright\n\n'
               u'Map rendered on: %(date)s. OSM data updated on: %(osmdate)s.\n'
               u'The map may be incomplete or inaccurate. '
               u'You can contribute to improve this map.\n'
diff --git a/ocitysmap/layoutlib/single_page_renderers.py 
b/ocitysmap/layoutlib/single_page_renderers.py
index 48e5a62..0b6ccd8 100644
--- a/ocitysmap/layoutlib/single_page_renderers.py
+++ b/ocitysmap/layoutlib/single_page_renderers.py
@@ -288,8 +288,8 @@ class SinglePageRenderer(Renderer):
         today = datetime.date.today()
         notice = notice or \
             _(u'Copyright © %(year)d MapOSMatic/OCitySMap developers. '
-              u'Map data © %(year)d OpenStreetMap.org '
-              u'and contributors (cc-by-sa).\n'
+              u'Map data © OpenStreetMap contributors, '
+              u'see http://osm.org/copyright\n'
               u'Map rendered on: %(date)s. OSM data updated on: %(osmdate)s. '
               u'The map may be incomplete or inaccurate. '
               u'You can contribute to improve this map. '
-- 
1.7.9.5