X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6c1977b448e8b195bf96b6144674ffe0527e79de..1c7da4318298a790e63c5648de57b3b804426731:/website/polygons.php?ds=sidebyside diff --git a/website/polygons.php b/website/polygons.php old mode 100755 new mode 100644 index 989c8f66..29fc5c27 --- a/website/polygons.php +++ b/website/polygons.php @@ -1,6 +1,5 @@ getInt('days', 1); +$iDays = $oParams->getInt('days', 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 && !sizeof($aPolygons)) { +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'; - $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)."'"; + $aWhere = array(); + if ($iDays) { + $aWhere[] = "updated > 'now'::timestamp - '".$iDays." day'::interval"; + $iDays++; + } + + 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 = chksql($oDB->getAll($sSQL)); + $aPolygons = $oDB->getAll($sSQL); } if (CONST_Debug) { @@ -93,7 +102,6 @@ foreach ($aPolygons[0] as $sCol => $sVal) { echo ''.$sCol.''; } echo ' '; -echo ' '; echo ''; $aSeen = array(); foreach ($aPolygons as $aRow) { @@ -106,25 +114,20 @@ foreach ($aPolygons as $aRow) { if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) { $aRow['lat'] = $aMatch[2]; $aRow['lon'] = $aMatch[1]; - echo ''.($sVal?$sVal:' ').''; + echo ''.($sVal?$sVal:' ').''; } else { echo ''.($sVal?$sVal:' ').''; } break; case 'id': - echo ''.osmLink($aRow).''; + echo ''.osmLink(array('osm_type' => $aRow['type'], 'osm_id' => $aRow['id'])).''; break; default: echo ''.($sVal?$sVal:' ').''; break; } } - echo 'josm'; - if (isset($aRow['lat'])) { - echo 'P2'; - } else { - echo ' '; - } + echo 'josm'; echo ''; } echo '';