factor out parameter parsing into its own class

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

index 3e2e878cfb8ff869941b16f362bc7d77b277806e..1e0f5f7ea757012d329afec46967f9d6f19b2162 100755 (executable)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,50 +1,51 @@
  <?php
  <?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');
+       ini_set('memory_limit', '200M');
+
+       $oParams = new ParameterParser();
  
         $sOutputFormat = 'html';
  
         $sOutputFormat = 'html';
-       ini_set('memory_limit', '200M');
+       $iDays = $oParams->getInt('days', 1);
+       $bReduced = $oParams->getBool('reduced', false);
+       $sClass = $oParams->getString('class', false);
  
         $oDB =& getDB();
  
         $oDB =& getDB();
-       if (!isset($_GET['days'])) $_GET['days'] = 1;
-       $bReduced = false;
-       if (isset($_GET['reduced'])) $bReduced = true;
-       $sClass = false;
-       if (isset($_GET['class'])) $sClass = $_GET['class'];
+
+       $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
  
         $aPolygons = array();
  
         $aPolygons = array();
-       while(!sizeof($aPolygons))
+       while($iTotalBroken && !sizeof($aPolygons))
         {
                 $sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",';
                 $sSQL .= 'country_code as "country",errormessage as "error message",updated';
                 $sSQL .= " from import_polygon_error";
         {
                 $sSQL = 'select osm_type as "type",osm_id as "id",class as "key",type as "value",name->\'name\' as "name",';
                 $sSQL .= 'country_code as "country",errormessage as "error message",updated';
                 $sSQL .= " from import_polygon_error";
-               if ($_GET['days'])
-               {
-                       $sSQL .= " where updated > 'now'::timestamp - '".(int)$_GET['days']." day'::interval";
-                       $_GET['days']++;
-               }
-               if ($bReduced)
-               {
-                       $sSQL .= " and errormessage like 'Area reduced%'";
-               }
-               if ($sClass)
-               {
-                       $sSQL .= " and class = '".pg_escape_string($sClass)."'";
-               }
+               $sSQL .= " where updated > 'now'::timestamp - '".$iDays." day'::interval";
+               $iDays++;
+
+               if ($bReduced) $sSQL .= " and errormessage like 'Area reduced%'";
+               if ($sClass) $sSQL .= " and class = '".pg_escape_string($sClass)."'";
                 $sSQL .= " order by updated desc limit 1000";
                 $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>
  <head>
  ?>
  <!DOCTYPE html>
  <html>
  <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-    
-    <title>Nominatim Broken Polygon Data</title>
-    
-    <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
+       <meta charset="utf-8"/>
+       <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
+       
+       <title>Nominatim Broken Polygon Data</title>
+       
+       <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
  
  </head>
  
  
  </head>
  
@@ -83,6 +84,8 @@ table td {
  
  <?php
  
  
  <?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]);
@@ -116,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>";
@@ -136,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>