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

fix spacing

Browse Source 
Some versions of pylint are oddly picky.
This commit is contained in:
Sarah Hoffmann
2022-05-11 10:36:09 +02:00
parent d14a585cc9
commit 3ba975466c
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nominatim/tools/migration.py
View File

@@ -130,8 +130,7 @@ def add_nominatim_property_table(conn, config, **_):
property TEXT, property TEXT,
value TEXT); value TEXT);
GRANT SELECT ON TABLE nominatim_properties TO {}; GRANT SELECT ON TABLE nominatim_properties TO {};
""") """).format(pysql.Identifier(config.DATABASE_WEBUSER)))
.format(pysql.Identifier(config.DATABASE_WEBUSER)))
@_migration(3, 6, 0, 0) @_migration(3, 6, 0, 0)
def change_housenumber_transliteration(conn, **_): def change_housenumber_transliteration(conn, **_):
@@ -197,7 +196,7 @@ def install_legacy_tokenizer(conn, config, **_):
(table, )) (table, ))
if has_column == 0: if has_column == 0:
cur.execute(pysql.SQL('ALTER TABLE {} ADD COLUMN token_info JSONB') cur.execute(pysql.SQL('ALTER TABLE {} ADD COLUMN token_info JSONB')
.format(pysql.Identifier(table))) .format(pysql.Identifier(table)))
tokenizer = tokenizer_factory.create_tokenizer(config, init_db=False, tokenizer = tokenizer_factory.create_tokenizer(config, init_db=False,
module_name='legacy') module_name='legacy')

6
nominatim/tools/refresh.py
View File

@@ -57,14 +57,14 @@ def load_address_levels(conn, table, levels):
class TEXT, class TEXT,
type TEXT, type TEXT,
rank_search SMALLINT, rank_search SMALLINT,
rank_address SMALLINT)""") rank_address SMALLINT)
.format(pysql.Identifier(table))) """).format(pysql.Identifier(table)))
cur.execute_values(pysql.SQL("INSERT INTO {} VALUES %s") cur.execute_values(pysql.SQL("INSERT INTO {} VALUES %s")
.format(pysql.Identifier(table)), rows) .format(pysql.Identifier(table)), rows)
cur.execute(pysql.SQL('CREATE UNIQUE INDEX ON {} (country_code, class, type)') cur.execute(pysql.SQL('CREATE UNIQUE INDEX ON {} (country_code, class, type)')
.format(pysql.Identifier(table))) .format(pysql.Identifier(table)))
conn.commit() conn.commit()

25
nominatim/tools/special_phrases/sp_importer.py
View File

@@ -191,17 +191,18 @@ class SPImporter():
def _create_place_classtype_table(self, sql_tablespace, phrase_class, phrase_type): def _create_place_classtype_table(self, sql_tablespace, phrase_class, phrase_type):
""" """
Create table place_classtype of the given phrase_class/phrase_type if doesn't exit. Create table place_classtype of the given phrase_class/phrase_type
if doesn't exit.
""" """
table_name = _classtype_table(phrase_class, phrase_type) table_name = _classtype_table(phrase_class, phrase_type)
with self.db_connection.cursor() as db_cursor: with self.db_connection.cursor() as cur:
db_cursor.execute(SQL("""CREATE TABLE IF NOT EXISTS {} {} AS cur.execute(SQL("""CREATE TABLE IF NOT EXISTS {} {} AS
SELECT place_id AS place_id, SELECT place_id AS place_id,
st_centroid(geometry) AS centroid st_centroid(geometry) AS centroid
FROM placex FROM placex
WHERE class = %s AND type = %s""") WHERE class = %s AND type = %s
.format(Identifier(table_name), SQL(sql_tablespace)), """).format(Identifier(table_name), SQL(sql_tablespace)),
(phrase_class, phrase_type)) (phrase_class, phrase_type))
def _create_place_classtype_indexes(self, sql_tablespace, phrase_class, phrase_type): def _create_place_classtype_indexes(self, sql_tablespace, phrase_class, phrase_type):
@@ -214,9 +215,9 @@ class SPImporter():
if not self.db_connection.index_exists(index_prefix + 'centroid'): if not self.db_connection.index_exists(index_prefix + 'centroid'):
with self.db_connection.cursor() as db_cursor: with self.db_connection.cursor() as db_cursor:
db_cursor.execute(SQL("CREATE INDEX {} ON {} USING GIST (centroid) {}") db_cursor.execute(SQL("CREATE INDEX {} ON {} USING GIST (centroid) {}")
.format(Identifier(index_prefix + 'centroid'), .format(Identifier(index_prefix + 'centroid'),
Identifier(base_table), Identifier(base_table),
SQL(sql_tablespace))) SQL(sql_tablespace)))
# Index on place_id # Index on place_id
if not self.db_connection.index_exists(index_prefix + 'place_id'): if not self.db_connection.index_exists(index_prefix + 'place_id'):