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

remove analyze() from PlaceInfo class

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
nominatim/indexer/runners.py
View File

@@ -11,6 +11,7 @@ tasks.
import functools
from psycopg2 import sql as pysql
import psycopg2.extras
from nominatim.data.place_info import PlaceInfo
@@ -19,6 +20,8 @@ from nominatim.data.place_info import PlaceInfo
def _mk_valuelist(template, num):
return pysql.SQL(',').join([pysql.SQL(template)] * num)
def _analyze_place(place, analyzer):
return psycopg2.extras.Json(analyzer.process_place(PlaceInfo(place)))
class AbstractPlacexRunner:
""" Returns SQL commands for indexing of the placex table.
@@ -56,7 +59,7 @@ class AbstractPlacexRunner:
for place in places:
for field in ('place_id', 'name', 'address', 'linked_place_id'):
values.append(place[field])
values.append(PlaceInfo(place).analyze(self.analyzer))
values.append(_analyze_place(place, self.analyzer))
worker.perform(self._index_sql(len(places)), values)
@@ -150,7 +153,7 @@ class InterpolationRunner:
values = []
for place in places:
values.extend((place[x] for x in ('place_id', 'address')))
values.append(PlaceInfo(place).analyze(self.analyzer))
values.append(_analyze_place(place, self.analyzer))
worker.perform(self._index_sql(len(places)), values)