osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-25 14:02:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove language and partition from name import

Browse Source
This commit is contained in:
Sarah Hoffmann 2021-09-01 11:37:30 +02:00
parent 79da96b369
commit 7e7dd769fd
4 changed files with 262 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

504
data/country_name.sql
View File

File diff suppressed because one or more lines are too long

1
nominatim/clicmd/setup.py
View File

@ -117,7 +117,6 @@ class SetupAll:
LOG.warning('Create search index for default country names.') LOG.warning('Create search index for default country names.')
country_info.create_country_names(conn, tokenizer, country_info.create_country_names(conn, tokenizer,
args.config.LANGUAGES) args.config.LANGUAGES)
conn.commit()
if args.no_updates: if args.no_updates:
freeze.drop_update_tables(conn) freeze.drop_update_tables(conn)
tokenizer.finalize_import(args.config) tokenizer.finalize_import(args.config)

8
nominatim/tokenizer/icu_rule_loader.py
View File

@ -92,17 +92,17 @@ class ICURuleLoader:
value = loader.construct_scalar(node) value = loader.construct_scalar(node)
if Path(value).is_absolute(): if Path(value).is_absolute():
content = Path(value).read_text() content = Path(value)
else: else:
content = (self.configfile.parent / value).read_text() content = (self.configfile.parent / value)
return yaml.safe_load(content) return yaml.safe_load(content.read_text(encoding='utf-8'))
def _load_from_yaml(self): def _load_from_yaml(self):
yaml.add_constructor('!include', self._yaml_include_representer, yaml.add_constructor('!include', self._yaml_include_representer,
Loader=yaml.SafeLoader) Loader=yaml.SafeLoader)
rules = yaml.safe_load(self.configfile.read_text()) rules = yaml.safe_load(self.configfile.read_text(encoding='utf-8'))
self.normalization_rules = self._cfg_to_icu_rules(rules, 'normalization') self.normalization_rules = self._cfg_to_icu_rules(rules, 'normalization')
self.transliteration_rules = self._cfg_to_icu_rules(rules, 'transliteration') self.transliteration_rules = self._cfg_to_icu_rules(rules, 'transliteration')

8
nominatim/tools/country_info.py
View File

@ -15,10 +15,15 @@ class _CountryInfo:
self._info = {} self._info = {}
def load(self, configfile): def load(self, configfile):
""" Load the country properties from the configuration files,
if they are not loaded yet.
"""
if not self._info: if not self._info:
self._info = yaml.safe_load(configfile.read_text()) self._info = yaml.safe_load(configfile.read_text(encoding='utf-8'))
def items(self): def items(self):
""" Return tuples of (country_code, property dict) as iterable.
"""
return self._info.items() return self._info.items()
@ -30,7 +35,6 @@ def setup_country_config(configfile):
file. file.
""" """
_COUNTRY_INFO.load(configfile) _COUNTRY_INFO.load(configfile)
print(_COUNTRY_INFO._info)
def setup_country_tables(dsn, sql_dir, ignore_partitions=False): def setup_country_tables(dsn, sql_dir, ignore_partitions=False):