Adapt boundary labels for Sweden and Norway

This also gives us the correct labels for address output in
json and xml.
This commit is contained in:
Sarah Hoffmann 2020-05-23 16:19:27 +02:00
parent af6b9fdb39
commit aa4bd00631
2 changed files with 11 additions and 1 deletions

View File

@ -85,7 +85,15 @@ function getBoundaryLabel($iAdminLevel, $sCountry, $sFallback = 'Administrative'
9 => 'City District',
10 => 'Suburb',
11 => 'Neighbourhood'
)
),
'no' => array (
3 => 'State',
4 => 'County'
),
'se' => array (
3 => 'State',
4 => 'County'
)
);
if (isset($aBoundaryList[$sCountry])

View File

@ -61,6 +61,8 @@ class ClassTypesTest extends \PHPUnit\Framework\TestCase
$this->assertEquals('Administrative', ClassTypes\getBoundaryLabel(18, null));
$this->assertEquals('None', ClassTypes\getBoundaryLabel(18, null, 'None'));
$this->assertEquals('State', ClassTypes\getBoundaryLabel(4, 'de', 'None'));
$this->assertEquals('County', ClassTypes\getBoundaryLabel(4, 'se', 'None'));
$this->assertEquals('Municipality', ClassTypes\getBoundaryLabel(7, 'se', 'None'));
}
public function testGetDefRadius()