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 dca2107d7bc07771bf8e969a5094dc10132b2a75..28cd9af04896f4f58a8b59c326534c2fbf5f73b1 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -66,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',


@@ -77,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',


@@ -84,14 +88,18 @@ 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        ',

                     );
 
 
         foreach ($aQueries as $sQuery) {
             $aRes = parseLatLon($sQuery);
                     );
 
 
         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]);
         }
     }
             $this->assertEquals($sQuery, $aRes[0]);
         }
     }