From 341c09ee9576a4015ff7c5b0cedb941d2b686b85 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 5 Aug 2025 15:36:33 +0200 Subject: [PATCH] remove unused functions --- src/nominatim_api/search/db_search_builder.py | 40 ------------------- src/nominatim_api/search/db_search_fields.py | 19 --------- 2 files changed, 59 deletions(-) diff --git a/src/nominatim_api/search/db_search_builder.py b/src/nominatim_api/search/db_search_builder.py index e4838108..ae69e4ae 100644 --- a/src/nominatim_api/search/db_search_builder.py +++ b/src/nominatim_api/search/db_search_builder.py @@ -295,46 +295,6 @@ class SearchBuilder: yield penalty, exp_count, lookup - def get_name_address_ranking(self, name_tokens: List[int], - addr_partials: List[qmod.Token]) -> List[dbf.FieldLookup]: - """ Create a ranking expression looking up by name and address. - """ - lookup = [dbf.FieldLookup('name_vector', name_tokens, lookups.LookupAll)] - - addr_restrict_tokens = [] - addr_lookup_tokens = [] - for t in addr_partials: - if t.addr_count > 20000: - addr_restrict_tokens.append(t.token) - else: - addr_lookup_tokens.append(t.token) - - if addr_restrict_tokens: - lookup.append(dbf.FieldLookup('nameaddress_vector', - addr_restrict_tokens, lookups.Restrict)) - if addr_lookup_tokens: - lookup.append(dbf.FieldLookup('nameaddress_vector', - addr_lookup_tokens, lookups.LookupAll)) - - return lookup - - def get_full_name_ranking(self, name_fulls: List[qmod.Token], addr_partials: List[qmod.Token], - use_lookup: bool) -> List[dbf.FieldLookup]: - """ Create a ranking expression with full name terms and - additional address lookup. When 'use_lookup' is true, then - address lookups will use the index, when the occurrences are not - too many. - """ - if use_lookup: - addr_restrict_tokens = [] - addr_lookup_tokens = [t.token for t in addr_partials] - else: - addr_restrict_tokens = [t.token for t in addr_partials] - addr_lookup_tokens = [] - - return dbf.lookup_by_any_name([t.token for t in name_fulls], - addr_restrict_tokens, addr_lookup_tokens) - def get_name_ranking(self, trange: qmod.TokenRange, db_field: str = 'name_vector') -> dbf.FieldRanking: """ Create a ranking expression for a name term in the given range. diff --git a/src/nominatim_api/search/db_search_fields.py b/src/nominatim_api/search/db_search_fields.py index 187c782a..669e2a5e 100644 --- a/src/nominatim_api/search/db_search_fields.py +++ b/src/nominatim_api/search/db_search_fields.py @@ -271,17 +271,6 @@ class SearchData: self.penalty += ranking.default -def lookup_by_names(name_tokens: List[int], addr_tokens: List[int]) -> List[FieldLookup]: - """ Create a lookup list where name tokens are looked up via index - and potential address tokens are used to restrict the search further. - """ - lookup = [FieldLookup('name_vector', name_tokens, lookups.LookupAll)] - if addr_tokens: - lookup.append(FieldLookup('nameaddress_vector', addr_tokens, lookups.Restrict)) - - return lookup - - def lookup_by_any_name(name_tokens: List[int], addr_restrict_tokens: List[int], addr_lookup_tokens: List[int]) -> List[FieldLookup]: """ Create a lookup list where name tokens are looked up via index @@ -295,11 +284,3 @@ def lookup_by_any_name(name_tokens: List[int], addr_restrict_tokens: List[int], lookup.append(FieldLookup('nameaddress_vector', addr_lookup_tokens, lookups.LookupAll)) return lookup - - -def lookup_by_addr(name_tokens: List[int], addr_tokens: List[int]) -> List[FieldLookup]: - """ Create a lookup list where address tokens are looked up via index - and the name tokens are only used to restrict the search further. - """ - return [FieldLookup('name_vector', name_tokens, lookups.Restrict), - FieldLookup('nameaddress_vector', addr_tokens, lookups.LookupAll)] -- 2.39.5