switch attributions to ODbL

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 83c8b57cb523944e739901f5994895e72db0858e..c05bce294e1837279815fd04ca69bf8c43787f30 100644 (file)
--- 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'];
        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)
                 {
                $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 9624718273fadcc64679bf4a456150f1d75c9b7a..4e751a0d4b458ba4f7cff9fbe7fe592863c92276 100644 (file)
--- 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'];
        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)
                 {
                $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 450f8fb567d8bc594f242ef8767b89ba9f110d0c..75f69e1563c2a96cc8d27dddfb205a226680dcf8 100644 (file)
--- a/lib/template/address-xml.php
+++ b/lib/template/address-xml.php
@@ -8,7 +8,7 @@
 
        echo "<reversegeocode";
        echo " timestamp='".date(DATE_RFC822)."'";
 
        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";
 
        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 c54c3c225f6442336256d22a1ade2a1d0e001511..3f416fca3a4b7ff7b0156a6f8bcc96200e0020f2 100644 (file)
--- 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")
                } );
                 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;
 
                         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 7878540e7ef7c05e5dbce40ae488d75f7ec77815..7698ebd0de2a66aa399680647ebb1775bf3569ac 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -295,7 +295,8 @@ form{
                                                                        "moveend": mapEventMove
                                                                }
                } );
                                                                        "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;
 
                        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 4eed52ae122490f8f8d0abbf2bdb6c16d15d12a0..dd75ad871af0abfdd34c7db7e7339add0f9d2e51 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -4,7 +4,7 @@
        {
                $aPlace = array(
                                'place_id'=>$aPointDetails['place_id'],
        {
                $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':'')));
                        );
 
                $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 89479dfb84f6f0480a01898f899c83100300a6b9..fa801ac497585ddfda7d7e9a7e0d2b5a16dd35fd 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -4,7 +4,7 @@
        {
                $aPlace = array(
                                'place_id'=>$aPointDetails['place_id'],
        {
                $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':'')));
                        );
 
                $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 f8e054e3a1dd673697a35027311c02159f4b8053..bdf1eab53ae93b19a8f04eca3b7ac83d6e8e4be1 100644 (file)
--- a/lib/template/search-xml.php
+++ b/lib/template/search-xml.php
@@ -8,7 +8,7 @@
 
        echo "<searchresults";
        echo " timestamp='".date(DATE_RFC822)."'";
 
        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')."'";
        echo " querystring='".htmlspecialchars($sQuery, ENT_QUOTES)."'";
        if (isset($sViewBox)) echo " viewbox='".htmlspecialchars($sViewBox, ENT_QUOTES)."'";
        echo " polygon='".($bShowPolygons?'true':'false')."'";