mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-14 18:37:58 +00:00
fix PSR2 warnings in php tests
This commit is contained in:
Marc Tobias Metten
@@ -1,18 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Nominatim;
|
||||
require '../lib/lib.php';
|
||||
|
||||
require '../lib/lib.php';
|
||||
|
||||
class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
public function test_getClassTypesWithImportance()
|
||||
public function testGetClassTypesWithImportance()
|
||||
{
|
||||
$aClasses = getClassTypesWithImportance();
|
||||
|
||||
@@ -23,19 +24,19 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
array(
|
||||
'label' => "Country",
|
||||
'frequency' => 0,
|
||||
'icon' => "poi_boundary_administrative",
|
||||
'defzoom' => 6,
|
||||
'defdiameter' => 15,
|
||||
'importance' => 3
|
||||
'label' => "Country",
|
||||
'frequency' => 0,
|
||||
'icon' => "poi_boundary_administrative",
|
||||
'defzoom' => 6,
|
||||
'defdiameter' => 15,
|
||||
'importance' => 3
|
||||
),
|
||||
$aClasses['place:country']
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
public function test_getResultDiameter()
|
||||
public function testGetResultDiameter()
|
||||
{
|
||||
$aResult = array();
|
||||
$this->assertEquals(
|
||||
@@ -57,14 +58,15 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
|
||||
public function test_addQuotes()
|
||||
public function testAddQuotes()
|
||||
{
|
||||
// FIXME: not quoting existing quote signs is probably a bug
|
||||
$this->assertSame("'St. John's'", addQuotes("St. John's"));
|
||||
$this->assertSame("''", addQuotes(''));
|
||||
}
|
||||
|
||||
public function test_looksLikeLatLonPair()
|
||||
|
||||
public function testLooksLikeLatLonPair()
|
||||
{
|
||||
// no coordinates expected
|
||||
$this->assertNull(looksLikeLatLonPair(''));
|
||||
@@ -76,61 +78,61 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
$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 ')
|
||||
);
|
||||
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] ')
|
||||
);
|
||||
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 ',
|
||||
);
|
||||
'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){
|
||||
foreach ($aQueries as $sQuery) {
|
||||
$aRes = looksLikeLatLonPair($sQuery);
|
||||
$this->assertEquals( 40.446, $aRes['lat'], 'degrees decimal ' . $sQuery, 0.01);
|
||||
$this->assertEquals(40.446, $aRes['lat'], 'degrees decimal ' . $sQuery, 0.01);
|
||||
$this->assertEquals(-79.982, $aRes['lon'], 'degrees decimal ' . $sQuery, 0.01);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function test_getWordSets()
|
||||
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 serialize_sets($aSets)
|
||||
{
|
||||
|
||||
|
||||
function serializeSets($aSets)
|
||||
{
|
||||
$aParts = array();
|
||||
foreach($aSets as $aSet){
|
||||
foreach ($aSets as $aSet) {
|
||||
$aParts[] = '(' . join('|', $aSet) . ')';
|
||||
}
|
||||
return join(',', $aParts);
|
||||
@@ -138,34 +140,34 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertEquals(
|
||||
array(array('')),
|
||||
getWordSets(array(),0)
|
||||
getWordSets(array(), 0)
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
'(a)',
|
||||
serialize_sets( getWordSets(array("a"),0) )
|
||||
serializeSets(getWordSets(array("a"), 0))
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
'(a b),(a|b)',
|
||||
serialize_sets( getWordSets(array('a','b'),0) )
|
||||
serializeSets(getWordSets(array('a', 'b'), 0))
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
'(a b c),(a|b c),(a|b|c),(a b|c)',
|
||||
serialize_sets( getWordSets(array('a','b','c'),0) )
|
||||
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)',
|
||||
serialize_sets( getWordSets(array('a','b','c','d'),0) )
|
||||
serializeSets(getWordSets(array('a', 'b', 'c', 'd'), 0))
|
||||
);
|
||||
|
||||
|
||||
// Inverse
|
||||
$this->assertEquals(
|
||||
'(a b c),(c|a b),(c|b|a),(b c|a)',
|
||||
serialize_sets( getInverseWordSets(array('a','b','c'),0) )
|
||||
serializeSets(getInverseWordSets(array('a', 'b', 'c'), 0))
|
||||
);
|
||||
|
||||
|
||||
@@ -179,21 +181,20 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
// 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) )
|
||||
count(getWordSets(array_fill(0, 4, 'a'), 0))
|
||||
);
|
||||
|
||||
|
||||
$this->assertEquals(
|
||||
65536,
|
||||
count( getWordSets(array_fill( 0, 18, 'a'),0) )
|
||||
count(getWordSets(array_fill(0, 18, 'a'), 0))
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// you might say we're creating a circle
|
||||
public function test_createPointsAroundCenter()
|
||||
public function testCreatePointsAroundCenter()
|
||||
{
|
||||
// you might say we're creating a circle
|
||||
$aPoints = createPointsAroundCenter(0, 0, 2);
|
||||
|
||||
$this->assertEquals(
|
||||
@@ -202,20 +203,21 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
);
|
||||
$this->assertEquals(
|
||||
array(
|
||||
['', 0, 2],
|
||||
['', 0.12558103905863, 1.9960534568565],
|
||||
['', 0.25066646712861, 1.984229402629]
|
||||
['', 0, 2],
|
||||
['', 0.12558103905863, 1.9960534568565],
|
||||
['', 0.25066646712861, 1.984229402629]
|
||||
),
|
||||
array_splice($aPoints, 0, 3)
|
||||
);
|
||||
}
|
||||
|
||||
public function test_geometryText2Points()
|
||||
|
||||
public function testGeometryText2Points()
|
||||
{
|
||||
$fRadius = 1;
|
||||
// invalid value
|
||||
$this->assertEquals(
|
||||
NULL,
|
||||
null,
|
||||
geometryText2Points('', $fRadius)
|
||||
);
|
||||
|
||||
@@ -227,21 +229,21 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
);
|
||||
$this->assertEquals(
|
||||
array(
|
||||
[10, 21],
|
||||
[10.062790519529, 20.998026728428],
|
||||
[10.125333233564, 20.992114701314]
|
||||
[10, 21],
|
||||
[10.062790519529, 20.998026728428],
|
||||
[10.125333233564, 20.992114701314]
|
||||
),
|
||||
array_splice($aPoints, 0,3)
|
||||
array_splice($aPoints, 0, 3)
|
||||
);
|
||||
|
||||
// POLYGON
|
||||
$this->assertEquals(
|
||||
array(
|
||||
['30', '10'],
|
||||
['40', '40'],
|
||||
['20', '40'],
|
||||
['10', '20'],
|
||||
['30', '10']
|
||||
['30', '10'],
|
||||
['40', '40'],
|
||||
['20', '40'],
|
||||
['10', '20'],
|
||||
['30', '10']
|
||||
),
|
||||
geometryText2Points('POLYGON((30 10, 40 40, 20 40, 10 20, 30 10))', $fRadius)
|
||||
);
|
||||
@@ -249,13 +251,12 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
|
||||
// MULTIPOLYGON
|
||||
$this->assertEquals(
|
||||
array(
|
||||
['30', '20'], // first polygon only
|
||||
['45', '40'],
|
||||
['10', '40'],
|
||||
['30', '20'],
|
||||
['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)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user