X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/797c2d1e74a14d8d52d963f1efad9be53fca5f5f..dc2911ae7257b0b1d95eec922e17361a458d213f:/website/polygons.php diff --git a/website/polygons.php b/website/polygons.php index 1e0f5f7e..153a279d 100755 --- a/website/polygons.php +++ b/website/polygons.php @@ -1,143 +1,134 @@ getInt('days', 1); - $bReduced = $oParams->getBool('reduced', false); - $sClass = $oParams->getString('class', false); +$oParams = new Nominatim\ParameterParser(); - $oDB =& getDB(); +$sOutputFormat = 'html'; +$iDays = $oParams->getInt('days', 1); +$bReduced = $oParams->getBool('reduced', false); +$sClass = $oParams->getString('class', false); - $iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error')); +$oDB =& getDB(); - $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++; +$iTotalBroken = (int) chksql($oDB->getOne('select count(*) from import_polygon_error')); - 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)); - } +$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)); +} + +if (CONST_Debug) { + var_dump($aPolygons); + exit; +} - if (CONST_Debug) - { - var_dump($aPolygons); - exit; - } ?> - - - - Nominatim Broken Polygon Data - - + + + + Nominatim Broken Polygon Data + + 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) - { - 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 
"; +foreach ($aPolygons[0] as $sCol => $sVal) { + echo "".$sCol.""; +} +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 "".($sVal?$sVal:' ').""; + } else { + echo "".($sVal?$sVal:' ').""; + } + break; + case 'id': + echo ''.osmLink($aRow).''; + break; + default: + echo "".($sVal?$sVal:' ').""; + break; + } + } + echo "josm"; + if (isset($aRow['lat'])) { + echo "P2"; + } else { + echo " "; + } + echo ""; +} +echo ""; + ?>