From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 12 Sep 2012 17:14:28 +0000 (+0200)
Subject: switch attributions to ODbL
X-Git-Tag: deploy~674
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/9c0ca064b833ad39eac8ffc2447331d732d1a7d0

switch attributions to ODbL
---

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 83c8b57c..c05bce29 100644
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -11,7 +11,7 @@
 	else
 	{
 		if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-		$aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.";
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
 		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
                 if ($sOSMType)
                 {
diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 96247182..4e751a0d 100644
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -11,7 +11,7 @@
 	else
 	{
 		if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id'];
-		$aFilteredPlaces['licence'] = "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.";
+		$aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright";
 		$sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
                 if ($sOSMType)
                 {
diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php
index 450f8fb5..75f69e15 100644
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -8,7 +8,7 @@
 
 	echo "<reversegeocode";
 	echo " timestamp='".date(DATE_RFC822)."'";
-	echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 	echo " querystring='".htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES)."'";
 	echo ">\n";
 
diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index c54c3c22..3f416fca 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -53,7 +53,8 @@ body {
                 projection: new OpenLayers.Projection("EPSG:900913"),
                 displayProjection: new OpenLayers.Projection("EPSG:4326")
             	} );
-			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
+			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default",
+                        { attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'}));
 
                         var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                         layer_style.fillOpacity = 0.2;
diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index 7878540e..7698ebd0 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -295,7 +295,8 @@ form{
 									"moveend": mapEventMove
 								}
             	} );
-			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default"));
+			map.addLayer(new OpenLayers.Layer.OSM.<?php echo CONST_Tile_Default;?>("Default",
+                         { attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>'}));
 
 			var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
 			layer_style.fillOpacity = 0.2;
diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 4eed52ae..dd75ad87 100644
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -4,7 +4,7 @@
 	{
 		$aPlace = array(
 				'place_id'=>$aPointDetails['place_id'],
-				'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+				'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
 			);
 
 		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 89479dfb..fa801ac4 100644
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -4,7 +4,7 @@
 	{
 		$aPlace = array(
 				'place_id'=>$aPointDetails['place_id'],
-				'licence'=>"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+				'licence'=>"Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright",
 			);
 
 		$sOSMType = ($aPointDetails['osm_type'] == 'N'?'node':($aPointDetails['osm_type'] == 'W'?'way':($aPointDetails['osm_type'] == 'R'?'relation':'')));
diff --git a/lib/template/search-xml.php b/lib/template/search-xml.php
index f8e054e3..bdf1eab5 100644
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -8,7 +8,7 @@
 
 	echo "<searchresults";
 	echo " timestamp='".date(DATE_RFC822)."'";
-	echo " attribution='Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.'";
+	echo " attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright'";
 	echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
 	if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
 	echo " polygon='".($bShowPolygons?'true':'false')."'";