X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/effd8e12af440586594a18a04beb33abed260d15..11c91e3b8d5921dba478ac0b2191d3c1aba67b73:/website/polygons.php diff --git a/website/polygons.php b/website/polygons.php old mode 100755 new mode 100644 index a8abd83b..e5d459f3 --- a/website/polygons.php +++ b/website/polygons.php @@ -1,41 +1,49 @@ 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 =& getDB(); + +$iTotalBroken = (int) chksql($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 = chksql($oDB->getAll($sSQL)); +} + +if (CONST_Debug) { + var_dump($aPolygons); + exit; +} + ?> @@ -84,60 +92,45 @@ table td { Total number of broken polygons: $iTotalBroken

"; - if (!$aPolygons) exit; - echo ""; - echo ""; +echo "

Total number of broken polygons: $iTotalBroken

"; +if (!$aPolygons) exit; +echo '
'; +echo ''; //var_dump($aPolygons[0]); - foreach($aPolygons[0] as $sCol => $sVal) - { - echo ""; - } - echo ""; - echo ""; - echo ""; - $aSeen = array(); - foreach($aPolygons as $aRow) - { - if (isset($aSeen[$aRow['type'].$aRow['id']])) continue; - $aSeen[$aRow['type'].$aRow['id']] = 1; - echo ""; - foreach($aRow as $sCol => $sVal) - { - switch($sCol) - { +foreach ($aPolygons[0] as $sCol => $sVal) { + echo ''; +} +echo ''; +echo ''; +$aSeen = array(); +foreach ($aPolygons as $aRow) { + if (isset($aSeen[$aRow['type'].$aRow['id']])) continue; + $aSeen[$aRow['type'].$aRow['id']] = 1; + echo ''; + 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 ""; - } - else - { - echo ""; + echo ''; + } else { + echo ''; } break; case 'id': echo ''; break; default: - echo ""; + echo ''; break; - } - } - echo ""; - if (isset($aRow['lat'])) - { - echo ""; - } - else - { - echo ""; } - echo ""; } - echo "
".$sCol."  
'.$sCol.' 
".($sVal?$sVal:' ')."".($sVal?$sVal:' ')."'.($sVal?$sVal:' ').''.($sVal?$sVal:' ').''.osmLink($aRow).'".($sVal?$sVal:' ')."'.($sVal?$sVal:' ').'josmP2 
"; + echo 'josm'; + echo ''; +} +echo ''; + ?>