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

move abbreviation computation into import phase

Browse Source 
This adds precomputation of abbreviated terms for names and removes
abbreviation of terms in the query. Basic import works but still
needs some thorough testing as well as speed improvements during
import.

New dependency for python library datrie.
This commit is contained in:
Sarah Hoffmann
2021-05-28 22:06:13 +02:00
parent 6ba00e6aee
commit 8413075249
10 changed files with 665 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nominatim/tools/database_import.py
View File

@@ -272,15 +272,15 @@ def create_country_names(conn, tokenizer, languages=None):
with tokenizer.name_analyzer() as analyzer:
for code, name in cur:
names = [code]
names = {'countrycode' : code}
if code == 'gb':
names.append('UK')
names['short_name'] = 'UK'
if code == 'us':
names.append('United States')
names['short_name'] = 'United States'
# country names (only in languages as provided)
if name:
names.extend((v for k, v in name.items() if _include_key(k)))
names.update(((k, v) for k, v in name.items() if _include_key(k)))
analyzer.add_country_names(code, names)