Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / deletable.php
diff --git a/website/deletable.php b/website/deletable.php

index 6d57262d741386061d6a952604b47838d322d366..95000032f390aa841aab19b33cab6fbaf3751f7c 100755 (executable)
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,23 +1,26 @@
  <?php
-    require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-    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');
  
-    $sOutputFormat = 'html';
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+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');
  
-    $oDB =& getDB();
+$sOutputFormat = 'html';
  
-    $sSQL = "select placex.place_id, calculated_country_code as country_code, name->'name' as name, i.* from placex, import_polygon_delete i where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type and placex.class = i.class and placex.type = i.type";
-    $aPolygons = chksql($oDB->getAll($sSQL),
-                        "Could not get list of deleted OSM elements.");
+$oDB =& getDB();
+
+$sSQL = "select placex.place_id, country_code,";
+$sSQL .= " name->'name' as name, i.* from placex, import_polygon_delete i";
+$sSQL .= " where placex.osm_id = i.osm_id and placex.osm_type = i.osm_type";
+$sSQL .= " and placex.class = i.class and placex.type = i.type";
+$aPolygons = chksql($oDB->getAll($sSQL), "Could not get list of deleted OSM elements.");
+
+if (CONST_Debug) {
+    var_dump($aPolygons);
+    exit;
+}
  
-    if (CONST_DEBUG)
-    {
-        var_dump($aPolygons);
-        exit;
-    }
  ?>
  <!DOCTYPE html>
  <html>
@@ -68,34 +71,32 @@ table td {
  
  <table>
  <?php
-    if (!$aPolygons) exit;
+
+if (!$aPolygons) exit;
+echo "<tr>";
+// var_dump($aPolygons[0]);
+foreach ($aPolygons[0] as $sCol => $sVal) {
+    echo "<th>".$sCol."</th>";
+}
+echo "</tr>";
+foreach ($aPolygons as $aRow) {
      echo "<tr>";
-//var_dump($aPolygons[0]);
-    foreach($aPolygons[0] as $sCol => $sVal)
-    {
-        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;
-            }
+    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>";
      }
+    echo "</tr>";
+}
+
  ?>
  </table>