Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/NominatimTest.php b/test/php/Nominatim/NominatimTest.php
index f8ba14c16b3f955c90a7483d00e091289af72771..cae3ebb8922aed337871775fa22a54877574a5ea 100644 (file)
--- a/test/php/Nominatim/NominatimTest.php
+++ b/test/php/Nominatim/NominatimTest.php
@@ -2,7 +2,7 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require '../../lib/lib.php';
+require_once '../../lib/lib.php';

 
 class NominatimTest extends \PHPUnit_Framework_TestCase
 {
 
 class NominatimTest extends \PHPUnit_Framework_TestCase
 {


@@ -66,132 +66,6 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
     }
 
 
     }
 
 

-    public function testLooksLikeLatLonPair()
-    {
-        // no coordinates expected
-        $this->assertNull(looksLikeLatLonPair(''));
-        $this->assertNull(looksLikeLatLonPair('abc'));
-        $this->assertNull(looksLikeLatLonPair('12 34'));
-        $this->assertNull(looksLikeLatLonPair('200.1 89.9')); // because latitude > 180
-
-        // coordinates expected
-        $this->assertNotNull(looksLikeLatLonPair('0.0 -0.0'));
-
-        $this->assertEquals(
-            array( 'lat' => 12.456, 'lon' => -78.90, 'query' => 'abc   def'),
-            looksLikeLatLonPair(' abc 12.456 -78.90 def ')
-        );
-
-        $this->assertEquals(
-            array( 'lat' => 12.456, 'lon' => -78.90, 'query' => ''),
-            looksLikeLatLonPair(' [12.456,-78.90] ')
-        );
-
-        // http://en.wikipedia.org/wiki/Geographic_coordinate_conversion
-        // these all represent the same location
-        $aQueries = array(
-                     '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'",
- 
-                     '40 26 46 N 79 58 56 W',
-                     '40° 26′ 46″ N 79° 58′ 56″ W',
-                     '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° N 79.982° W',
-                     'N 40.446° W 79.982°',
- 
-                     '[40.446 -79.982]',
-                     '       40.446  ,   -79.982     ',
-                    );
-
-
-        foreach ($aQueries as $sQuery) {
-            $aRes = looksLikeLatLonPair($sQuery);
-            $this->assertEquals(40.446, $aRes['lat'], 'degrees decimal ' . $sQuery, 0.01);
-            $this->assertEquals(-79.982, $aRes['lon'], 'degrees decimal ' . $sQuery, 0.01);
-        }
-    }
-
-
-
-    public function testGetWordSets()
-    {
-        // given an array of arrays like
-        // array( array('a','b'), array('c','d') )
-        // returns a summary as string: '(a|b),(c|d)'
-
-
-        function serializeSets($aSets)
-        {
-            $aParts = array();
-            foreach ($aSets as $aSet) {
-                $aParts[] = '(' . join('|', $aSet) . ')';
-            }
-            return join(',', $aParts);
-        }
-
-        $this->assertEquals(
-            array(array('')),
-            getWordSets(array(), 0)
-        );
-
-        $this->assertEquals(
-            '(a)',
-            serializeSets(getWordSets(array("a"), 0))
-        );
-
-        $this->assertEquals(
-            '(a b),(a|b)',
-            serializeSets(getWordSets(array('a', 'b'), 0))
-        );
-
-        $this->assertEquals(
-            '(a b c),(a|b c),(a|b|c),(a b|c)',
-            serializeSets(getWordSets(array('a', 'b', 'c'), 0))
-        );
-
-        $this->assertEquals(
-            '(a b c d),(a|b c d),(a|b|c d),(a|b|c|d),(a|b c|d),(a b|c d),(a b|c|d),(a b c|d)',
-            serializeSets(getWordSets(array('a', 'b', 'c', 'd'), 0))
-        );
-
-
-        // Inverse
-        $this->assertEquals(
-            '(a b c),(c|a b),(c|b|a),(b c|a)',
-            serializeSets(getInverseWordSets(array('a', 'b', 'c'), 0))
-        );
-
-
-        // make sure we don't create too many sets
-        // 4 words => 8 sets
-        // 10 words => 511 sets
-        // 15 words => 12911 sets
-        // 18 words => 65536 sets
-        // 20 words => 169766 sets
-        // 22 words => 401930 sets
-        // 28 words => 3505699 sets (needs more than 4GB via 'phpunit -d memory_limit=' to run)
-        $this->assertEquals(
-            8,
-            count(getWordSets(array_fill(0, 4, 'a'), 0))
-        );
-
-
-        $this->assertEquals(
-            41226,
-            count(getWordSets(array_fill(0, 18, 'a'), 0))
-        );
-    }
-
-

     public function testCreatePointsAroundCenter()
     {
         // you might say we're creating a circle
     public function testCreatePointsAroundCenter()
     {
         // you might say we're creating a circle


@@ -259,4 +133,63 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
             geometryText2Points('MULTIPOLYGON(((30 20, 45 40, 10 40, 30 20)),((15 5, 40 10, 10 20, 5 10, 15 5)))', $fRadius)
         );
     }
             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
+        $this->assertFalse(parseLatLon(''));
+        $this->assertFalse(parseLatLon('abc'));
+        $this->assertFalse(parseLatLon('12 34'));
+
+        // coordinates expected
+        $this->assertNotNull(parseLatLon('0.0 -0.0'));
+
+        $aRes = parseLatLon(' abc 12.456 -78.90 def ');
+        $this->assertEquals($aRes[1], 12.456);
+        $this->assertEquals($aRes[2], -78.90);
+        $this->assertEquals($aRes[0], ' 12.456 -78.90 ');
+
+        $aRes = parseLatLon(' [12.456,-78.90] ');
+        $this->assertEquals($aRes[1], 12.456);
+        $this->assertEquals($aRes[2], -78.90);
+        $this->assertEquals($aRes[0], ' [12.456,-78.90] ');
+
+        $aRes = parseLatLon(' -12.456,-78.90 ');
+        $this->assertEquals($aRes[1], -12.456);
+        $this->assertEquals($aRes[2], -78.90);
+        $this->assertEquals($aRes[0], ' -12.456,-78.90 ');
+
+        // http://en.wikipedia.org/wiki/Geographic_coordinate_conversion
+        // these all represent the same location
+        $aQueries = array(
+                     '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'",
+ 
+                     '40 26 46 N 79 58 56 W',
+                     '40° 26′ 46″ N 79° 58′ 56″ W',
+                     '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° N 79.982° W',
+                     'N 40.446° W 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->assertEquals($sQuery, $aRes[0]);
+        }
+    }

 }
 }