factor out link formatting function and osm type translation

[nominatim.git] / website / deletable.php
diff --git a/website/deletable.php b/website/deletable.php

index 4e2e623c3c43a8f2834bd4bf9cb55dc5f009913b..6521e774442e9a97b5cefdf89559581629e0313b 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,6 +1,8 @@
  <?php
-        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
-        require_once(CONST_BasePath.'/lib/log.php');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-website.php');
+       require_once(CONST_BasePath.'/lib/log.php');
+       require_once(CONST_BasePath.'/lib/output.php');
  
         $sOutputFormat = 'html';
         ini_set('memory_limit', '200M');
@@ -19,12 +21,12 @@
  <!DOCTYPE html>
  <html>
  <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-    
-    <title>Nominatim Deleted Data</title>
-    
-    <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
+       <meta charset="utf-8"/>
+       <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+       
+       <title>Nominatim Deleted Data</title>
+       
+       <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
  
  </head>
  
@@ -65,6 +67,7 @@ table td {
  
  <table>
  <?php
+       if (!$aPolygons) exit;
         echo "<tr>";
  //var_dump($aPolygons[0]);
         foreach($aPolygons[0] as $sCol => $sVal)
@@ -79,16 +82,15 @@ table td {
                 {
                         switch($sCol)
                         {
-            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>';
-                                break;
-                       case 'place_id':
-                               echo '<td><a href="'.CONST_Website_BaseURL.'details?place_id='.$sVal.'">'.$sVal.'</a></td>';
-                               break;
-                       default:
-                               echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
-                               break;
+                               case 'osm_id':
+                                       echo '<td>'.osmLink($aRow).'</td>';
+                                       break;
+                               case 'place_id':
+                                       echo '<td>'.detailsLink($aRow).'</td>';
+                                       break;
+                               default:
+                                       echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+                                       break;
                         }
                 }
                 echo "</tr>";