X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b14bc75dc4a0ca44485599d8ab4cf1c5781098e2..c02edeb30fcc3d4ff05bc452d0fb97517a507848:/website/polygons.php diff --git a/website/polygons.php b/website/polygons.php old mode 100755 new mode 100644 index b855214a..c5fbafc2 --- a/website/polygons.php +++ b/website/polygons.php @@ -1,141 +1,53 @@ getSet('format', array('html', 'json'), 'html'); +set_exception_handler_by_format($sOutputFormat); - $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error')); +$iDays = $oParams->getInt('days', false); +$bReduced = $oParams->getBool('reduced', false); +$sClass = $oParams->getString('class', false); - $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++; +$oDB = new Nominatim\DB(); +$oDB->connect(); - 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)); - } +$iTotalBroken = (int) $oDB->getOne('SELECT count(*) FROM import_polygon_error'); - if (CONST_Debug) - { - var_dump($aPolygons); - exit; - } -?> - - - - - - - Nominatim Broken Polygon Data - - +$aPolygons = array(); +while ($iTotalBroken && empty($aPolygons)) { + $sSQL = 'SELECT osm_type, osm_id, class, type, name->\'name\' as "name",'; + $sSQL .= 'country_code, errormessage, updated'; + $sSQL .= ' FROM import_polygon_error'; - + $aWhere = array(); + if ($iDays) { + $aWhere[] = "updated > 'now'::timestamp - '".$iDays." day'::interval"; + $iDays++; + } - - -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) - { - case 'error message': - if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/',$sVal,$aMatch)) - { - $aRow['lat'] = $aMatch[2]; - $aRow['lon'] = $aMatch[1]; - echo ""; - } - else - { - echo ""; - } - break; - case 'id': - echo ''; - break; - default: - echo ""; - break; - } - } - echo ""; - if (isset($aRow['lat'])) - { - echo ""; - } - else - { - echo ""; - } - echo ""; - } - echo "
".$sCol."  
".($sVal?$sVal:' ')."".($sVal?$sVal:' ')."'.osmLink($aRow).'".($sVal?$sVal:' ')."josmP2 
"; -?> - - +if ($sOutputFormat == 'json') { + echo javascript_renderData($aPolygons); +} else { + include(CONST_BasePath.'/lib/template/polygons-html.php'); +}