]> git.openstreetmap.org Git - nominatim.git/blobdiff - website/polygons.php
projects / nominatim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use check_import_finished in test suite, document
[nominatim.git] / website / polygons.php
diff --git a/website/polygons.php b/website/polygons.php
old mode 100755 (executable)
new mode 100644 (file)
index a8abd83..a2264b1
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,41 +1,50 @@
 <?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';
-    $iDays = $oParams->getInt('days', 1);
-    $bReduced = $oParams->getBool('reduced', false);
-    $sClass = $oParams->getString('class', false);
-
-    $oDB =& getDB();
-
-    $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error'));
-
-    $aPolygons = array();
-    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 .= " 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";
-        $aPolygons = chksql($oDB->getAll($sSQL));
+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 Nominatim\ParameterParser();
+
+$sOutputFormat = 'html';
+$iDays = $oParams->getInt('days', false);
+$bReduced = $oParams->getBool('reduced', false);
+$sClass = $oParams->getString('class', false);
+
+$oDB = new Nominatim\DB();
+$oDB->connect();
+
+$iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');
+
+$aPolygons = array();
+while ($iTotalBroken && empty($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';
+
+    $aWhere = array();
+    if ($iDays) {
+        $aWhere[] = "updated > 'now'::timestamp - '".$iDays." day'::interval";
+        $iDays++;
     }
 
-    if (CONST_Debug)
-    {
-        var_dump($aPolygons);
-        exit;
+    if ($bReduced) $aWhere[] = "errormessage like 'Area reduced%'";
+    if ($sClass) $sWhere[] = "class = '".pg_escape_string($sClass)."'";
+
+    if (!empty($aWhere)) {
+        $sSQL .= ' where '.join(' and ', $aWhere);
     }
+
+    $sSQL .= ' order by updated desc limit 1000';
+    $aPolygons = $oDB->getAll($sSQL);
+}
+
+if (CONST_Debug) {
+    var_dump($aPolygons);
+    exit;
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -84,60 +93,45 @@ table td {
 
 <?php
 
-    echo "<p>Total number of broken polygons: $iTotalBroken</p>";
-    if (!$aPolygons) exit;
-    echo "<table>";
-    echo "<tr>";
+echo "<p>Total number of broken polygons: $iTotalBroken</p>";
+if (!$aPolygons) exit;
+echo '<table>';
+echo '<tr>';
 //var_dump($aPolygons[0]);
-    foreach($aPolygons[0] as $sCol => $sVal)
-    {
-        echo "<th>".$sCol."</th>";
-    }
-    echo "<th>&nbsp;</th>";
-    echo "<th>&nbsp;</th>";
-    echo "</tr>";
-    $aSeen = array();
-    foreach($aPolygons as $aRow)
-    {
-        if (isset($aSeen[$aRow['type'].$aRow['id']])) continue;
-        $aSeen[$aRow['type'].$aRow['id']] = 1;
-        echo "<tr>";
-        foreach($aRow as $sCol => $sVal)
-        {
-            switch($sCol)
-            {
+foreach ($aPolygons[0] as $sCol => $sVal) {
+    echo '<th>'.$sCol.'</th>';
+}
+echo '<th>&nbsp;</th>';
+echo '</tr>';
+$aSeen = array();
+foreach ($aPolygons as $aRow) {
+    if (isset($aSeen[$aRow['type'].$aRow['id']])) continue;
+    $aSeen[$aRow['type'].$aRow['id']] = 1;
+    echo '<tr>';
+    foreach ($aRow as $sCol => $sVal) {
+        switch ($sCol) {
             case 'error message':
-                if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/',$sVal,$aMatch))
-                {
+                if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) {
                     $aRow['lat'] = $aMatch[2];
                     $aRow['lon'] = $aMatch[1];
-                    echo "<td><a href=\"http://www.openstreetmap.org/?lat=".$aMatch[2]."&lon=".$aMatch[1]."&zoom=18&layers=M&".$sOSMType."=".$aRow['id']."\">".($sVal?$sVal:'&nbsp;')."</a></td>";
-                }
-                else
-                {
-                    echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+                    echo '<td><a href="https://www.openstreetmap.org/?lat='.$aMatch[2].'&lon='.$aMatch[1].'&zoom=18&layers=M&'.$sOSMType.'='.$aRow['id'].'">'.($sVal?$sVal:'&nbsp;').'</a></td>';
+                } else {
+                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
                 }
                 break;
             case 'id':
                 echo '<td>'.osmLink($aRow).'</td>';
                 break;
             default:
-                echo "<td>".($sVal?$sVal:'&nbsp;')."</td>";
+                echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
                 break;
-            }
-        }
-        echo "<td><a href=\"http://localhost:8111/import?url=http://www.openstreetmap.org/api/0.6/".$sOSMType.'/'.$aRow['id']."/full\" target=\"josm\">josm</a></td>";
-        if (isset($aRow['lat']))
-        {
-            echo "<td><a href=\"http://open.mapquestapi.com/dataedit/index_flash.html?lat=".$aRow['lat']."&lon=".$aRow['lon']."&zoom=18\" target=\"potlatch2\">P2</a></td>";
-        }
-        else
-        {
-            echo "<td>&nbsp;</td>"; 
         }
-        echo "</tr>";
     }
-    echo "</table>";
+    echo '<td><a href="http://localhost:8111/import?url=https://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['id'].'/full" target="josm">josm</a></td>';
+    echo '</tr>';
+}
+echo '</table>';
+
 ?>
 </body>
 </html>
Open Source search based on OpenStreetMap data