X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/78a29b5a876d0c7d4c8b9ccab9f45b15780b4a22..efddd1339de9876e4f1681ee0629bb09e76ae1a1:/website/polygons.php?ds=inline
diff --git a/website/polygons.php b/website/polygons.php
old mode 100755
new mode 100644
index 423374c7..e5d459f3
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,145 +1,136 @@
\'name\' as "name",';
- $sSQL .= 'country_code as "country",errormessage as "error message",updated';
- $sSQL .= " from import_polygon_error";
- if ($_GET['days'])
- {
- $sSQL .= " where updated > 'now'::timestamp - '".(int)$_GET['days']." day'::interval";
- $_GET['days']++;
- }
- 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 = $oDB->getAll($sSQL);
- }
-//var_dump($aPolygons);
+
+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 ($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;
+}
+
?>
-
-
-
- Nominatim Broken Polygon Data
-
-
+
+
+
+ Nominatim Broken Polygon Data
+
+
";
- echo "";
+echo "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':
- $sOSMType = ($aRow['type'] == 'N'?'node':($aRow['type'] == 'W'?'way':($aRow['type'] == 'R'?'relation':'')));
- echo ''.$aRow['id'].' | ';
- break;
- default:
- echo "".($sVal?$sVal:' ')." | ";
- break;
- }
- }
- echo "josm | ";
- if (isset($aRow['lat']))
- {
- echo "P2 | ";
- }
- else
- {
- echo " | ";
- }
- echo "
";
- }
- echo "
";
-
-
-
-// include(CONST_BasePath.'/lib/template/details-'.$sOutputFormat.'.php');
+foreach ($aPolygons[0] as $sCol => $sVal) {
+ echo ''.$sCol.' | ';
+}
+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 | ';
+ echo '
';
+}
+echo '';
+
?>