move address line computation in its own function

[nominatim.git] / website / polygons.php

diff --git a/website/polygons.php b/website/polygons.php
index e5d459f3604e4b05f8e90e15d4df263fe9ce1cf8..29fc5c2760a18f6abaaa34319b35efa0d729ac60 100644 (file)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -12,9 +12,10 @@ $iDays = $oParams->getInt('days', false);
 $bReduced = $oParams->getBool('reduced', false);
 $sClass = $oParams->getString('class', false);
 
 $bReduced = $oParams->getBool('reduced', false);
 $sClass = $oParams->getString('class', false);
 

-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();

 
 

-$iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
+$iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');

 
 $aPolygons = array();
 while ($iTotalBroken && empty($aPolygons)) {
 
 $aPolygons = array();
 while ($iTotalBroken && empty($aPolygons)) {


@@ -36,7 +37,7 @@ while ($iTotalBroken && empty($aPolygons)) {
     }
 
     $sSQL .= ' order by updated desc limit 1000';
     }
 
     $sSQL .= ' order by updated desc limit 1000';

-    $aPolygons = chksql($oDB->getAll($sSQL));
+    $aPolygons = $oDB->getAll($sSQL);

 }
 
 if (CONST_Debug) {
 }
 
 if (CONST_Debug) {


@@ -119,7 +120,7 @@ foreach ($aPolygons as $aRow) {
                 }
                 break;
             case 'id':
                 }
                 break;
             case 'id':

-                echo '<td>'.osmLink($aRow).'</td>';
+                echo '<td>'.osmLink(array('osm_type' => $aRow['type'], 'osm_id' => $aRow['id'])).'</td>';

                 break;
             default:
                 echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
                 break;
             default:
                 echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';