remove unused code

diff --git a/lib-php/DB.php b/lib-php/DB.php
index 0454a0ff6190567f57acd6d19f46817759ebf7b4..c25c5ca921ae22152a28140ec1cb1540ce8d7e79 100644 (file)
--- a/lib-php/DB.php
+++ b/lib-php/DB.php
@@ -240,16 +240,6 @@ class DB
         return ($this->getOne($sSQL, array(':tablename' => $sTableName)) == 1);
     }
 
         return ($this->getOne($sSQL, array(':tablename' => $sTableName)) == 1);
     }
 

-    /**
-    * Returns a list of table names in the database
-    *
-    * @return array[]
-    */
-    public function getListOfTables()
-    {
-        return $this->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
-    }
-

     /**
      * Deletes a table. Returns true if deleted or didn't exist.
      *
     /**
      * Deletes a table. Returns true if deleted or didn't exist.
      *

diff --git a/lib-php/lib.php b/lib-php/lib.php
index 6798e74997668896796803f07f2ac0c051029968..89b54363cbd44241612ae4c3f776e80f06648889 100644 (file)
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -226,17 +226,6 @@ function parseLatLon($sQuery)
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 
     return array($sFound, $fQueryLat, $fQueryLon);
 }
 

-function createPointsAroundCenter($fLon, $fLat, $fRadius)
-{
-    $iSteps = max(8, min(100, ($fRadius * 40000)^2));
-    $fStepSize = (2*pi())/$iSteps;
-    $aPolyPoints = array();
-    for ($f = 0; $f < 2*pi(); $f += $fStepSize) {
-        $aPolyPoints[] = array('', $fLon+($fRadius*sin($f)), $fLat+($fRadius*cos($f)) );
-    }
-    return $aPolyPoints;
-}
-

 function closestHouseNumber($aRow)
 {
     $fHouse = $aRow['startnumber']
 function closestHouseNumber($aRow)
 {
     $fHouse = $aRow['startnumber']


@@ -256,25 +245,3 @@ function closestHouseNumber($aRow)
 
     return max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);
 }
 
     return max(min($aRow['endnumber'], $iHn), $aRow['startnumber']);
 }

-
-function getSearchRankLabel($iRank)
-{
-    if (!isset($iRank)) return 'unknown';
-    if ($iRank < 2) return 'continent';
-    if ($iRank < 4) return 'sea';
-    if ($iRank < 8) return 'country';
-    if ($iRank < 12) return 'state';
-    if ($iRank < 16) return 'county';
-    if ($iRank == 16) return 'city';
-    if ($iRank == 17) return 'town / island';
-    if ($iRank == 18) return 'village / hamlet';
-    if ($iRank == 20) return 'suburb';
-    if ($iRank == 21) return 'postcode area';
-    if ($iRank == 22) return 'croft / farm / locality / islet';
-    if ($iRank == 23) return 'postcode area';
-    if ($iRank == 25) return 'postcode point';
-    if ($iRank == 26) return 'street / major landmark';
-    if ($iRank == 27) return 'minory street / path';
-    if ($iRank == 28) return 'house / building';
-    return 'other: ' . $iRank;
-}

diff --git a/lib-php/website/details.php b/lib-php/website/details.php
index 91440b542a863c0c294337c174af54c9678bc115..8e350a8c65a86fb2121482985b16dede2ee7d1e1 100644 (file)
--- a/lib-php/website/details.php
+++ b/lib-php/website/details.php
@@ -144,7 +144,6 @@ if (!$aPointDetails) {
 }
 
 $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];
 }
 
 $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber'];

-$aPointDetails['rank_search_label'] = getSearchRankLabel($aPointDetails['rank_search']); // only used in HTML format

 
 // Get all alternative names (languages, etc)
 $sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex ';
 
 // Get all alternative names (languages, etc)
 $sSQL = 'SELECT (each(name)).key,(each(name)).value FROM placex ';

diff --git a/test/php/Nominatim/DBTest.php b/test/php/Nominatim/DBTest.php
index 8a3157a8b5098e8ef30cbb571fbbff4f094c1f4b..c5f4f3954d39df65d4cd37ffc29fb66f808db672 100644 (file)
--- a/test/php/Nominatim/DBTest.php
+++ b/test/php/Nominatim/DBTest.php
@@ -159,19 +159,7 @@ class DBTest extends \PHPUnit\Framework\TestCase
 
         # Tables, Indices
         {
 
         # Tables, Indices
         {

-            $this->assertEmpty($oDB->getListOfTables());

             $oDB->exec('CREATE TABLE table1 (id integer, city varchar, country varchar)');
             $oDB->exec('CREATE TABLE table1 (id integer, city varchar, country varchar)');

-            $oDB->exec('CREATE TABLE table2 (id integer, city varchar, country varchar)');
-            $this->assertEquals(
-                array('table1', 'table2'),
-                $oDB->getListOfTables()
-            );
-            $this->assertTrue($oDB->deleteTable('table2'));
-            $this->assertTrue($oDB->deleteTable('table99'));
-            $this->assertEquals(
-                array('table1'),
-                $oDB->getListOfTables()
-            );

 
             $this->assertTrue($oDB->tableExists('table1'));
             $this->assertFalse($oDB->tableExists('table99'));
 
             $this->assertTrue($oDB->tableExists('table1'));
             $this->assertFalse($oDB->tableExists('table99'));

diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php
index 6e9038eecdd0d1c741b768572fffd658a916e822..5111b32641901d8fc9db42007acb4ce70d8a5e5e 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -15,26 +15,6 @@ class LibTest extends \PHPUnit\Framework\TestCase
         $this->assertSame("''", addQuotes(''));
     }
 
         $this->assertSame("''", addQuotes(''));
     }
 

-
-    public function testCreatePointsAroundCenter()
-    {
-        // you might say we're creating a circle
-        $aPoints = createPointsAroundCenter(0, 0, 2);
-
-        $this->assertEquals(
-            101,
-            count($aPoints)
-        );
-        $this->assertEquals(
-            array(
-             array('', 0, 2),
-             array('', 0.12558103905863, 1.9960534568565),
-             array('', 0.25066646712861, 1.984229402629)
-            ),
-            array_splice($aPoints, 0, 3)
-        );
-    }
-

     public function testParseLatLon()
     {
         // no coordinates expected
     public function testParseLatLon()
     {
         // no coordinates expected


@@ -132,12 +112,4 @@ class LibTest extends \PHPUnit\Framework\TestCase
         // start == end
         $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50));
     }
         // start == end
         $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50));
     }

-
-    public function testGetSearchRankLabel()
-    {
-        $this->assertEquals('unknown', getSearchRankLabel(null));
-        $this->assertEquals('continent', getSearchRankLabel(0));
-        $this->assertEquals('continent', getSearchRankLabel(1));
-        $this->assertEquals('other: 30', getSearchRankLabel(30));
-    }

 }
 }