factor out parameter parsing into its own class

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

index 92dbf70daaef82f0c5e63035564b05942363ac81..1e0f5f7ea757012d329afec46967f9d6f19b2162 100755 (executable)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -2,16 +2,19 @@
         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(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');
         ini_set('memory_limit', '200M');
  
         ini_set('memory_limit', '200M');
  
-       $oDB =& getDB();
+       $oParams = new ParameterParser();
  
         $sOutputFormat = 'html';
  
         $sOutputFormat = 'html';
-       $iDays = getParamInt('days', 1);
-       $bReduced = getParamBool('reduced', false);
-       $sClass = getParamString('class', false);
+       $iDays = $oParams->getInt('days', 1);
+       $bReduced = $oParams->getBool('reduced', false);
+       $sClass = $oParams->getString('class', false);
+
+       $oDB =& getDB();
  
  
-       $iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');
+       $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
  
         $aPolygons = array();
         while($iTotalBroken && !sizeof($aPolygons))
  
         $aPolygons = array();
         while($iTotalBroken && !sizeof($aPolygons))
@@ -25,9 +28,14 @@
                 if ($bReduced) $sSQL .= " and errormessage like 'Area reduced%'";
                 if ($sClass) $sSQL .= " and class = '".pg_escape_string($sClass)."'";
                 $sSQL .= " order by updated desc limit 1000";
                 if ($bReduced) $sSQL .= " and errormessage like 'Area reduced%'";
                 if ($sClass) $sSQL .= " and class = '".pg_escape_string($sClass)."'";
                 $sSQL .= " order by updated desc limit 1000";
-               $aPolygons = $oDB->getAll($sSQL);
+               $aPolygons = chksql($oDB->getAll($sSQL));
+       }
+
+       if (CONST_Debug)
+       {
+               var_dump($aPolygons);
+               exit;
         }
         }
-//var_dump($aPolygons);
  ?>
  <!DOCTYPE html>
  <html>
  ?>
  <!DOCTYPE html>
  <html>
@@ -77,6 +85,7 @@ table td {
  <?php
  
         echo "<p>Total number of broken polygons: $iTotalBroken</p>";
  <?php
  
         echo "<p>Total number of broken polygons: $iTotalBroken</p>";
+       if (!$aPolygons) exit;
         echo "<table>";
         echo "<tr>";
  //var_dump($aPolygons[0]);
         echo "<table>";
         echo "<tr>";
  //var_dump($aPolygons[0]);
@@ -110,8 +119,7 @@ table td {
                                 }
                                 break;
                         case 'id':
                                 }
                                 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>'.osmLink($aRow).'</td>';
                                 break;
                         default:
                                 echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
                                 break;
                         default:
                                 echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
@@ -130,10 +138,6 @@ table td {
                 echo "</tr>";
         }
         echo "</table>";
                 echo "</tr>";
         }
         echo "</table>";
-
-
-
-//     include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
  ?>
  </body>
  </html>
  ?>
  </body>
  </html>