X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/d183cd3c7836e55fc9d82574c04b8e605f92d662..3a8ddf736edf4d2fc1d772179600417adc357bbb:/test/php/Nominatim/LibTest.php diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php index ee6f94f2..5d711240 100644 --- a/test/php/Nominatim/LibTest.php +++ b/test/php/Nominatim/LibTest.php @@ -1,55 +1,20 @@ assertGreaterThan( - 200, - count($aClasses) - ); - - $this->assertEquals( - array( - 'label' => 'Country', - 'frequency' => 0, - 'icon' => 'poi_boundary_administrative', - 'defzoom' => 6, - 'defdiameter' => 15, - 'importance' => 3 - ), - $aClasses['place:country'] - ); - } - - - public function testGetResultDiameter() - { - $aResult = array(); - $this->assertEquals( - 0.0001, - getResultDiameter($aResult) - ); - - $aResult = array('class' => 'place', 'type' => 'country'); - $this->assertEquals( - 15, - getResultDiameter($aResult) - ); - - $aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6); - $this->assertEquals( - 0.32, - getResultDiameter($aResult) - ); - } - public function testAddQuotes() { @@ -58,75 +23,6 @@ class LibTest extends \PHPUnit_Framework_TestCase $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( - ['', 0, 2], - ['', 0.12558103905863, 1.9960534568565], - ['', 0.25066646712861, 1.984229402629] - ), - array_splice($aPoints, 0, 3) - ); - } - - - public function testGeometryText2Points() - { - $fRadius = 1; - // invalid value - $this->assertEquals( - null, - geometryText2Points('', $fRadius) - ); - - // POINT - $aPoints = geometryText2Points('POINT(10 20)', $fRadius); - $this->assertEquals( - 101, - count($aPoints) - ); - $this->assertEquals( - array( - [10, 21], - [10.062790519529, 20.998026728428], - [10.125333233564, 20.992114701314] - ), - array_splice($aPoints, 0, 3) - ); - - // POLYGON - $this->assertEquals( - array( - ['30', '10'], - ['40', '40'], - ['20', '40'], - ['10', '20'], - ['30', '10'] - ), - geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius) - ); - - // MULTIPOLYGON - $this->assertEquals( - array( - ['30', '20'], // first polygon only - ['45', '40'], - ['10', '40'], - ['30', '20'], - ), - geometryText2Points('MULTIPOLYGON(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))', $fRadius) - ); - } - public function testParseLatLon() { // no coordinates expected @@ -158,8 +54,11 @@ class LibTest extends \PHPUnit_Framework_TestCase '40 26.767 N 79 58.933 W', '40° 26.767′ N 79° 58.933′ W', "40° 26.767' N 79° 58.933' W", + "40° 26.767' + N 79° 58.933' W", 'N 40 26.767, W 79 58.933', 'N 40°26.767′, W 79°58.933′', + ' N 40°26.767′, W 79°58.933′', "N 40°26.767', W 79°58.933'", '40 26 46 N 79 58 56 W', @@ -169,6 +68,7 @@ class LibTest extends \PHPUnit_Framework_TestCase 'N 40 26 46 W 79 58 56', 'N 40° 26′ 46″, W 79° 58′ 56″', 'N 40° 26\' 46", W 79° 58\' 56"', + 'N 40° 26\' 46", W 79° 58\' 56"', '40.446 -79.982', '40.446,-79.982', @@ -176,44 +76,19 @@ class LibTest extends \PHPUnit_Framework_TestCase 'N 40.446° W 79.982°', '[40.446 -79.982]', + '[40.446, -79.982]', ' 40.446 , -79.982 ', + ' 40.446 , -79.982 ', + ' 40.446 , -79.982 ', + ' 40.446 , -79.982 ', ); foreach ($aQueries as $sQuery) { $aRes = parseLatLon($sQuery); - $this->assertEquals(40.446, $aRes[1], 'degrees decimal ' . $sQuery, 0.01); - $this->assertEquals(-79.982, $aRes[2], 'degrees decimal ' . $sQuery, 0.01); + $this->assertEqualsWithDelta(40.446, $aRes[1], 0.01, 'degrees decimal ' . $sQuery); + $this->assertEqualsWithDelta(-79.982, $aRes[2], 0.01, 'degrees decimal ' . $sQuery); $this->assertEquals($sQuery, $aRes[0]); } } - - private function closestHouseNumberEvenOddOther($startnumber, $endnumber, $fraction, $aExpected) - { - foreach (['even', 'odd', 'other'] as $itype) { - $this->assertEquals( - $aExpected[$itype], - closestHouseNumber([ - 'startnumber' => $startnumber, - 'endnumber' => $endnumber, - 'fraction' => $fraction, - 'interpolationtype' => $itype - ]), - "$startnumber => $endnumber, $fraction, $itype" - ); - } - } - - public function testClosestHouseNumber() - { - $this->closestHouseNumberEvenOddOther(50, 100, 0.5, ['even' => 76, 'odd' => 75, 'other' => 75]); - // upper bound - $this->closestHouseNumberEvenOddOther(50, 100, 1.5, ['even' => 100, 'odd' => 100, 'other' => 100]); - // lower bound - $this->closestHouseNumberEvenOddOther(50, 100, -0.5, ['even' => 50, 'odd' => 50, 'other' => 50]); - // fraction 0 - $this->closestHouseNumberEvenOddOther(50, 100, 0, ['even' => 50, 'odd' => 51, 'other' => 50]); - // start == end - $this->closestHouseNumberEvenOddOther(50, 50, 0.5, ['even' => 50, 'odd' => 50, 'other' => 50]); - } }