Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / php / Nominatim / LibTest.php

diff --git a/test/php/Nominatim/LibTest.php b/test/php/Nominatim/LibTest.php
index a80ef73b6fd53f65eca9cfc0d062432f3fa7a9cd..7e8cbcc345dc98f9e3ea022a2cb34b2c9e56f289 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -35,55 +35,6 @@ class LibTest extends \PHPUnit\Framework\TestCase
         );
     }
 
         );
     }
 

-
-    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
     public function testParseLatLon()
     {
         // no coordinates expected


@@ -115,8 +66,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',
                      '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′',

+                     ' N 40°26.767′, W 79°58.933′',

                      "N 40°26.767', W 79°58.933'",
  
                      '40 26 46 N 79 58 56 W',
                      "N 40°26.767', W 79°58.933'",
  
                      '40 26 46 N 79 58 56 W',


@@ -126,6 +80,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',
                      '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',
  
                      '40.446 -79.982',
                      '40.446,-79.982',


@@ -133,7 +88,11 @@ class LibTest extends \PHPUnit\Framework\TestCase
                      'N 40.446° W 79.982°',
  
                      '[40.446 -79.982]',
                      'N 40.446° W 79.982°',
  
                      '[40.446 -79.982]',

+                     '[40.446,\v-79.982]',
+                     '       40.446  ,   -79.982     ',

                      '       40.446  ,   -79.982     ',
                      '       40.446  ,   -79.982     ',

+                     '       40.446    ,   -79.982     ',
+                     '       40.446\v,   -79.982        ',

                     );
 
 
                     );