X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f0daf1137599f3ca76e87c0bbc73b7098d3069f8..72b01148d2d12f71c12440c15fa078b55e1c8f86:/test/php/Nominatim/LibTest.php

diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php
index 2891388d..5111b326 100644
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -2,6 +2,9 @@
 
 namespace Nominatim;
 
+require_once(CONST_LibDir.'/lib.php');
+require_once(CONST_LibDir.'/ClassTypes.php');
+
 class LibTest extends \PHPUnit\Framework\TestCase
 {
 
@@ -12,75 +15,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(
-             array('', 0, 2),
-             array('', 0.12558103905863, 1.9960534568565),
-             array('', 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(
-             array(10, 21),
-             array(10.062790519529, 20.998026728428),
-             array(10.125333233564, 20.992114701314)
-            ),
-            array_splice($aPoints, 0, 3)
-        );
-
-        // POLYGON
-        $this->assertEquals(
-            array(
-             array('30', '10'),
-             array('40', '40'),
-             array('20', '40'),
-             array('10', '20'),
-             array('30', '10')
-            ),
-            geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius)
-        );
-
-        // MULTIPOLYGON
-        $this->assertEquals(
-            array(
-             array('30', '20'), // first polygon only
-             array('45', '40'),
-             array('10', '40'),
-             array('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
@@ -112,8 +46,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',
@@ -123,6 +60,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',
@@ -130,14 +68,18 @@ 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]);
         }
     }