#
# This file is part of Nominatim. (https://nominatim.org)
#
-# Copyright (C) 2024 by the Nominatim developer community.
+# Copyright (C) 2025 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Helper fixtures for API call tests.
"""
import pytest
import pytest_asyncio
-import time
import datetime as dt
import sqlalchemy as sa
from nominatim_db.tools import convert_sqlite
import nominatim_api.logging as loglib
+
class APITester:
def __init__(self):
self.api = napi.NominatimAPI()
self.async_to_sync(self.api._async_api.setup_database())
-
def async_to_sync(self, func):
""" Run an asynchronous function until completion using the
internal loop of the API.
"""
return self.api._loop.run_until_complete(func)
-
def add_data(self, table, data):
""" Insert data into the given table.
"""
sql = getattr(self.api._async_api._tables, table).insert()
self.async_to_sync(self.exec_async(sql, data))
-
def add_placex(self, **kw):
name = kw.get('name')
if isinstance(name, str):
geometry = kw.get('geometry', 'POINT(%f %f)' % centroid)
self.add_data('placex',
- {'place_id': kw.get('place_id', 1000),
- 'osm_type': kw.get('osm_type', 'W'),
- 'osm_id': kw.get('osm_id', 4),
- 'class_': kw.get('class_', 'highway'),
- 'type': kw.get('type', 'residential'),
- 'name': name,
- 'address': kw.get('address'),
- 'extratags': kw.get('extratags'),
- 'parent_place_id': kw.get('parent_place_id'),
- 'linked_place_id': kw.get('linked_place_id'),
- 'admin_level': kw.get('admin_level', 15),
- 'country_code': kw.get('country_code'),
- 'housenumber': kw.get('housenumber'),
- 'postcode': kw.get('postcode'),
- 'wikipedia': kw.get('wikipedia'),
- 'rank_search': kw.get('rank_search', 30),
- 'rank_address': kw.get('rank_address', 30),
- 'importance': kw.get('importance'),
- 'centroid': 'POINT(%f %f)' % centroid,
- 'indexed_status': kw.get('indexed_status', 0),
- 'indexed_date': kw.get('indexed_date',
- dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
- 'geometry': geometry})
-
+ {'place_id': kw.get('place_id', 1000),
+ 'osm_type': kw.get('osm_type', 'W'),
+ 'osm_id': kw.get('osm_id', 4),
+ 'class_': kw.get('class_', 'highway'),
+ 'type': kw.get('type', 'residential'),
+ 'name': name,
+ 'address': kw.get('address'),
+ 'extratags': kw.get('extratags'),
+ 'parent_place_id': kw.get('parent_place_id'),
+ 'linked_place_id': kw.get('linked_place_id'),
+ 'admin_level': kw.get('admin_level', 15),
+ 'country_code': kw.get('country_code'),
+ 'housenumber': kw.get('housenumber'),
+ 'postcode': kw.get('postcode'),
+ 'wikipedia': kw.get('wikipedia'),
+ 'rank_search': kw.get('rank_search', 30),
+ 'rank_address': kw.get('rank_address', 30),
+ 'importance': kw.get('importance'),
+ 'centroid': 'POINT(%f %f)' % centroid,
+ 'indexed_status': kw.get('indexed_status', 0),
+ 'indexed_date': kw.get('indexed_date',
+ dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
+ 'geometry': geometry})
def add_address_placex(self, object_id, **kw):
self.add_placex(**kw)
'fromarea': kw.get('fromarea', False),
'isaddress': kw.get('isaddress', True)})
-
def add_osmline(self, **kw):
self.add_data('osmline',
- {'place_id': kw.get('place_id', 10000),
- 'osm_id': kw.get('osm_id', 4004),
- 'parent_place_id': kw.get('parent_place_id'),
- 'indexed_date': kw.get('indexed_date',
- dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
- 'startnumber': kw.get('startnumber', 2),
- 'endnumber': kw.get('endnumber', 6),
- 'step': kw.get('step', 2),
- 'address': kw.get('address'),
- 'postcode': kw.get('postcode'),
- 'country_code': kw.get('country_code'),
- 'linegeo': kw.get('geometry', 'LINESTRING(1.1 -0.2, 1.09 -0.22)')})
-
+ {'place_id': kw.get('place_id', 10000),
+ 'osm_id': kw.get('osm_id', 4004),
+ 'parent_place_id': kw.get('parent_place_id'),
+ 'indexed_date': kw.get('indexed_date',
+ dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
+ 'startnumber': kw.get('startnumber', 2),
+ 'endnumber': kw.get('endnumber', 6),
+ 'step': kw.get('step', 2),
+ 'address': kw.get('address'),
+ 'postcode': kw.get('postcode'),
+ 'country_code': kw.get('country_code'),
+ 'linegeo': kw.get('geometry', 'LINESTRING(1.1 -0.2, 1.09 -0.22)')})
def add_tiger(self, **kw):
self.add_data('tiger',
- {'place_id': kw.get('place_id', 30000),
- 'parent_place_id': kw.get('parent_place_id'),
- 'startnumber': kw.get('startnumber', 2),
- 'endnumber': kw.get('endnumber', 6),
- 'step': kw.get('step', 2),
- 'postcode': kw.get('postcode'),
- 'linegeo': kw.get('geometry', 'LINESTRING(1.1 -0.2, 1.09 -0.22)')})
-
+ {'place_id': kw.get('place_id', 30000),
+ 'parent_place_id': kw.get('parent_place_id'),
+ 'startnumber': kw.get('startnumber', 2),
+ 'endnumber': kw.get('endnumber', 6),
+ 'step': kw.get('step', 2),
+ 'postcode': kw.get('postcode'),
+ 'linegeo': kw.get('geometry', 'LINESTRING(1.1 -0.2, 1.09 -0.22)')})
def add_postcode(self, **kw):
self.add_data('postcode',
- {'place_id': kw.get('place_id', 1000),
- 'parent_place_id': kw.get('parent_place_id'),
- 'country_code': kw.get('country_code'),
- 'postcode': kw.get('postcode'),
- 'rank_search': kw.get('rank_search', 20),
- 'rank_address': kw.get('rank_address', 22),
- 'indexed_date': kw.get('indexed_date',
- dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
- 'geometry': kw.get('geometry', 'POINT(23 34)')})
-
+ {'place_id': kw.get('place_id', 1000),
+ 'parent_place_id': kw.get('parent_place_id'),
+ 'country_code': kw.get('country_code'),
+ 'postcode': kw.get('postcode'),
+ 'rank_search': kw.get('rank_search', 20),
+ 'rank_address': kw.get('rank_address', 22),
+ 'indexed_date': kw.get('indexed_date',
+ dt.datetime(2022, 12, 7, 14, 14, 46, 0)),
+ 'geometry': kw.get('geometry', 'POINT(23 34)')})
def add_country(self, country_code, geometry):
self.add_data('country_grid',
'area': 0.1,
'geometry': geometry})
-
def add_country_name(self, country_code, names, partition=0):
self.add_data('country_name',
{'country_code': country_code,
'name': names,
'partition': partition})
-
def add_search_name(self, place_id, **kw):
centroid = kw.get('centroid', (23.0, 34.0))
self.add_data('search_name',
'country_code': kw.get('country_code', 'xx'),
'centroid': 'POINT(%f %f)' % centroid})
-
def add_class_type_table(self, cls, typ):
self.async_to_sync(
self.exec_async(sa.text(f"""CREATE TABLE place_classtype_{cls}_{typ}
WHERE class = '{cls}' AND type = '{typ}')
""")))
-
def add_word_table(self, content):
data = [dict(zip(['word_id', 'word_token', 'type', 'word', 'info'], c))
for c in content]
self.async_to_sync(_do_sql())
-
async def exec_async(self, sql, *args, **kwargs):
async with self.api._async_api.begin() as conn:
return await conn.execute(sql, *args, **kwargs)
-
async def create_tables(self):
async with self.api._async_api._engine.begin() as conn:
await conn.run_sync(self.api._async_api._tables.meta.create_all)
db = str(tmp_path / 'test_nominatim_python_unittest.sqlite')
def mkapi(apiobj, options={'reverse'}):
- apiobj.add_data('properties',
- [{'property': 'tokenizer', 'value': 'icu'},
- {'property': 'tokenizer_import_normalisation', 'value': ':: lower();'},
- {'property': 'tokenizer_import_transliteration', 'value': "'1' > '/1/'; 'ä' > 'ä '"},
- ])
+ apiobj.add_data(
+ 'properties',
+ [{'property': 'tokenizer', 'value': 'icu'},
+ {'property': 'tokenizer_import_normalisation', 'value': ':: lower();'},
+ {'property': 'tokenizer_import_transliteration',
+ 'value': "'1' > '/1/'; 'ä' > 'ä '"}])
async def _do_sql():
async with apiobj.api._async_api.begin() as conn:
projects / nominatim.git / blobdiff