]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 320d46c)
Add JSON output for /deletable.php and /polygons.php
authormarc tobias <mtmail@gmx.net>
Fri, 10 Apr 2020 01:21:52 +0000 (03:21 +0200)
committermarc tobias <mtmail@gmx.net>
Fri, 10 Apr 2020 13:34:56 +0000 (15:34 +0200)
lib/template/deletable-html.php [new file with mode: 0644] patch | blob
lib/template/polygons-html.php [new file with mode: 0644] patch | blob
website/deletable.php patch | blob | history
website/polygons.php patch | blob | history

diff --git a/lib/template/deletable-html.php b/lib/template/deletable-html.php
new file mode 100644 (file)
index 0000000..8cc53e8
--- /dev/null
+++ b/lib/template/deletable-html.php
@@ -0,0 +1,48 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+    include(CONST_BasePath.'/lib/template/includes/html-header.php');
+?>
+    <title>Nominatim Deleted Data</title>    
+    <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
+</head>
+
+<body>
+<div class="container">
+    <h1>Deletable</h1>
+    <p>
+        <?php echo sizeof($aPolygons) ?> objects have been deleted in OSM but are still in the Nominatim database.
+        Also available in <a href="<?php echo CONST_Website_BaseURL; ?>deletable.php?format=json">JSON format</a>.
+    </p>
+
+    <table class="table table-striped table-hover">
+<?php
+
+if (!empty($aPolygons)) {
+    echo '<tr>';
+    foreach (array_keys($aPolygons[0]) as $sCol) {
+        echo '<th>'.$sCol.'</th>';
+    }
+    echo '</tr>';
+    foreach ($aPolygons as $aRow) {
+        echo '<tr>';
+        foreach ($aRow as $sCol => $sVal) {
+            switch ($sCol) {
+                case 'osm_id':
+                    echo '<td>'.osmLink($aRow).'</td>';
+                    break;
+                case 'place_id':
+                    echo '<td>'.detailsLink($aRow).'</td>';
+                    break;
+                default:
+                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    break;
+            }
+        }
+        echo '</tr>';
+    }
+}
+?>
+    </table>
+</div>
+</body>
+</html>
diff --git a/lib/template/polygons-html.php b/lib/template/polygons-html.php
new file mode 100644 (file)
index 0000000..7d485d9
--- /dev/null
+++ b/lib/template/polygons-html.php
@@ -0,0 +1,71 @@
+<?php
+    header("content-type: text/html; charset=UTF-8");
+    include(CONST_BasePath.'/lib/template/includes/html-header.php');
+?>
+    <title>Nominatim Broken Polygon Data</title>    
+    <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
+</head>
+
+<body>
+
+<div class="container">
+    <h1>Broken polygons</h1>
+
+    <p>
+        Total number of broken polygons: <?php echo $iTotalBroken ?>.
+        Also available in <a href="<?php echo CONST_Website_BaseURL; ?>polygons.php?format=json">JSON format</a>.
+    </p>
+
+    <table class="table table-striped table-hover">
+
+<?php
+if (!empty($aPolygons)) {
+
+    echo '<tr>';
+    //var_dump($aPolygons[0]);
+    foreach (array_keys($aPolygons[0]) as $sCol) {
+        echo '<th>'.$sCol.'</th>';
+    }
+    echo '<th>&nbsp;</th>';
+    echo '</tr>';
+    $aSeen = array();
+    foreach ($aPolygons as $aRow) {
+        if (isset($aSeen[$aRow['osm_type'].$aRow['osm_id']])) continue;
+        $aSeen[$aRow['osm_type'].$aRow['osm_id']] = 1;
+
+        echo '<tr>';
+        $sOSMType = formatOSMType($aRow['osm_type']);
+        foreach ($aRow as $sCol => $sVal) {
+            switch ($sCol) {
+                case 'errormessage':
+                    if (preg_match('/Self-intersection\\[([0-9.\\-]+) ([0-9.\\-]+)\\]/', $sVal, $aMatch)) {
+                        $aRow['lat'] = $aMatch[2];
+                        $aRow['lon'] = $aMatch[1];
+                        $sUrl = sprintf('https://www.openstreetmap.org/?lat=%f&lon=%f&zoom=18&layers=M&%s=%d',
+                                $aRow['lat'],
+                                $aRow['lon'],
+                                $sOSMType,
+                                $aRow['osm_id']);
+                        echo '<td><a href="'.$sUrl.'">'.($sVal?$sVal:'&nbsp;').'</a></td>';
+                    } else {
+                        echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    }
+                    break;
+                case 'osm_id':
+                    echo '<td>'.osmLink(array('osm_type' => $aRow['osm_type'], 'osm_id' => $aRow['osm_id'])).'</td>';
+                    break;
+                default:
+                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
+                    break;
+            }
+        }
+        $sJosmUrl = 'http://localhost:8111/import?url=https://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['osm_id'].'/full';
+        echo '<td><a href="'.$sJosmUrl.'" target="josm">josm</a></td>';
+        echo '</tr>';
+    }
+    echo '</table>';
+}
+?>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/website/deletable.php b/website/deletable.php
index ac4294bab6d8a293367cb9b6652c5601ce257c7f..2d7ee7e9b804db7d94b82a8f5f7227d33dda2248 100644 (file)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -5,7 +5,9 @@ require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
 require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
-$sOutputFormat = 'html';
+$oParams = new Nominatim\ParameterParser();
+$sOutputFormat = $oParams->getSet('format', array('html', 'json'), 'html');
+set_exception_handler_by_format($sOutputFormat);
 
 $oDB = new Nominatim\DB();
 $oDB->connect();
 
 $oDB = new Nominatim\DB();
 $oDB->connect();
@@ -21,86 +23,8 @@ if (CONST_Debug) {
     exit;
 }
 
     exit;
 }
 
-?>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-    
-    <title>Nominatim Deleted Data</title>
-    
-    <meta name="description" content="List of OSM data that has been deleted" lang="en-US" />
-
-</head>
-
-<body>
-<style type="text/css">
-table {
-    border-width: 1px;
-    border-spacing: 0px;
-    border-style: solid;
-    border-color: gray;
-    border-collapse: collapse;
-    background-color: white;
-    margin: 10px;
-}
-table th {
-    border-width: 1px;
-    padding: 2px;
-    border-style: inset;
-    border-color: gray;
-    border-left-color: #ddd;
-    border-right-color: #ddd;
-    background-color: #eee;
-    -moz-border-radius: 0px 0px 0px 0px;
-}
-table td {
-    border-width: 1px;
-    padding: 2px;
-    border-style: inset;
-    border-color: gray;
-    border-left-color: #ddd;
-    border-right-color: #ddd;
-    background-color: white;
-    -moz-border-radius: 0px 0px 0px 0px;
-}
-</style>
-
-<p>Objects in this table have been deleted in OSM but are still in the Nominatim database.</p>
-
-<table>
-<?php
-
-if (!$aPolygons) exit;
-echo '<tr>';
-// var_dump($aPolygons[0]);
-foreach ($aPolygons[0] as $sCol => $sVal) {
-    echo '<th>'.$sCol.'</th>';
+if ($sOutputFormat == 'json') {
+    echo javascript_renderData($aPolygons);
+} else {
+    include(CONST_BasePath.'/lib/template/deletable-html.php');
 }
 }
-echo '</tr>';
-foreach ($aPolygons as $aRow) {
-    echo '<tr>';
-    foreach ($aRow as $sCol => $sVal) {
-        switch ($sCol) {
-            case 'osm_id':
-                echo '<td>'.osmLink($aRow).'</td>';
-                break;
-            case 'place_id':
-                echo '<td>'.detailsLink($aRow).'</td>';
-                break;
-            default:
-                echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
-                break;
-        }
-    }
-    echo '</tr>';
-}
-
-?>
-</table>
-
-
-
-</body>
-</html>
diff --git a/website/polygons.php b/website/polygons.php
index 29fc5c2760a18f6abaaa34319b35efa0d729ac60..c5fbafc22a44f635ccee70131561db5cbc783b4b 100644 (file)
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -6,8 +6,9 @@ require_once(CONST_BasePath.'/lib/output.php');
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
 ini_set('memory_limit', '200M');
 
 $oParams = new Nominatim\ParameterParser();
+$sOutputFormat = $oParams->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);
 $iDays = $oParams->getInt('days', false);
 $bReduced = $oParams->getBool('reduced', false);
 $sClass = $oParams->getString('class', false);
@@ -15,13 +16,13 @@ $sClass = $oParams->getString('class', false);
 $oDB = new Nominatim\DB();
 $oDB->connect();
 
 $oDB = new Nominatim\DB();
 $oDB->connect();
 
-$iTotalBroken = (int) $oDB->getOne('select count(*) from import_polygon_error');
+$iTotalBroken = (int) $oDB->getOne('SELECT count(*) FROM import_polygon_error');
 
 $aPolygons = array();
 while ($iTotalBroken && empty($aPolygons)) {
 
 $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';
+    $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 = array();
     if ($iDays) {
@@ -33,10 +34,10 @@ while ($iTotalBroken && empty($aPolygons)) {
     if ($sClass) $sWhere[] = "class = '".pg_escape_string($sClass)."'";
 
     if (!empty($aWhere)) {
     if ($sClass) $sWhere[] = "class = '".pg_escape_string($sClass)."'";
 
     if (!empty($aWhere)) {
-        $sSQL .= ' where '.join(' and ', $aWhere);
+        $sSQL .= ' WHERE '.join(' and ', $aWhere);
     }
 
     }
 
-    $sSQL .= ' order by updated desc limit 1000';
+    $sSQL .= ' ORDER BY updated desc LIMIT 1000';
     $aPolygons = $oDB->getAll($sSQL);
 }
 
     $aPolygons = $oDB->getAll($sSQL);
 }
 
@@ -45,93 +46,8 @@ if (CONST_Debug) {
     exit;
 }
 
     exit;
 }
 
-?>
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
-    
-    <title>Nominatim Broken Polygon Data</title>
-    
-    <meta name="description" content="List of broken OSM polygon data by date" lang="en-US" />
-
-</head>
-
-<body>
-<style type="text/css">
-table {
-    border-width: 1px;
-    border-spacing: 0px;
-    border-style: solid;
-    border-color: gray;
-    border-collapse: collapse;
-    background-color: white;
-    margin: 10px;
-}
-table th {
-    border-width: 1px;
-    padding: 2px;
-    border-style: inset;
-    border-color: gray;
-    border-left-color: #ddd;
-    border-right-color: #ddd;
-    background-color: #eee;
-    -moz-border-radius: 0px 0px 0px 0px;
+if ($sOutputFormat == 'json') {
+    echo javascript_renderData($aPolygons);
+} else {
+    include(CONST_BasePath.'/lib/template/polygons-html.php');
 }
 }
-table td {
-    border-width: 1px;
-    padding: 2px;
-    border-style: inset;
-    border-color: gray;
-    border-left-color: #ddd;
-    border-right-color: #ddd;
-    background-color: white;
-    -moz-border-radius: 0px 0px 0px 0px;
-}
-</style>
-
-<?php
-
-echo "<p>Total number of broken polygons: $iTotalBroken</p>";
-if (!$aPolygons) exit;
-echo '<table>';
-echo '<tr>';
-//var_dump($aPolygons[0]);
-foreach ($aPolygons[0] as $sCol => $sVal) {
-    echo '<th>'.$sCol.'</th>';
-}
-echo '<th>&nbsp;</th>';
-echo '</tr>';
-$aSeen = array();
-foreach ($aPolygons as $aRow) {
-    if (isset($aSeen[$aRow['type'].$aRow['id']])) continue;
-    $aSeen[$aRow['type'].$aRow['id']] = 1;
-    echo '<tr>';
-    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 '<td><a href="https://www.openstreetmap.org/?lat='.$aMatch[2].'&lon='.$aMatch[1].'&zoom=18&layers=M&'.$sOSMType.'='.$aRow['id'].'">'.($sVal?$sVal:'&nbsp;').'</a></td>';
-                } else {
-                    echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
-                }
-                break;
-            case 'id':
-                echo '<td>'.osmLink(array('osm_type' => $aRow['type'], 'osm_id' => $aRow['id'])).'</td>';
-                break;
-            default:
-                echo '<td>'.($sVal?$sVal:'&nbsp;').'</td>';
-                break;
-        }
-    }
-    echo '<td><a href="http://localhost:8111/import?url=https://www.openstreetmap.org/api/0.6/'.$sOSMType.'/'.$aRow['id'].'/full" target="josm">josm</a></td>';
-    echo '</tr>';
-}
-echo '</table>';
-
-?>
-</body>
-</html>
Open Source search based on OpenStreetMap data