remove analyze() from PlaceInfo class

The function creates circular dependencies.

diff --git a/nominatim/data/place_info.py b/nominatim/data/place_info.py
index 87ecb731b9ee8e989c5069ecd9ae3c54161676f0..d2ba3979260fcfa2fd411771b844c3d67807c440 100644 (file)
--- a/nominatim/data/place_info.py
+++ b/nominatim/data/place_info.py
@@ -9,8 +9,6 @@ Wrapper around place information the indexer gets from the database and hands to
 the tokenizer.
 """
 
 the tokenizer.
 """
 

-import psycopg2.extras
-

 class PlaceInfo:
     """ Data class containing all information the tokenizer gets about a
         place it should process the names for.
 class PlaceInfo:
     """ Data class containing all information the tokenizer gets about a
         place it should process the names for.


@@ -20,13 +18,6 @@ class PlaceInfo:
         self._info = info
 
 
         self._info = info
 
 

-    def analyze(self, analyzer):
-        """ Process this place with the given tokenizer and return the
-            result in psycopg2-compatible Json.
-        """
-        return psycopg2.extras.Json(analyzer.process_place(self))
-
-

     @property
     def name(self):
         """ A dictionary with the names of the place or None if the place
     @property
     def name(self):
         """ A dictionary with the names of the place or None if the place

diff --git a/nominatim/indexer/runners.py b/nominatim/indexer/runners.py
index 21b6a44d35eff8a9b0d6d06c9dc885081dfe97d7..c8495ee4df115ef96cf7971cff7c7eb1318948a0 100644 (file)
--- a/nominatim/indexer/runners.py
+++ b/nominatim/indexer/runners.py
@@ -11,6 +11,7 @@ tasks.
 import functools
 
 from psycopg2 import sql as pysql
 import functools
 
 from psycopg2 import sql as pysql

+import psycopg2.extras

 
 from nominatim.data.place_info import PlaceInfo
 
 
 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 _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.
 
 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])
         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)
 
 
         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 = []
         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)
 
 
         worker.perform(self._index_sql(len(places)), values)
 

diff --git a/nominatim/tools/tiger_data.py b/nominatim/tools/tiger_data.py
index 9903ea2bb8e68c43ff25533dfcc9d1d0905c74da..e78dcd8f3ade0695eec2f1842f21f40f3eca80ad 100644 (file)
--- a/nominatim/tools/tiger_data.py
+++ b/nominatim/tools/tiger_data.py
@@ -13,6 +13,8 @@ import logging
 import os
 import tarfile
 
 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
 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'],
             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
                     analyzer.normalize_postcode(row['postcode']))
         except ValueError:
             continue