From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 11 May 2022 08:36:09 +0000 (+0200)
Subject: fix spacing
X-Git-Tag: v4.1.0~43^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3ba975466c166e9d9eceee34189d22c1561e69c1?ds=sidebyside;hp=-c

fix spacing

Some versions of pylint are oddly picky.
---

3ba975466c166e9d9eceee34189d22c1561e69c1
diff --git a/nominatim/tools/migration.py b/nominatim/tools/migration.py
index 8eaad2f7..28a14455 100644
--- a/nominatim/tools/migration.py
+++ b/nominatim/tools/migration.py
@@ -130,8 +130,7 @@ def add_nominatim_property_table(conn, config, **_):
                                         property TEXT,
                                         value TEXT);
                                      GRANT SELECT ON TABLE nominatim_properties TO {};
-                                  """)
-                             .format(pysql.Identifier(config.DATABASE_WEBUSER)))
+                                  """).format(pysql.Identifier(config.DATABASE_WEBUSER)))
 
 @_migration(3, 6, 0, 0)
 def change_housenumber_transliteration(conn, **_):
@@ -197,7 +196,7 @@ def install_legacy_tokenizer(conn, config, **_):
                                         (table, ))
                 if has_column == 0:
                     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,
                                                        module_name='legacy')
 
diff --git a/nominatim/tools/refresh.py b/nominatim/tools/refresh.py
index ca6f5c62..561bcf83 100644
--- a/nominatim/tools/refresh.py
+++ b/nominatim/tools/refresh.py
@@ -57,14 +57,14 @@ def load_address_levels(conn, table, levels):
                                         class TEXT,
                                         type TEXT,
                                         rank_search SMALLINT,
-                                        rank_address SMALLINT)""")
-                         .format(pysql.Identifier(table)))
+                                        rank_address SMALLINT)
+                              """).format(pysql.Identifier(table)))
 
         cur.execute_values(pysql.SQL("INSERT INTO {} VALUES %s")
                            .format(pysql.Identifier(table)), rows)
 
         cur.execute(pysql.SQL('CREATE UNIQUE INDEX ON {} (country_code, class, type)')
-                         .format(pysql.Identifier(table)))
+                    .format(pysql.Identifier(table)))
 
     conn.commit()
 
diff --git a/nominatim/tools/special_phrases/sp_importer.py b/nominatim/tools/special_phrases/sp_importer.py
index 9eefaa19..8137142b 100644
--- a/nominatim/tools/special_phrases/sp_importer.py
+++ b/nominatim/tools/special_phrases/sp_importer.py
@@ -191,17 +191,18 @@ class SPImporter():
 
     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)
-        with self.db_connection.cursor() as db_cursor:
-            db_cursor.execute(SQL("""CREATE TABLE IF NOT EXISTS {} {} AS
-                                       SELECT place_id AS place_id,
-                                              st_centroid(geometry) AS centroid
-                                       FROM placex
-                                       WHERE class = %s AND type = %s""")
-                                 .format(Identifier(table_name), SQL(sql_tablespace)),
-                              (phrase_class, phrase_type))
+        with self.db_connection.cursor() as cur:
+            cur.execute(SQL("""CREATE TABLE IF NOT EXISTS {} {} AS
+                                 SELECT place_id AS place_id,
+                                        st_centroid(geometry) AS centroid
+                                 FROM placex
+                                 WHERE class = %s AND type = %s
+                             """).format(Identifier(table_name), SQL(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'):
             with self.db_connection.cursor() as db_cursor:
                 db_cursor.execute(SQL("CREATE INDEX {} ON {} USING GIST (centroid) {}")
-                                     .format(Identifier(index_prefix + 'centroid'),
-                                             Identifier(base_table),
-                                             SQL(sql_tablespace)))
+                                  .format(Identifier(index_prefix + 'centroid'),
+                                          Identifier(base_table),
+                                          SQL(sql_tablespace)))
 
         # Index on place_id
         if not self.db_connection.index_exists(index_prefix + 'place_id'):