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 ee6f94f237e83e0c09a66c760b6e476437b2c482..249adce28052ddb7ad3dd12a7b6e02039d04d634 100644 (file)
--- a/test/php/Nominatim/LibTest.php
+++ b/test/php/Nominatim/LibTest.php
@@ -1,55 +1,20 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once '../../lib/lib.php';
+require_once(CONST_LibDir.'/lib.php');
+require_once(CONST_LibDir.'/ClassTypes.php');

 
 

-class LibTest extends \PHPUnit_Framework_TestCase
+class LibTest extends \PHPUnit\Framework\TestCase

 {
 {

-    public function testGetClassTypesWithImportance()
-    {
-        $aClasses = getClassTypesWithImportance();
-
-        $this->assertGreaterThan(
-            200,
-            count($aClasses)
-        );
-
-        $this->assertEquals(
-            array(
-             'label' => 'Country',
-             'frequency' => 0,
-             'icon' => 'poi_boundary_administrative',
-             'defzoom' => 6,
-             'defdiameter' => 15,
-             'importance' => 3
-            ),
-            $aClasses['place:country']
-        );
-    }
-
-
-    public function testGetResultDiameter()
-    {
-        $aResult = array();
-        $this->assertEquals(
-            0.0001,
-            getResultDiameter($aResult)
-        );
-
-        $aResult = array('class' => 'place', 'type' => 'country');
-        $this->assertEquals(
-            15,
-            getResultDiameter($aResult)
-        );
-
-        $aResult = array('class' => 'boundary', 'type' => 'administrative', 'admin_level' => 6);
-        $this->assertEquals(
-            0.32,
-            getResultDiameter($aResult)
-        );
-    }
-

 
     public function testAddQuotes()
     {
 
     public function testAddQuotes()
     {


@@ -58,75 +23,6 @@ class LibTest extends \PHPUnit_Framework_TestCase
         $this->assertSame("''", addQuotes(''));
     }
 
         $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(
-             ['', 0, 2],
-             ['', 0.12558103905863, 1.9960534568565],
-             ['', 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(
-             [10, 21],
-             [10.062790519529, 20.998026728428],
-             [10.125333233564, 20.992114701314]
-            ),
-            array_splice($aPoints, 0, 3)
-        );
-
-        // POLYGON
-        $this->assertEquals(
-            array(
-             ['30', '10'],
-             ['40', '40'],
-             ['20', '40'],
-             ['10', '20'],
-             ['30', '10']
-            ),
-            geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius)
-        );
-
-        // MULTIPOLYGON
-        $this->assertEquals(
-            array(
-             ['30', '20'], // first polygon only
-             ['45', '40'],
-             ['10', '40'],
-             ['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


@@ -158,8 +54,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',


@@ -169,6 +68,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',


@@ -176,29 +76,33 @@ 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]);
         }
     }
 
     private function closestHouseNumberEvenOddOther($startnumber, $endnumber, $fraction, $aExpected)
     {
             $this->assertEquals($sQuery, $aRes[0]);
         }
     }
 
     private function closestHouseNumberEvenOddOther($startnumber, $endnumber, $fraction, $aExpected)
     {

-        foreach (['even', 'odd', 'other'] as $itype) {
+        foreach (array('even', 'odd', 'other') as $itype) {

             $this->assertEquals(
                 $aExpected[$itype],
             $this->assertEquals(
                 $aExpected[$itype],

-                closestHouseNumber([
+                closestHouseNumber(array(

                                     'startnumber' => $startnumber,
                                     'endnumber' => $endnumber,
                                     'fraction' => $fraction,
                                     'interpolationtype' => $itype
                                     'startnumber' => $startnumber,
                                     'endnumber' => $endnumber,
                                     'fraction' => $fraction,
                                     'interpolationtype' => $itype

-                                   ]),
+                                   )),

                 "$startnumber => $endnumber, $fraction, $itype"
             );
         }
                 "$startnumber => $endnumber, $fraction, $itype"
             );
         }


@@ -206,14 +110,14 @@ class LibTest extends \PHPUnit_Framework_TestCase
 
     public function testClosestHouseNumber()
     {
 
     public function testClosestHouseNumber()
     {

-        $this->closestHouseNumberEvenOddOther(50, 100, 0.5, ['even' => 76, 'odd' => 75, 'other' => 75]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 0.5, array('even' => 76, 'odd' => 75, 'other' => 75));

         // upper bound
         // upper bound

-        $this->closestHouseNumberEvenOddOther(50, 100, 1.5, ['even' => 100, 'odd' => 100, 'other' => 100]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 1.5, array('even' => 100, 'odd' => 100, 'other' => 100));

         // lower bound
         // lower bound

-        $this->closestHouseNumberEvenOddOther(50, 100, -0.5, ['even' => 50, 'odd' => 50, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 100, -0.5, array('even' => 50, 'odd' => 50, 'other' => 50));

         // fraction 0
         // fraction 0

-        $this->closestHouseNumberEvenOddOther(50, 100, 0, ['even' => 50, 'odd' => 51, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 100, 0, array('even' => 50, 'odd' => 51, 'other' => 50));

         // start == end
         // start == end

-        $this->closestHouseNumberEvenOddOther(50, 50, 0.5, ['even' => 50, 'odd' => 50, 'other' => 50]);
+        $this->closestHouseNumberEvenOddOther(50, 50, 0.5, array('even' => 50, 'odd' => 50, 'other' => 50));

     }
 }
     }
 }