X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/99d52aed1b5c07459fa5c99e2eef114d612c7c0e..12168e3ca9421ab1d0195507919c26ce029ce155:/test/php/Nominatim/NominatimTest.php?ds=sidebyside

diff --git a/test/php/Nominatim/NominatimTest.php b/test/php/Nominatim/NominatimTest.php
index 33bb6d32..ed738c37 100644
--- a/test/php/Nominatim/NominatimTest.php
+++ b/test/php/Nominatim/NominatimTest.php
@@ -24,9 +24,9 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             array(
-             'label' => "Country",
+             'label' => 'Country',
              'frequency' => 0,
-             'icon' => "poi_boundary_administrative",
+             'icon' => 'poi_boundary_administrative',
              'defzoom' => 6,
              'defdiameter' => 15,
              'importance' => 3
@@ -66,76 +66,6 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
     }
 
 
-    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
@@ -241,6 +171,8 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
  
                      '40 26 46 N 79 58 56 W',
                      '40° 26′ 46″ N 79° 58′ 56″ W',
+                     '40° 26′ 46.00″ N 79° 58′ 56.00″ 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"',
@@ -262,4 +194,33 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
             $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]);
+    }
 }