also switch legacy tokenizer to new street/place choice behaviour

[nominatim.git] / nominatim / db / properties.py

diff --git a/nominatim/db/properties.py b/nominatim/db/properties.py
index 3624c950e4a158c6b4f7d8b6ab7d8f9cfbd6911c..e8d5e0ca5c47194f7e72402f3c6b541a251c6a2a 100644 (file)
--- a/nominatim/db/properties.py
+++ b/nominatim/db/properties.py
@@ -12,7 +12,7 @@ from typing import Optional, cast
 from nominatim.db.connection import Connection
 
 def set_property(conn: Connection, name: str, value: str) -> None:
 from nominatim.db.connection import Connection
 
 def set_property(conn: Connection, name: str, value: str) -> None:

-    """ Add or replace the propery with the given name.
+    """ Add or replace the property with the given name.

     """
     with conn.cursor() as cur:
         cur.execute('SELECT value FROM nominatim_properties WHERE property = %s',
     """
     with conn.cursor() as cur:
         cur.execute('SELECT value FROM nominatim_properties WHERE property = %s',


@@ -41,4 +41,7 @@ def get_property(conn: Connection, name: str) -> Optional[str]:
         if cur.rowcount == 0:
             return None
 
         if cur.rowcount == 0:
             return None
 

-        return cast(Optional[str], cur.fetchone()[0]) # type: ignore[no-untyped-call]
+        result = cur.fetchone()
+        assert result is not None
+
+        return cast(Optional[str], result[0])