safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

merge linked names correctly into namedetails

Browse Source 
Convert the '_place_*' entries back to normal entries before
returning them in the 'namedetails' section. If the name field is
duplicated, kept the '_place_*' notation. This preserves the previous
behaviour before _place_ names were introduces but adds the additional
names from the linked place for reference.
This commit is contained in:
Sarah Hoffmann
2022-03-17 11:02:02 +01:00
parent 524dc64ab7
commit e133476c35
3 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,11 @@ Feature: Searching linked places
| object | linked_place_id |
| N2 | R13 |
When sending search query "Vario"
| namedetails |
| 1 |
Then results contain
| osm | display_name |
| R13 | Garbo |
| osm | display_name | namedetails |
| R13 | Garbo | "name": "Garbo", "name:it": "Vario" |
When sending search query "Vario"
| accept-language |
| it |
@@ -43,9 +45,11 @@ Feature: Searching linked places
| object | linked_place_id |
| N2 | R13 |
When sending search query "Vario"
| namedetails |
| 1 |
Then results contain
| osm | display_name |
| R13 | Garbo |
| osm | display_name | namedetails |
| R13 | Garbo | "name": "Garbo", "_place_name": "Vario" |
When sending search query "Garbo"
Then results contain
| osm | display_name |

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

@@ -102,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)