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

fix missing optional return

Browse Source
This commit is contained in:
Sarah Hoffmann
2025-05-30 12:03:00 +02:00
parent 02c3a6fffa
commit 2a508b6c99
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nominatim_db/tokenizer/base.py
View File

@@ -37,7 +37,7 @@ class AbstractAnalyzer(ABC):
""" """
@abstractmethod @abstractmethod
def get_word_token_info(self, words: List[str]) -> List[Tuple[str, str, int]]: def get_word_token_info(self, words: List[str]) -> List[Tuple[str, str, Optional[int]]]:
""" Return token information for the given list of words. """ Return token information for the given list of words.
The function is used for testing and debugging only The function is used for testing and debugging only

6
src/nominatim_db/tokenizer/icu_tokenizer.py
View File

@@ -338,7 +338,7 @@ class ICUNameAnalyzer(AbstractAnalyzer):
""" """
return cast(str, self.token_analysis.normalizer.transliterate(name)).strip() return cast(str, self.token_analysis.normalizer.transliterate(name)).strip()
def get_word_token_info(self, words: Sequence[str]) -> List[Tuple[str, str, int]]: def get_word_token_info(self, words: Sequence[str]) -> List[Tuple[str, str, Optional[int]]]:
""" Return token information for the given list of words. """ Return token information for the given list of words.
If a word starts with # it is assumed to be a full name If a word starts with # it is assumed to be a full name
otherwise is a partial name. otherwise is a partial name.
@@ -362,11 +362,11 @@ class ICUNameAnalyzer(AbstractAnalyzer):
cur.execute("""SELECT word_token, word_id cur.execute("""SELECT word_token, word_id
FROM word WHERE word_token = ANY(%s) and type = 'W' FROM word WHERE word_token = ANY(%s) and type = 'W'
""", (list(full_tokens.values()),)) """, (list(full_tokens.values()),))
full_ids = {r[0]: r[1] for r in cur} full_ids = {r[0]: cast(int, r[1]) for r in cur}
cur.execute("""SELECT word_token, word_id cur.execute("""SELECT word_token, word_id
FROM word WHERE word_token = ANY(%s) and type = 'w'""", FROM word WHERE word_token = ANY(%s) and type = 'w'""",
(list(partial_tokens.values()),)) (list(partial_tokens.values()),))
part_ids = {r[0]: r[1] for r in cur} part_ids = {r[0]: cast(int, r[1]) for r in cur}
return [(k, v, full_ids.get(v, None)) for k, v in full_tokens.items()] \ return [(k, v, full_ids.get(v, None)) for k, v in full_tokens.items()] \
+ [(k, v, part_ids.get(v, None)) for k, v in partial_tokens.items()] + [(k, v, part_ids.get(v, None)) for k, v in partial_tokens.items()]