remove analyze() from PlaceInfo class

The function creates circular dependencies.
This commit is contained in:
Sarah Hoffmann
2022-07-06 11:33:07 +02:00
parent cbbcbb1fd7
commit 856925d19b
3 changed files with 8 additions and 12 deletions

View File

@@ -13,6 +13,8 @@ import logging
import os
import tarfile
from psycopg2.extras import Json
from nominatim.db.connection import connect
from nominatim.db.async_connection import WorkerPool
from nominatim.db.sql_preprocessor import SQLPreprocessor
@@ -87,7 +89,7 @@ def handle_threaded_sql_statements(pool, fd, analyzer):
address = dict(street=row['street'], postcode=row['postcode'])
args = ('SRID=4326;' + row['geometry'],
int(row['from']), int(row['to']), row['interpolation'],
PlaceInfo({'address': address}).analyze(analyzer),
Json(analyzer.process_place(PlaceInfo({'address': address}))),
analyzer.normalize_postcode(row['postcode']))
except ValueError:
continue