X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3d51c2a4e755808642c657e6bc93d4e692be1c04..42f6371e474cd8315a7c580b7e15b25ab4c19923:/website/polygons.php?ds=sidebyside
diff --git a/website/polygons.php b/website/polygons.php
old mode 100755
new mode 100644
index b249ae03..c5fbafc2
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,27 +1,28 @@
getSet('format', array('html', 'json'), 'html');
+set_exception_handler_by_format($sOutputFormat);
-$sOutputFormat = 'html';
$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)) {
- $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';
+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) {
@@ -32,12 +33,12 @@ while ($iTotalBroken && !sizeof($aPolygons)) {
if ($bReduced) $aWhere[] = "errormessage like 'Area reduced%'";
if ($sClass) $sWhere[] = "class = '".pg_escape_string($sClass)."'";
- if (sizeof($aWhere)) {
- $sSQL .= ' where '.join(' and ', $aWhere);
+ if (!empty($aWhere)) {
+ $sSQL .= ' WHERE '.join(' and ', $aWhere);
}
- $sSQL .= ' order by updated desc limit 1000';
- $aPolygons = chksql($oDB->getAll($sSQL));
+ $sSQL .= ' ORDER BY updated desc LIMIT 1000';
+ $aPolygons = $oDB->getAll($sSQL);
}
if (CONST_Debug) {
@@ -45,99 +46,8 @@ if (CONST_Debug) {
exit;
}
-?>
-
-
-
-
-
-
- Nominatim Broken Polygon Data
-
-
-
-
-
-
-
-
-Total number of broken polygons: $iTotalBroken";
-if (!$aPolygons) exit;
-echo '';
-echo '';
-//var_dump($aPolygons[0]);
-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 '
';
+if ($sOutputFormat == 'json') {
+ echo javascript_renderData($aPolygons);
+} else {
+ include(CONST_BasePath.'/lib/template/polygons-html.php');
}
-echo '
';
-
-?>
-
-