update links to OSM objects

/browse/ is no longer necesary in the URL

diff --git a/lib/template/details-error-html.php b/lib/template/details-error-html.php
index 1c6d2a0a4db705f89bcf856d6ced3453f0019f05..545dc52bd8dcc27d3c1fd9af942d96d247586e73 100644 (file)
--- a/lib/template/details-error-html.php
+++ b/lib/template/details-error-html.php
@@ -13,7 +13,7 @@
        {
                $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
                if ($sOSMType) {
-                       return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
+                       return '<a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
                }
                return '';
        }
@@ -130,4 +130,4 @@
 
        <?php include(CONST_BasePath.'/lib/template/includes/html-footer.php'); ?>
        </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index ae36b411b5ae69e6ed10f96d6b0e684bd3b24249..7d9696b8b318a882125601dccdec7317b0cc4ead 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -25,7 +25,7 @@
                $sOSMType = ($aFeature['osm_type'] == 'N'?'node':($aFeature['osm_type'] == 'W'?'way':($aFeature['osm_type'] == 'R'?'relation':'')));
                if ($sOSMType)
                {
-                       return '<a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
+                       return '<a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$aFeature['osm_id'].'">'.$sOSMType.' '.$aFeature['osm_id'].'</a>';
                }
                return '';
        }

diff --git a/website/deletable.php b/website/deletable.php
index 3283bb8300b3e6fbbc2c57d5b4b3fbd03ea84df0..efd20ab3c2cc2ecb465bf3da2772a64ac0651f92 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -82,7 +82,7 @@ table td {
                        {
                                case 'osm_id':
                                        $sOSMType = ($aRow['osm_type'] == 'N'?'node':($aRow['osm_type'] == 'W'?'way':($aRow['osm_type'] == 'R'?'relation':'')));
-                                       echo '<td><a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$sVal.'" target="_new">'.$sVal.'</a></td>';
+                                       echo '<td><a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$sVal.'" target="_new">'.$sVal.'</a></td>';
                                        break;
                                case 'place_id':
                                        echo '<td><a href="'.CONST_Website_BaseURL.'details?place_id='.$sVal.'">'.$sVal.'</a></td>';

diff --git a/website/hierarchy.php b/website/hierarchy.php
index e0e960bc7e9e9635fdb0b77212b85bfc439d9861..8c0ae1f511789a69bcd4bb0d076af8a3cdc074fb 100755 (executable)
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -69,7 +69,7 @@
                $aBreadcrums[] = array('placeId'=>$aPlace['place_id'], 'osmType'=>$aPlace['osm_type'], 'osmId'=>$aPlace['osm_id'], 'localName'=>$aPlace['localname']);
                $sPlaceUrl = 'hierarchy.php?place_id='.$aPlace['place_id'];
                $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':'')));
-                               $sOSMUrl = 'http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aPlace['osm_id'];
+                               $sOSMUrl = 'http://www.openstreetmap.org/'.$sOSMType.'/'.$aPlace['osm_id'];
                if ($sOutputFormat == 'html') if ($i) echo " > ";
                if ($sOutputFormat == 'html') echo '<a href="'.$sPlaceUrl.'">'.$aPlace['localname'].'</a> (<a href="'.$sOSMUrl.'">osm</a>)';
        }
@@ -127,7 +127,7 @@
                                        echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
                                        echo ' (';
                                        echo '<span class="area">'.($aAddressLine['isarea']=='t'?'Polygon':'Point').'</span>';
-                                       if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
+                                       if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
                                        echo ', <a href="hierarchy.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
                                        echo ', '.$aAddressLine['area'];
                                        echo ')';

diff --git a/website/polygons.php b/website/polygons.php
index 92dbf70daaef82f0c5e63035564b05942363ac81..b6146d95b74953f63b57d264140b89df792d995a 100755 (executable)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -111,7 +111,7 @@ table td {
                                break;
                        case 'id':
                                $sOSMType = ($aRow['type'] == 'N'?'node':($aRow['type'] == 'W'?'way':($aRow['type'] == 'R'?'relation':'')));
-                               echo '<td><a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aRow['id'].'" target="_new">'.$aRow['id'].'</a></td>';
+                               echo '<td><a href="http://www.openstreetmap.org/'.$sOSMType.'/'.$aRow['id'].'" target="_new">'.$aRow['id'].'</a></td>';
                                break;
                        default:
                                echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";