X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/165d17f7f7ab7784e9b866370089cdcb91eadccb..d09670d2088e3368dfec120727b47f561663f3fb:/nominatim/tools/country_info.py

diff --git a/nominatim/tools/country_info.py b/nominatim/tools/country_info.py
index 69697434..675fac5d 100644
--- a/nominatim/tools/country_info.py
+++ b/nominatim/tools/country_info.py
@@ -8,11 +8,11 @@
 Functions for importing and managing static country information.
 """
 import json
+from io import StringIO
 import psycopg2.extras
 
 from nominatim.db import utils as db_utils
 from nominatim.db.connection import connect
-from io import StringIO
 
 class _CountryInfo:
     """ Caches country-specific properties from the configuration file.
@@ -35,8 +35,8 @@ class _CountryInfo:
                 elif not isinstance(prop['languages'], list):
                     prop['languages'] = [x.strip()
                                          for x in prop['languages'].split(',')]
-                if 'name' not in prop:
-                    prop['name'] = {}
+                if 'names' not in prop:
+                    prop['names']['name'] = {}
 
     def items(self):
         """ Return tuples of (country_code, property dict) as iterable.
@@ -66,6 +66,9 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False):
     """
     db_utils.execute_file(dsn, sql_dir / 'country_osm_grid.sql.gz')
 
+    def prepend_name_to_keys(name):
+        return {'name:'+k: v for k, v in name.items()}
+
     params, country_names_data = [], ''
     for ccode, props in _COUNTRY_INFO.items():
         if ccode is not None and props is not None:
@@ -76,19 +79,20 @@ def setup_country_tables(dsn, sql_dir, ignore_partitions=False):
             lang = props['languages'][0] if len(props['languages']) == 1 else None
             params.append((ccode, partition, lang))
 
-            name = json.dumps(props.get('name'), ensure_ascii=False, separators=(', ', '=>'))
+            name = prepend_name_to_keys(props.get('names').get('name'))
+            name = json.dumps(name , ensure_ascii=False, separators=(', ', '=>'))
             country_names_data += ccode + '\t' + name[1:-1] + '\n'
 
     with connect(dsn) as conn:
         with conn.cursor() as cur:
             cur.execute(
-                """CREATE TABLE public.country_name (
+                """ CREATE TABLE public.country_name (
                         country_code character varying(2),
                         name public.hstore,
                         derived_name public.hstore,
                         country_default_language_code text,
                         partition integer
-                );""")
+                    ); """)
             data = StringIO(country_names_data)
             cur.copy_from(data, 'country_name', columns=('country_code', 'name'))
             cur.execute_values(
@@ -109,8 +113,8 @@ def create_country_names(conn, tokenizer, languages=None):
         languages = languages.split(',')
 
     def _include_key(key):
-        return key == 'name' or \
-               (key.startswith('name:') and (not languages or key[5:] in languages))
+        return key.startswith('name:') and \
+            key[5:] in languages or key[5:] == 'default'
 
     with conn.cursor() as cur:
         psycopg2.extras.register_hstore(cur)