hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into country-names-yaml-configuration

Browse Source
This commit is contained in:
Tareq Al-Ahdal
2022-03-18 02:36:12 +08:00
committed by GitHub
parent 456d439e97 2723553593
commit 6be2077d92
17 changed files with 244 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
test/bdd/db/query/interpolation.feature Normal file
View File

@@ -0,0 +1,58 @@
@DB
Feature: Query of address interpolations
Tests that interpolated addresses can be queried correctly
Background:
Given the grid
| 1 | | 2 | | 3 |
| 10 | | 12 | | 13 |
| 7 | | 8 | | 9 |
Scenario: Find interpolations with single number
Given the places
| osm | class | type | name | geometry |
| W10 | highway | primary | Nickway | 10,12,13 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | odd | 1,3 |
And the places
| osm | class | type | housenr | geometry |
| N1 | place | house | 1 | 1 |
| N3 | place | house | 5 | 3 |
And the ways
| id | nodes |
| 1 | 1,3 |
When importing
When sending jsonv2 reverse point 2
Then results contain
| ID | display_name |
| 0 | 3, Nickway |
When sending search query "Nickway 3"
Then results contain
| osm | display_name |
| W1 | 3, Nickway |
Scenario: Find interpolations with multiple numbers
Given the places
| osm | class | type | name | geometry |
| W10 | highway | primary | Nickway | 10,12,13 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1,3 |
And the places
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 |
| N3 | place | house | 16 | 3 |
And the ways
| id | nodes |
| 1 | 1,3 |
When importing
When sending jsonv2 reverse point 2
Then results contain
| ID | display_name | centroid |
| 0 | 10, Nickway | 2 |
When sending search query "Nickway 10"
Then results contain
| osm | display_name | centroid |
| W1 | 10, Nickway | 2 |

38
test/bdd/db/query/linking.feature
View File

@@ -17,6 +17,40 @@ Feature: Searching linked places
| object | linked_place_id |
| N2 | R13 |
When sending search query "Vario"
| namedetails |
| 1 |
Then results contain
| osm |
| R13 |
| osm | display_name | namedetails |
| R13 | Garbo | "name": "Garbo", "name:it": "Vario" |
When sending search query "Vario"
| accept-language |
| it |
Then results contain
| osm | display_name |
| R13 | Vario |
Scenario: Differing names from linked places are searchable
Given the places
| osm | class | type | admin | name | geometry |
| R13 | boundary | administrative | 6 | Garbo | poly-area:0.1 |
Given the places
| osm | class | type | admin | name | geometry |
| N2 | place | hamlet | 15 | Vario | 0.006 0.00001 |
And the relations
| id | members | tags+type |
| 13 | N2:label | boundary |
When importing
Then placex contains
| object | linked_place_id |
| N2 | R13 |
When sending search query "Vario"
| namedetails |
| 1 |
Then results contain
| osm | display_name | namedetails |
| R13 | Garbo | "name": "Garbo", "_place_name": "Vario" |
When sending search query "Garbo"
Then results contain
| osm | display_name |
| R13 | Garbo |

39
test/bdd/db/update/linked_places.feature
View File

@@ -117,8 +117,10 @@ Feature: Updates of linked places
| 1 | N3:label |
When importing
Then placex contains
| object | linked_place_id | name+name:de |
| object | linked_place_id | name+_place_name:de |
| R1 | - | pnt |
And placex contains
| object | linked_place_id | name+name:de |
| N3 | R1 | pnt |
When updating places
| osm | class | type | name+name:de | admin | geometry |
@@ -126,8 +128,43 @@ Feature: Updates of linked places
Then placex contains
| object | linked_place_id | name+name:de |
| N3 | R1 | newname |
And placex contains
| object | linked_place_id | name+_place_name:de |
| R1 | - | newname |
Scenario: Update linking relation when linkee name is deleted
Given the places
| osm | class | type | name | admin | geometry |
| R1 | boundary | administrative | rel | 8 | poly-area:0.1 |
And the places
| osm | class | type | name | admin | geometry |
| N3 | place | city | pnt | 30 | 0.00001 0 |
And the relations
| id | members |
| 1 | N3:label |
When importing
Then placex contains
| object | linked_place_id | name+_place_name | name+name |
| R1 | - | pnt | rel |
And placex contains
| object | linked_place_id | name+name |
| N3 | R1 | pnt |
When sending search query "pnt"
Then results contain
| osm |
| R1 |
When updating places
| osm | class | type | name+name:de | admin | geometry |
| N3 | place | city | depnt | 30 | 0.00001 0 |
Then placex contains
| object | linked_place_id | name+name:de |
| N3 | R1 | depnt |
And placex contains
| object | linked_place_id | name+_place_name:de | name+name |
| R1 | - | depnt | rel |
When sending search query "pnt"
Then exactly 0 results are returned
Scenario: Updating linkee extratags keeps linker's extratags
Given the named places
| osm | class | type | extra+wikidata | admin | geometry |

21
test/bdd/steps/http_responses.py
View File

@@ -72,13 +72,14 @@ class GenericResponse:
self.header['json_func'] = m.group(1)
self.result = json.JSONDecoder(object_pairs_hook=OrderedDict).decode(code)
if isinstance(self.result, OrderedDict):
self.result = [self.result]
if 'error' in self.result:
self.result = []
else:
self.result = [self.result]
def _parse_geojson(self):
self._parse_json()
if 'error' in self.result[0]:
self.result = []
else:
if self.result:
self.result = list(map(_geojson_result_to_json_result, self.result[0]['features']))
def _parse_geocodejson(self):
@@ -101,6 +102,9 @@ class GenericResponse:
elif value.startswith("^"):
assert re.fullmatch(value, self.result[idx][field]), \
BadRowValueAssert(self, idx, field, value)
elif isinstance(self.result[idx][field], OrderedDict):
assert self.result[idx][field] == eval('{' + value + '}'), \
BadRowValueAssert(self, idx, field, value)
else:
assert str(self.result[idx][field]) == str(value), \
BadRowValueAssert(self, idx, field, value)
@@ -128,7 +132,7 @@ class GenericResponse:
"\nBad value for row {} field '{}' in address. Expected: {}, got: {}.\nFull address: {}"""\
.format(idx, field, value, address[field], json.dumps(address, indent=4))
def match_row(self, row):
def match_row(self, row, context=None):
""" Match the result fields against the given behave table row.
"""
if 'ID' in row.headings:
@@ -151,7 +155,12 @@ class GenericResponse:
assert self.result[i]['osm_type'] in (OSM_TYPE[value[0]], value[0]), \
BadRowValueAssert(self, i, 'osm_type', value)
elif name == 'centroid':
lon, lat = value.split(' ')
if ' ' in value:
lon, lat = value.split(' ')
elif context is not None:
lon, lat = context.osm.grid_node(int(value))
else:
raise RuntimeError("Context needed when using grid coordinates")
self.assert_field(i, 'lat', float(lat))
self.assert_field(i, 'lon', float(lon))
else:

16
test/bdd/steps/steps_api_queries.py
View File

@@ -153,6 +153,20 @@ def website_reverse_request(context, fmt, lat, lon):
context.response = ReverseResponse(outp, fmt or 'xml', status)
@when(u'sending (?P<fmt>\S+ )?reverse point (?P<nodeid>.+)')
def website_reverse_request(context, fmt, nodeid):
params = {}
if fmt and fmt.strip() == 'debug':
params['debug'] = '1'
params['lon'], params['lat'] = (f'{c:f}' for c in context.osm.grid_node(int(nodeid)))
outp, status = send_api_query('reverse', params, fmt, context)
context.response = ReverseResponse(outp, fmt or 'xml', status)
@when(u'sending (?P<fmt>\S+ )?details query for (?P<query>.*)')
def website_details_request(context, fmt, query):
params = {}
@@ -238,7 +252,7 @@ def step_impl(context):
context.execute_steps("then at least 1 result is returned")
for line in context.table:
context.response.match_row(line)
context.response.match_row(line, context=context)
@then(u'result (?P<lid>\d+ )?has (?P<neg>not )?attributes (?P<attrs>.*)')
def validate_attributes(context, lid, neg, attrs):

1
test/bdd/steps/steps_db_ops.py
View File

@@ -93,6 +93,7 @@ def add_data_to_planet_ways(context):
def import_and_index_data_from_place_table(context):
""" Import data previously set up in the place table.
"""
context.nominatim.run_nominatim('refresh', '--functions')
context.nominatim.run_nominatim('import', '--continue', 'load-data',
'--index-noanalyse', '-q')

57
test/php/Nominatim/ParameterParserTest.php
View File

@@ -184,52 +184,24 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
$oParams = new ParameterParser(array('accept-language' => ''));
$this->assertSame(array(
'default' => 'default',
'brand' => 'brand',
'official_name:default' => 'official_name:default',
'short_name:default' => 'short_name:default',
'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type'
), $oParams->getPreferredLanguages('default'));
), array_slice($oParams->getPreferredLanguages('default'), 0, 4));
$oParams = new ParameterParser(array('accept-language' => 'de,en'));
$this->assertSame(array(
'de' => 'de',
'en' => 'en',
'name' => 'name',
'brand' => 'brand',
'official_name:de' => 'official_name:de',
'short_name:de' => 'short_name:de',
'official_name:en' => 'official_name:en',
'short_name:en' => 'short_name:en',
'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type'
), $oParams->getPreferredLanguages('default'));
'default' => 'default',
), array_slice($oParams->getPreferredLanguages('default'), 0, 6));
$oParams = new ParameterParser(array('accept-language' => 'fr-ca,fr;q=0.8,en-ca;q=0.5,en;q=0.3'));
$this->assertSame(array(
'fr-ca' => 'fr-ca',
'fr' => 'fr',
'fr' => 'fr',
'en-ca' => 'en-ca',
'en' => 'en',
'name' => 'name',
'brand' => 'brand',
'official_name:fr-ca' => 'official_name:fr-ca',
'short_name:fr-ca' => 'short_name:fr-ca',
'official_name:fr' => 'official_name:fr',
'short_name:fr' => 'short_name:fr',
'official_name:en-ca' => 'official_name:en-ca',
'short_name:en-ca' => 'short_name:en-ca',
'official_name:en' => 'official_name:en',
'short_name:en' => 'short_name:en',
'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type',
), $oParams->getPreferredLanguages('default'));
'default' => 'default',
), array_slice($oParams->getPreferredLanguages('default'), 0, 10));
$oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin'));
$this->assertSame(array(
@@ -237,21 +209,8 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
'zh_pinyin' => 'zh_pinyin',
'ja' => 'ja',
'zh' => 'zh',
'name' => 'name',
'brand' => 'brand',
'official_name:ja_rm' => 'official_name:ja_rm',
'short_name:ja_rm' => 'short_name:ja_rm',
'official_name:zh_pinyin' => 'official_name:zh_pinyin',
'short_name:zh_pinyin' => 'short_name:zh_pinyin',
'official_name:ja' => 'official_name:ja',
'short_name:ja' => 'short_name:ja',
'official_name:zh' => 'official_name:zh',
'short_name:zh' => 'short_name:zh',
'official_name' => 'official_name',
'short_name' => 'short_name',
'ref' => 'ref',
'type' => 'type',
), $oParams->getPreferredLanguages('default'));
'default' => 'default',
), array_slice($oParams->getPreferredLanguages('default'), 0, 10));
}
public function testHasSetAny()