Merge pull request #4020 from kad-link/fix/add-admin-level-in-extratags

fix: add admin_level in extratags for boundary=administrative

.github/actions/setup-postgresql-windows/action.yml

@@ -0,0 +1,95 @@
+name: 'Setup Postgresql and Postgis on Windows'
+
+description: 'Installs PostgreSQL and PostGIS for Windows and configures it for CI tests'
+
+inputs:
+    postgresql-version:
+        description: 'Version of PostgreSQL to install'
+        required: true
+
+runs:
+    using: "composite"  
+
+    steps:
+        - name: Set up PostgreSQL variables
+          shell: pwsh
+          run: |
+            $version = "${{ inputs.postgresql-version }}"
+            $root = "C:\Program Files\PostgreSQL\$version"
+            $bin = "$root\bin"
+
+            echo "PGROOT=$root" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+            echo "PGBIN=$bin"   | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+            echo "$bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+        - name: Decide Postgis version (Windows)
+          id: postgis-ver
+          shell: pwsh
+          run: |
+            echo "PowerShell version: ${PSVersionTable.PSVersion}"
+            $PG_VERSION = Split-Path $env:PGROOT -Leaf
+            $postgis_page = "https://download.osgeo.org/postgis/windows/pg$PG_VERSION"
+            echo "Detecting PostGIS version from $postgis_page for PostgreSQL $PG_VERSION"
+            $pgis_bundle = (Invoke-WebRequest -Uri $postgis_page -ErrorAction Stop).Links.Where({$_.href -match "^postgis.*zip$"}).href
+            if (!$pgis_bundle) {
+              Write-Error "Could not find latest PostGIS version in $postgis_page that would match  ^postgis.*zip$  pattern"
+              exit 1
+            }
+            $pgis_bundle = [IO.Path]::ChangeExtension($pgis_bundle, [NullString]::Value)
+            $pgis_bundle_url = "$postgis_page/$pgis_bundle.zip"
+            Add-Content $env:GITHUB_OUTPUT "postgis_file=$pgis_bundle"
+            Add-Content $env:GITHUB_OUTPUT "postgis_bundle_url=$pgis_bundle_url"
+
+        - uses: actions/cache@v4
+          with:
+            path: |
+              C:/postgis.zip
+            key: postgis-cache-${{ steps.postgis-ver.outputs.postgis_file }}
+
+        - name: Download postgis
+          shell: pwsh
+          run: |
+            if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile($env:PGIS_BUNDLE_URL, "c:\postgis.zip")}
+            if (Test-path "c:\postgis_archive"){Remove-Item "c:\postgis_archive" -Recurse -Force}
+            7z x c:\postgis.zip -oc:\postgis_archive
+          env: 
+            PGIS_BUNDLE_URL: ${{ steps.postgis-ver.outputs.postgis_bundle_url }}
+
+        - name: Install postgis
+          shell: bash
+          run: |
+            echo "Root: $PGROOT, Bin: $PGBIN"
+            cp -r c:/postgis_archive/postgis-bundle-*/* "$PGROOT" 
+
+        - name: Start PostgreSQL on Windows
+          run: |
+            $pgService = Get-Service -Name postgresql*
+            Set-Service -InputObject $pgService -Status running -StartupType automatic
+            Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
+          shell: pwsh
+
+        - name: Adapt postgresql configuration
+          shell: pwsh
+          env:
+            PGPASSWORD: root
+          run: |
+            & "$env:PGBIN\psql" -U postgres -d postgres -c "ALTER SYSTEM SET fsync = 'off';"
+            & "$env:PGBIN\psql" -U postgres -d postgres -c "ALTER SYSTEM SET synchronous_commit = 'off';"
+            & "$env:PGBIN\psql" -U postgres -d postgres -c "ALTER SYSTEM SET full_page_writes = 'off';"
+            & "$env:PGBIN\psql" -U postgres -d postgres -c "ALTER SYSTEM SET shared_buffers = '1GB';"
+            & "$env:PGBIN\psql" -U postgres -d postgres -c "ALTER SYSTEM SET port = 5432;"
+
+            Restart-Service -Name postgresql*
+            Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
+
+        - name: Setup database users
+          shell: pwsh
+          env:
+            PGPASSWORD: root
+          run: |
+            & "$env:PGBIN\createuser" -U postgres -S www-data
+            & "$env:PGBIN\createuser" -U postgres -s runner
+        
+
+

.github/actions/setup-postgresql/action.yml

@@ -1,5 +1,7 @@
 name: 'Setup Postgresql and Postgis'
 
+description: 'Installs PostgreSQL and PostGIS and configures it for CI tests'
+
 inputs:
     postgresql-version:
         description: 'Version of PostgreSQL to install'

.github/workflows/ci-tests.yml

@@ -140,6 +140,65 @@ jobs:
                   ../venv/bin/python -m pytest test/bdd --nominatim-purge
               working-directory: Nominatim
 
+    tests-windows:
+        needs: create-archive
+        runs-on: windows-latest
+
+        steps:
+            - uses: actions/download-artifact@v4
+              with:
+                  name: full-source
+
+            - name: Unpack Nominatim
+              run: tar xf nominatim-src.tar.bz2
+
+            - uses: ./Nominatim/.github/actions/setup-postgresql-windows
+              with:
+                  postgresql-version: 17
+
+            - name: Set up Python
+              uses: actions/setup-python@v5
+              with:
+                  python-version: '3.14'
+
+            - name: Install Spatialite
+              run: |
+                  Invoke-WebRequest -Uri "https://www.gaia-gis.it/gaia-sins/windows-bin-amd64/mod_spatialite-5.1.0-win-amd64.7z" -OutFile "spatialite.7z"
+                  7z x spatialite.7z -o"C:\spatialite"
+                  echo "C:\spatialite\mod_spatialite-5.1.0-win-amd64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+            - name: Install osm2pgsql
+              run: |
+                  Invoke-WebRequest -Uri "https://osm2pgsql.org/download/windows/osm2pgsql-latest-x64.zip" -OutFile "osm2pgsql.zip"
+                  Expand-Archive -Path "osm2pgsql.zip" -DestinationPath "C:\osm2pgsql"
+                  $BinDir = Get-ChildItem -Path "C:\osm2pgsql" -Recurse -Filter "osm2pgsql.exe" | Select-Object -ExpandProperty DirectoryName | Select-Object -First 1
+                  if (-not $BinDir) {
+                      Write-Error "Could not find osm2pgsql.exe"
+                      exit 1
+                  }
+                  echo "$BinDir" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+                  $FullExePath = Join-Path $BinDir "osm2pgsql.exe"
+                  echo "NOMINATIM_OSM2PGSQL_BINARY=$FullExePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+            - name: Set UTF-8 encoding
+              run: |
+                  echo "PYTHONUTF8=1" >> $env:GITHUB_ENV
+                  [System.Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+
+            - name: Install PyICU from wheel
+              run: |
+                  python -m pip install https://github.com/cgohlke/pyicu-build/releases/download/v2.16.0/pyicu-2.16-cp314-cp314-win_amd64.whl
+                  
+            - name: Install test prerequisites
+              run: |
+                  python -m pip install -U pip
+                  python -m pip install pytest pytest-asyncio "psycopg[binary]!=3.3.0" python-dotenv pyyaml jinja2 psutil sqlalchemy pytest-bdd falcon starlette uvicorn asgi_lifespan aiosqlite osmium mwparserfromhell
+
+            - name: Python unit tests
+              run: |
+                  python -m pytest test/python -k "not (import_osm or run_osm2pgsql)"
+              working-directory: Nominatim
+
     install:
         runs-on: ubuntu-latest
         needs: create-archive

docs/customize/Importance.md

@@ -20,7 +20,7 @@ functions as a tie-breaker between places with very similar primary
 importance values.
 
 nominatim.org has preprocessed importance tables for the
-[primary Wikipedia rankings](https://nominatim.org/data/wikimedia-importance.sql.gz)
+[primary Wikipedia rankings](https://nominatim.org/data/wikimedia-importance.csv.gz)
 and for [secondary importance](https://nominatim.org/data/wikimedia-secondary-importance.sql.gz)
 based on Wikipedia importance of the administrative areas.
 

docs/develop/Database-Layout.md

@@ -11,10 +11,38 @@ The import process creates the following tables:
 
 The `planet_osm_*` tables are the usual backing tables for OSM data. Note
 that Nominatim uses them to look up special relations and to find nodes on
-ways.
+ways. Apart from those the osm2pgsql import produces three tables as output.
 
-The osm2pgsql import produces a single table `place` as output with the following
-columns:
+The **place_postcode** table collects postcode information that is not
+already present on an object in the place table. That is for one thing
+[postcode area relations](https://wiki.openstreetmap.org/wiki/Tag:boundary%3Dpostal_code)
+and for another objects with a postcode tag but no other tagging that
+qualifies it for inclusion into the geocoding database.
+
+The table has the following fields:
+
+ * `osm_type` - kind of OSM object (**N** - node, **W** - way, **R** - relation)
+ * `osm_id` - original OSM ID
+ * `postcode` - postcode as extacted from the `postcal_code` tag
+ * `country_code` - computed country code for this postcode. This field
+   functions as a cache and is only computed when the table is used for
+   the computation of the final postcodes.
+ * `centroid` - centroid of the object
+ * `geometry` - the full geometry of the area for postcode areas only
+
+The **place_interpolation** table holds all
+[address interpolation lines](https://wiki.openstreetmap.org/wiki/Addresses#Interpolation)
+and has the following fields:
+
+ * `osm_id` - original OSM ID
+ * `type` - type of interpolation as extracted from the `addr:interpolation` tag
+ * `address` - any other `addr:*` tags
+ * `nodes` - list of OSM nodes contained in this interpolation,
+    needed to compute the involved housenumbers later
+ * `geometry` - the linestring for the interpolation (in WSG84)
+
+The **place** table holds all other OSM object that are interesting and
+has the following fields:
 
  * `osm_type` - kind of OSM object (**N** - node, **W** - way, **R** - relation)
  * `osm_id` - original OSM ID
@@ -65,23 +93,32 @@ additional columns:
  * `indexed_status` - processing status of the place (0 - ready, 1 - freshly inserted, 2 - needs updating, 100 - needs deletion)
  * `indexed_date` - timestamp when the place was processed last
  * `centroid` - a point feature for the place
+ * `token_info` - a dummy field used to inject information from the tokenizer
+   into the indexing process
 
 The **location_property_osmline** table is a special table for
 [address interpolations](https://wiki.openstreetmap.org/wiki/Addresses#Using_interpolation).
 The columns have the same meaning and use as the columns with the same name in
-the placex table. Only three columns are special:
+the placex table. Only the following columns are special:
 
- * `startnumber` and `endnumber` - beginning and end of the number range
-    for the interpolation
- * `interpolationtype` - a string `odd`, `even` or `all` to indicate
-    the interval between the numbers
+ * `startnumber`, `endnumber` and `step` - beginning and end of the number range
+    for the interpolation and the increment steps
+ * `type` - a string to indicate the interval between the numbers as imported
+   from the OSM `addr:interpolation` tag; valid values are `odd`, `even`, `all`
+   or a single digit number; interpolations with other values are silently
+   dropped
 
 Address interpolations are always ways in OSM, which is why there is no column
 `osm_type`.
 
-The **location_postcodes** table holds computed centroids of all postcodes that
-can be found in the OSM data. The meaning of the columns is again the same
-as that of the placex table.
+The **location_postcodes** table holds computed postcode assembled from the
+postcode information available in OSM. When a postcode has a postcode area
+relation, then the table stores its full geometry. For all other postcode
+the centroid is computed using the position of all OSM object that reference
+the same postoce. The `osm_id` field can be used to distinguish the two.
+When set, it refers to the OSM relation with the postcode area.
+The meaning of the columns in the table is again the same as that of the
+placex table.
 
 Every place needs an address, a set of surrounding places that describe the
 location of the place. The set of address places is made up of OSM places

docs/develop/osm2pgsql-tables.plantuml

@@ -35,10 +35,31 @@ map place {
   geometry => GEOMETRY
 }
 
+map place_postcode {
+  osm_type => CHAR(1)
+  osm_id => BIGINT
+  postcode => TEXT
+  country_code => TEXT
+  centroid => GEOMETRY
+  geometry => GEOMETRY
+}
+
+map place_interpolation {
+  osm_id => BIGINT
+  type => TEXT
+  address => HSTORE
+  nodes => BIGINT[]
+  geometry => GEOMETRY
+}
+
+
 planet_osm_nodes  -[hidden]> planet_osm_ways
 planet_osm_ways  -[hidden]> planet_osm_rels
 planet_osm_ways -[hidden]-> place
+place -[hidden]-> place_postcode
+place -[hidden]-> place_interpolation
 
 planet_osm_nodes::id <- planet_osm_ways::nodes
+planet_osm_nodes::id <- place_interpolation::nodes
 
 @enduml

docs/develop/search-tables.plantuml

@@ -29,6 +29,7 @@ map placex {
   indexed_date => TIMESTAMP
   centroid => GEOMETRY
   geometry => GEOMETRY
+  token_info JSONB
 }
 
 map search_name {
@@ -51,11 +52,11 @@ map word {
 map location_property_osmline {
   place_id => BIGINT
   osm_id => BIGINT
+  type => TEXT
   startnumber => INT
   endnumber => INT
-  interpolationtype => TEXT
+  step => int
   address => HSTORE
-  partition => SMALLINT
   geometry_sector => INT
   parent_place_id => BIGINT
   country_code => VARCHAR(2)
@@ -63,6 +64,7 @@ map location_property_osmline {
   indexed_status => SMALLINT
   indexed_date => TIMESTAMP
   linegeo => GEOMETRY
+  token_info JSONB
 }
 
 map place_addressline {
@@ -78,6 +80,7 @@ map location_postcodes {
   place_id => BIGINT
   osm_id => BIGINT
   postcode => TEXT
+  country_code => TEXT
   parent_place_id => BIGINT
   rank_search => SMALLINT
   indexed_status => SMALLINT

lib-lua/themes/nominatim/init.lua

@@ -77,7 +77,19 @@ local table_definitions = {
         indexes = {
             { column = 'postcode', method = 'btree' }
         }
-     }
+     },
+     place_interpolation = {
+        ids = { type = 'way', id_column = 'osm_id' },
+        columns = {
+            { column = 'type', type = 'text', not_null = true },
+            { column = 'address', type = 'hstore' },
+            { column = 'nodes', type = 'text', sql_type = 'bigint[]', not_null = true },
+            { column = 'geometry', type = 'linestring', projection = 'WGS84', not_null = true },
+        },
+        indexes = {
+            { column = 'nodes', method = 'gin' }
+        }
+    }
 }
 
 local insert_row = {}
@@ -703,9 +715,24 @@ function module.process_tags(o)
         o.address['country'] = nil
     end
 
-    if o.address.interpolation ~= nil then
-        o:write_place('place', 'houses', PlaceTransform.always)
-        return
+    if o.address.interpolation ~= nil and o.address.housenumber == nil
+            and o.object.type == 'way' and o.object.nodes ~= nil then
+        local extra_addr = nil
+        for k, v in pairs(o.address) do
+            if k ~= 'interpolation' then
+                if extra_addr == nil then
+                    extra_addr = {}
+                end
+                extra_addr[k] = v
+            end
+        end
+
+        insert_row.place_interpolation{
+            type = o.address.interpolation,
+            address = extra_addr,
+            nodes = '{' .. table.concat(o.object.nodes, ',') .. '}',
+            geometry = o.object:as_linestring()
+        }
     end
 
     -- collect main keys
@@ -728,7 +755,7 @@ function module.process_tags(o)
                     }
                 end
             elseif ktype == 'fallback' and o.has_name then
-                fallback = {k, v, PlaceTransform.named}
+                fallback = {k, v, PlaceTransform.always}
             end
         end
     end

lib-sql/functions/interpolation.sql

@@ -2,11 +2,99 @@
 --
 -- This file is part of Nominatim. (https://nominatim.org)
 --
--- Copyright (C) 2022 by the Nominatim developer community.
+-- Copyright (C) 2026 by the Nominatim developer community.
 -- For a full list of authors see the git log.
 
 -- Functions for address interpolation objects in location_property_osmline.
 
+CREATE OR REPLACE FUNCTION place_interpolation_insert()
+  RETURNS TRIGGER
+  AS $$
+DECLARE
+  existing RECORD;
+  existingplacex BIGINT[];
+
+BEGIN
+  IF NOT (NEW.type in ('odd', 'even', 'all') OR NEW.type similar to '[1-9]') THEN
+    -- the new interpolation is illegal, simply remove existing entries
+    DELETE FROM location_property_osmline o WHERE o.osm_id = NEW.osm_id;
+    RETURN NULL;
+  END IF;
+
+  -- Remove the place from the list of places to be deleted
+  DELETE FROM place_interpolation_to_be_deleted pdel WHERE pdel.osm_id = NEW.osm_id;
+
+  SELECT * INTO existing FROM place_interpolation p WHERE p.osm_id = NEW.osm_id;
+
+  -- Get the existing entry from the interpolation table.
+  SELECT array_agg(place_id) INTO existingplacex
+    FROM location_property_osmline o WHERE o.osm_id = NEW.osm_id;
+
+  IF array_length(existingplacex, 1) is NULL THEN
+    INSERT INTO location_property_osmline (osm_id, type, address, linegeo)
+      VALUES (NEW.osm_id, NEW.type, NEW.address, NEW.geometry);
+  ELSE
+    -- Update the interpolation table:
+    --   The first entry gets the original data, all other entries
+    --   are removed and will be recreated on indexing.
+    --   (An interpolation can be split up, if it has more than 2 address nodes)
+    -- Update unconditionally here as the changes might be coming from the
+    -- nodes on the interpolation.
+    UPDATE location_property_osmline
+      SET type = NEW.type,
+          address = NEW.address,
+          linegeo = NEW.geometry,
+          startnumber = null,
+          indexed_status = 1
+      WHERE place_id = existingplacex[1];
+    IF array_length(existingplacex, 1) > 1 THEN
+      DELETE FROM location_property_osmline WHERE place_id = any(existingplacex[2:]);
+    END IF;
+  END IF;
+
+  -- need to invalidate nodes because they might copy address info
+  IF NEW.address is not NULL
+     AND (existing.osm_id is NULL
+          OR coalesce(existing.address, ''::hstore) != NEW.address)
+  THEN
+    UPDATE placex SET indexed_status = 2
+      WHERE osm_type = 'N' AND osm_id = ANY(NEW.nodes) AND indexed_status = 0;
+  END IF;
+
+  -- finally update/insert place_interpolation itself
+
+  IF existing.osm_id is not NULL THEN
+    -- Always updates as the nodes with the housenumber might be the reason
+    -- for the change.
+    UPDATE place_interpolation p
+      SET type = NEW.type,
+          address = NEW.address,
+          nodes = NEW.nodes,
+          geometry = NEW.geometry
+      WHERE p.osm_id = NEW.osm_id;
+
+    RETURN NULL;
+  END IF;
+
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION place_interpolation_delete()
+  RETURNS TRIGGER
+  AS $$
+DECLARE
+  deferred BOOLEAN;
+BEGIN
+  {% if debug %}RAISE WARNING 'Delete for interpolation %', OLD.osm_id;{% endif %}
+
+  INSERT INTO place_interpolation_to_be_deleted (osm_id) VALUES(OLD.osm_id);
+
+  RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
 
 CREATE OR REPLACE FUNCTION get_interpolation_address(in_address HSTORE, wayid BIGINT)
 RETURNS HSTORE
@@ -19,17 +107,20 @@ BEGIN
     RETURN in_address;
   END IF;
 
-  SELECT nodes INTO waynodes FROM planet_osm_ways WHERE id = wayid;
-  FOR location IN
-    SELECT placex.address, placex.osm_id FROM placex
-     WHERE osm_type = 'N' and osm_id = ANY(waynodes)
-           and placex.address is not null
-           and (placex.address ? 'street' or placex.address ? 'place')
-           and indexed_status < 100
-  LOOP
-    -- mark it as a derived address
-    RETURN location.address || in_address || hstore('_inherited', '');
-  END LOOP;
+  SELECT nodes INTO waynodes FROM place_interpolation WHERE osm_id = wayid;
+
+  IF array_upper(waynodes, 1) IS NOT NULL THEN
+    FOR location IN
+      SELECT placex.address, placex.osm_id FROM placex
+       WHERE osm_type = 'N' and osm_id = ANY(waynodes)
+             and placex.address is not null
+             and (placex.address ? 'street' or placex.address ? 'place')
+             and indexed_status < 100
+    LOOP
+      -- mark it as a derived address
+      RETURN location.address || coalesce(in_address, ''::hstore) || hstore('_inherited', '');
+    END LOOP;
+  END IF;
 
   RETURN in_address;
 END;
@@ -73,51 +164,6 @@ $$
 LANGUAGE plpgsql STABLE PARALLEL SAFE;
 
 
-CREATE OR REPLACE FUNCTION reinsert_interpolation(way_id BIGINT, addr HSTORE,
-                                                  geom GEOMETRY)
-  RETURNS INT
-  AS $$
-DECLARE
-  existing BIGINT[];
-BEGIN
-  IF addr is NULL OR NOT addr ? 'interpolation'
-         OR NOT (addr->'interpolation' in ('odd', 'even', 'all')
-                 or addr->'interpolation' similar to '[1-9]')
-  THEN
-    -- the new interpolation is illegal, simply remove existing entries
-    DELETE FROM location_property_osmline WHERE osm_id = way_id;
-  ELSE
-    -- Get the existing entry from the interpolation table.
-    SELECT array_agg(place_id) INTO existing
-      FROM location_property_osmline WHERE osm_id = way_id;
-
-    IF existing IS NULL or array_length(existing, 1) = 0 THEN
-      INSERT INTO location_property_osmline (osm_id, address, linegeo)
-        VALUES (way_id, addr, geom);
-    ELSE
-      -- Update the interpolation table:
-      --   The first entry gets the original data, all other entries
-      --   are removed and will be recreated on indexing.
-      --   (An interpolation can be split up, if it has more than 2 address nodes)
-      UPDATE location_property_osmline
-        SET address = addr,
-            linegeo = geom,
-            startnumber = null,
-            indexed_status = 1
-        WHERE place_id = existing[1];
-      IF array_length(existing, 1) > 1 THEN
-        DELETE FROM location_property_osmline
-          WHERE place_id = any(existing[2:]);
-      END IF;
-    END IF;
-  END IF;
-
-  RETURN 1;
-END;
-$$
-LANGUAGE plpgsql;
-
-
 CREATE OR REPLACE FUNCTION osmline_insert()
   RETURNS TRIGGER
   AS $$
@@ -128,20 +174,17 @@ BEGIN
   NEW.indexed_date := now();
 
   IF NEW.indexed_status IS NULL THEN
-      IF NEW.address is NULL OR NOT NEW.address ? 'interpolation'
-         OR NOT (NEW.address->'interpolation' in ('odd', 'even', 'all')
-                 or NEW.address->'interpolation' similar to '[1-9]')
-      THEN
-          -- alphabetic interpolation is not supported
-          RETURN NULL;
-      END IF;
+    IF NOT(NEW.type in ('odd', 'even', 'all') OR NEW.type similar to '[1-9]') THEN
+        -- alphabetic interpolation is not supported
+        RETURN NULL;
+    END IF;
 
-      NEW.indexed_status := 1; --STATUS_NEW
-      centroid := get_center_point(NEW.linegeo);
-      NEW.country_code := lower(get_country_code(centroid));
+    centroid := get_center_point(NEW.linegeo);
+    NEW.indexed_status := 1; --STATUS_NEW
+    NEW.country_code := lower(get_country_code(centroid));
 
-      NEW.partition := get_partition(NEW.country_code);
-      NEW.geometry_sector := geometry_sector(NEW.partition, centroid);
+    NEW.partition := get_partition(NEW.country_code);
+    NEW.geometry_sector := geometry_sector(NEW.partition, centroid);
   END IF;
 
   RETURN NEW;
@@ -182,32 +225,22 @@ BEGIN
                                                   get_center_point(NEW.linegeo),
                                                   NEW.linegeo);
 
-  -- Cannot find a parent street. We will not be able to display a reliable
-  -- address, so drop entire interpolation.
-  IF NEW.parent_place_id is NULL THEN
-    DELETE FROM location_property_osmline where place_id = OLD.place_id;
-    RETURN NULL;
-  END IF;
-
   NEW.token_info := token_strip_info(NEW.token_info);
   IF NEW.address ? '_inherited' THEN
-    NEW.address := hstore('interpolation', NEW.address->'interpolation');
+    NEW.address := NULL;
   END IF;
 
   -- If the line was newly inserted, split the line as necessary.
-  IF OLD.indexed_status = 1 THEN
-    IF NEW.address->'interpolation' in ('odd', 'even') THEN
+  IF NEW.parent_place_id is not NULL AND NEW.startnumber is NULL THEN
+    IF NEW.type in ('odd', 'even') THEN
       NEW.step := 2;
-      stepmod := CASE WHEN NEW.address->'interpolation' = 'odd' THEN 1 ELSE 0 END;
+      stepmod := CASE WHEN NEW.type = 'odd' THEN 1 ELSE 0 END;
     ELSE
-      NEW.step := CASE WHEN NEW.address->'interpolation' = 'all'
-                       THEN 1
-                       ELSE (NEW.address->'interpolation')::SMALLINT END;
+      NEW.step := CASE WHEN NEW.type = 'all' THEN 1 ELSE (NEW.type)::SMALLINT END;
       stepmod := NULL;
     END IF;
 
-    SELECT nodes INTO waynodes
-      FROM planet_osm_ways WHERE id = NEW.osm_id;
+    SELECT nodes INTO waynodes FROM place_interpolation WHERE osm_id = NEW.osm_id;
 
     IF array_upper(waynodes, 1) IS NULL THEN
       RETURN NEW;
@@ -314,12 +347,12 @@ BEGIN
         ELSE
           INSERT INTO location_property_osmline
                  (linegeo, partition, osm_id, parent_place_id,
-                  startnumber, endnumber, step,
+                  startnumber, endnumber, step, type,
                   address, postcode, country_code,
                   geometry_sector, indexed_status)
           VALUES (ST_ReducePrecision(sectiongeo, 0.0000001),
                   NEW.partition, NEW.osm_id, NEW.parent_place_id,
-                  startnumber, endnumber, NEW.step,
+                  startnumber, endnumber, NEW.step, NEW.type,
                   NEW.address, postcode,
                   NEW.country_code, NEW.geometry_sector, 0);
         END IF;

lib-sql/functions/place_triggers.sql

@@ -14,7 +14,6 @@ DECLARE
   existing RECORD;
   existingplacex RECORD;
   existingline BIGINT[];
-  interpol RECORD;
 BEGIN
   {% if debug %}
     RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry);
@@ -55,41 +54,6 @@ BEGIN
   DELETE from import_polygon_error where osm_type = NEW.osm_type and osm_id = NEW.osm_id;
   DELETE from import_polygon_delete where osm_type = NEW.osm_type and osm_id = NEW.osm_id;
 
-  -- ---- Interpolation Lines
-
-  IF NEW.class='place' and NEW.type='houses'
-     and NEW.osm_type='W' and ST_GeometryType(NEW.geometry) = 'ST_LineString'
-  THEN
-    PERFORM reinsert_interpolation(NEW.osm_id, NEW.address, NEW.geometry);
-
-    -- Now invalidate all address nodes on the line.
-    -- They get their parent from the interpolation.
-    UPDATE placex p SET indexed_status = 2
-      FROM planet_osm_ways w
-      WHERE w.id = NEW.osm_id and p.osm_type = 'N' and p.osm_id = any(w.nodes)
-            and indexed_status = 0;
-
-    -- If there is already an entry in place, just update that, if necessary.
-    IF existing.osm_type is not null THEN
-      IF coalesce(existing.address, ''::hstore) != coalesce(NEW.address, ''::hstore)
-         OR existing.geometry::text != NEW.geometry::text
-      THEN
-        UPDATE place
-          SET name = NEW.name,
-              address = NEW.address,
-              extratags = NEW.extratags,
-              admin_level = NEW.admin_level,
-              geometry = NEW.geometry
-          WHERE osm_type = NEW.osm_type and osm_id = NEW.osm_id
-                and class = NEW.class and type = NEW.type;
-       END IF;
-
-       RETURN NULL;
-    END IF;
-
-    RETURN NEW;
-  END IF;
-
   -- ---- All other place types.
 
   -- When an area is changed from large to small: log and discard change
@@ -109,29 +73,6 @@ BEGIN
     RETURN null;
   END IF;
 
-  -- If an address node is part of a interpolation line and changes or is
-  -- newly inserted (happens when the node already existed but now gets address
-  -- information), then mark the interpolation line for reparenting.
-  -- (Already here, because interpolation lines are reindexed before nodes,
-  --  so in the second call it would be too late.)
-  IF NEW.osm_type='N'
-     and coalesce(existing.address, ''::hstore) != coalesce(NEW.address, ''::hstore)
-  THEN
-      FOR interpol IN
-        SELECT DISTINCT osm_id, address, geometry FROM place, planet_osm_ways w
-        WHERE NEW.geometry && place.geometry
-              and place.osm_type = 'W'
-              and place.address ? 'interpolation'
-              and exists (SELECT * FROM location_property_osmline
-                          WHERE osm_id = place.osm_id
-                                and indexed_status in (0, 2))
-              and w.id = place.osm_id and NEW.osm_id = any (w.nodes)
-      LOOP
-        PERFORM reinsert_interpolation(interpol.osm_id, interpol.address,
-                                       interpol.geometry);
-      END LOOP;
-  END IF;
-
   -- Get the existing placex entry.
   SELECT * INTO existingplacex
     FROM placex

lib-sql/functions/placex_triggers.sql

@@ -53,12 +53,8 @@ BEGIN
       -- See if we can inherit additional address tags from an interpolation.
       -- These will become permanent.
       FOR location IN
-        SELECT (address - 'interpolation'::text - 'housenumber'::text) as address
-          FROM place, planet_osm_ways w
-          WHERE place.osm_type = 'W' and place.address ? 'interpolation'
-                and place.geometry && p.geometry
-                and place.osm_id = w.id
-                and p.osm_id = any(w.nodes)
+        SELECT address FROM place_interpolation
+          WHERE ARRAY[p.osm_id] && place_interpolation.nodes AND address is not NULL
       LOOP
         result.address := location.address || result.address;
       END LOOP;
@@ -89,7 +85,7 @@ BEGIN
 
       -- Add the linked-place (e.g. city) name as a searchable placename in the default language (if any)
       default_language := get_country_language_code(location.country_code);
-      IF default_language is not NULL AND NOT location.name ? ('name:' || default_language) THEN
+      IF default_language is not NULL AND location.name ? 'name' AND NOT location.name ? ('name:' || default_language) THEN
         location.name := location.name || hstore('name:' || default_language, location.name->'name');
       END IF;
 
@@ -735,6 +731,10 @@ BEGIN
 
   END IF;
 
+  IF NEW.importance IS NULL THEN
+    NEW.importance := 0.40001 - (NEW.rank_search::float / 75);
+  END IF;
+
   {% if debug %}RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;{% endif %}
 
 {% if not disable_diff_updates %}
@@ -1080,10 +1080,8 @@ BEGIN
       {% if debug %}RAISE WARNING 'Waterway processed';{% endif %}
   END IF;
 
-  NEW.importance := null;
-  SELECT wikipedia, importance
-    FROM compute_importance(NEW.extratags, NEW.country_code, NEW.rank_search, NEW.centroid)
-    INTO NEW.wikipedia,NEW.importance;
+  SELECT wikipedia, importance INTO NEW.wikipedia, NEW.importance
+    FROM compute_importance(NEW.extratags, NEW.country_code, NEW.rank_search, NEW.centroid);
 
 {% if debug %}RAISE WARNING 'Importance computed from wikipedia: %', NEW.importance;{% endif %}
 
@@ -1140,10 +1138,10 @@ BEGIN
                                        NEW.token_info, NEW.centroid);
 
         IF array_length(name_vector, 1) is not NULL THEN
-          INSERT INTO search_name (place_id, search_rank, address_rank,
+          INSERT INTO search_name (place_id, address_rank,
                                    importance, country_code, name_vector,
                                    nameaddress_vector, centroid)
-                 VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address,
+                 VALUES (NEW.place_id, NEW.rank_address,
                          NEW.importance, NEW.country_code, name_vector,
                          nameaddress_vector, NEW.centroid);
           {% if debug %}RAISE WARNING 'Place added to search table';{% endif %}
@@ -1313,10 +1311,10 @@ BEGIN
     {% if debug %}RAISE WARNING 'added to search name (full)';{% endif %}
 
     {% if not db.reverse_only %}
-        INSERT INTO search_name (place_id, search_rank, address_rank,
+        INSERT INTO search_name (place_id, address_rank,
                                  importance, country_code, name_vector,
                                  nameaddress_vector, centroid)
-               VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address,
+               VALUES (NEW.place_id, NEW.rank_address,
                        NEW.importance, NEW.country_code, name_vector,
                        nameaddress_vector, NEW.centroid);
     {% endif %}

lib-sql/functions/utils.sql

@@ -153,8 +153,7 @@ BEGIN
     IF ST_GeometryType(geom) in ('ST_Polygon','ST_MultiPolygon') THEN
       SELECT min(postcode), count(*) FROM
         (SELECT postcode FROM location_postcodes
-           WHERE geom && location_postcodes.geometry -- want to use the index
-                 AND ST_Contains(geom, location_postcodes.centroid)
+           WHERE ST_Contains(geom, location_postcodes.centroid)
                  AND country_code = country
            LIMIT 2) sub
         INTO outcode, cnt;
@@ -625,18 +624,22 @@ BEGIN
           and placex.type = place_to_be_deleted.type
           and not deferred;
 
-   -- Mark for delete in interpolations
-   UPDATE location_property_osmline SET indexed_status = 100 FROM place_to_be_deleted
-    WHERE place_to_be_deleted.osm_type = 'W'
-          and place_to_be_deleted.class = 'place'
-          and place_to_be_deleted.type = 'houses'
-          and location_property_osmline.osm_id = place_to_be_deleted.osm_id
-          and not deferred;
+  -- Clear todo list.
+  TRUNCATE TABLE place_to_be_deleted;
 
-   -- Clear todo list.
-   TRUNCATE TABLE place_to_be_deleted;
+   -- delete from place_interpolation table
+  ALTER TABLE place_interpolation DISABLE TRIGGER place_interpolation_before_delete;
+  DELETE FROM place_interpolation p USING place_interpolation_to_be_deleted d
+    WHERE p.osm_id = d.osm_id;
+  ALTER TABLE place_interpolation ENABLE TRIGGER place_interpolation_before_delete;
 
-   RETURN NULL;
+  UPDATE location_property_osmline o SET indexed_status = 100
+    FROM place_interpolation_to_be_deleted d
+    WHERE o.osm_id = d.osm_id;
+
+  TRUNCATE TABLE place_interpolation_to_be_deleted;
+
+  RETURN NULL;
 END;
 $$ LANGUAGE plpgsql;
 

lib-sql/indices.sql

@@ -2,7 +2,7 @@
 --
 -- This file is part of Nominatim. (https://nominatim.org)
 --
--- Copyright (C) 2025 by the Nominatim developer community.
+-- Copyright (C) 2026 by the Nominatim developer community.
 -- For a full list of authors see the git log.
 
 -- Indices used only during search and update.
@@ -67,11 +67,15 @@ CREATE INDEX IF NOT EXISTS idx_osmline_parent_osm_id
 ---
 -- Table needed for running updates with osm2pgsql on place.
   CREATE TABLE IF NOT EXISTS place_to_be_deleted (
-    osm_type CHAR(1),
-    osm_id BIGINT,
-    class TEXT,
-    type TEXT,
-    deferred BOOLEAN
+    osm_type CHAR(1) NOT NULL,
+    osm_id BIGINT NOT NULL,
+    class TEXT NOT NULL,
+    type TEXT NOT NULL,
+    deferred BOOLEAN NOT NULL
+   );
+
+  CREATE TABLE IF NOT EXISTS place_interpolation_to_be_deleted (
+    osm_id BIGINT NOT NULL
    );
 ---
   CREATE INDEX IF NOT EXISTS idx_location_postcodes_parent_place_id

lib-sql/table-triggers.sql

@@ -2,7 +2,7 @@
 --
 -- This file is part of Nominatim. (https://nominatim.org)
 --
--- Copyright (C) 2025 by the Nominatim developer community.
+-- Copyright (C) 2026 by the Nominatim developer community.
 -- For a full list of authors see the git log.
 
 -- insert creates the location tables, creates location indexes if indexed == true
@@ -31,3 +31,8 @@ CREATE TRIGGER location_postcodes_before_delete BEFORE DELETE ON location_postco
     FOR EACH ROW EXECUTE PROCEDURE postcodes_delete();
 CREATE TRIGGER location_postcodes_before_insert BEFORE INSERT ON location_postcodes
     FOR EACH ROW EXECUTE PROCEDURE postcodes_insert();
+
+CREATE TRIGGER place_interpolation_before_insert BEFORE INSERT ON place_interpolation
+    FOR EACH ROW EXECUTE PROCEDURE place_interpolation_insert();
+CREATE TRIGGER place_interpolation_before_delete BEFORE DELETE ON place_interpolation
+    FOR EACH ROW EXECUTE PROCEDURE place_interpolation_delete();

lib-sql/tables.sql

@@ -5,276 +5,21 @@
 -- Copyright (C) 2026 by the Nominatim developer community.
 -- For a full list of authors see the git log.
 
-drop table if exists import_status;
-CREATE TABLE import_status (
-  lastimportdate timestamp with time zone NOT NULL,
-  sequence_id integer,
-  indexed boolean
-  );
-
-drop table if exists import_osmosis_log;
-CREATE TABLE import_osmosis_log (
-  batchend timestamp,
-  batchseq integer,
-  batchsize bigint,
-  starttime timestamp,
-  endtime timestamp,
-  event text
-  );
-
-DROP TABLE IF EXISTS nominatim_properties;
-CREATE TABLE nominatim_properties (
-    property TEXT NOT NULL,
-    value TEXT
-);
-
-drop table IF EXISTS location_area CASCADE;
-CREATE TABLE location_area (
-  place_id BIGINT NOT NULL,
-  keywords INTEGER[] NOT NULL,
-  partition SMALLINT NOT NULL,
-  rank_search SMALLINT NOT NULL,
-  rank_address SMALLINT NOT NULL,
-  country_code VARCHAR(2),
-  isguess BOOL NOT NULL,
-  postcode TEXT,
-  centroid GEOMETRY(Point, 4326) NOT NULL,
-  geometry GEOMETRY(Geometry, 4326) NOT NULL
-  );
-
-CREATE TABLE location_area_large () INHERITS (location_area);
-
-DROP TABLE IF EXISTS location_area_country;
-CREATE TABLE location_area_country (
-  place_id BIGINT NOT NULL,
-  country_code varchar(2) NOT NULL,
-  geometry GEOMETRY(Geometry, 4326) NOT NULL
-  ) {{db.tablespace.address_data}};
-CREATE INDEX idx_location_area_country_geometry ON location_area_country USING GIST (geometry) {{db.tablespace.address_index}};
-
-
-CREATE TABLE location_property_tiger (
-  place_id BIGINT NOT NULL,
-  parent_place_id BIGINT,
-  startnumber INTEGER NOT NULL,
-  endnumber INTEGER NOT NULL,
-  step SMALLINT NOT NULL,
-  partition SMALLINT NOT NULL,
-  linegeo GEOMETRY NOT NULL,
-  postcode TEXT);
-
-drop table if exists location_property_osmline;
-CREATE TABLE location_property_osmline (
-    place_id BIGINT NOT NULL,
-    osm_id BIGINT NOT NULL,
-    parent_place_id BIGINT,
-    geometry_sector INTEGER NOT NULL,
-    indexed_date TIMESTAMP,
-    startnumber INTEGER,
-    endnumber INTEGER,
-    step SMALLINT,
-    partition SMALLINT NOT NULL,
-    indexed_status SMALLINT NOT NULL,
-    linegeo GEOMETRY NOT NULL,
-    address HSTORE,
-    token_info JSONB, -- custom column for tokenizer use only
-    postcode TEXT,
-    country_code VARCHAR(2)
-  ){{db.tablespace.search_data}};
-CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline USING BTREE (place_id) {{db.tablespace.search_index}};
-CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline USING BTREE (geometry_sector) {{db.tablespace.address_index}};
-CREATE INDEX idx_osmline_linegeo ON location_property_osmline USING GIST (linegeo) {{db.tablespace.search_index}}
-  WHERE startnumber is not null;
-
-drop table IF EXISTS search_name;
-{% if not db.reverse_only %}
-CREATE TABLE search_name (
-  place_id BIGINT NOT NULL,
-  importance FLOAT NOT NULL,
-  search_rank SMALLINT NOT NULL,
-  address_rank SMALLINT NOT NULL,
-  name_vector integer[] NOT NULL,
-  nameaddress_vector integer[] NOT NULL,
-  country_code varchar(2),
-  centroid GEOMETRY(Geometry, 4326) NOT NULL
-  ) {{db.tablespace.search_data}};
-CREATE UNIQUE INDEX idx_search_name_place_id
-  ON search_name USING BTREE (place_id) {{db.tablespace.search_index}};
-{% endif %}
-
-drop table IF EXISTS place_addressline;
-CREATE TABLE place_addressline (
-  place_id BIGINT NOT NULL,
-  address_place_id BIGINT NOT NULL,
-  distance FLOAT NOT NULL,
-  cached_rank_address SMALLINT NOT NULL,
-  fromarea boolean NOT NULL,
-  isaddress boolean NOT NULL
-  ) {{db.tablespace.search_data}};
-CREATE INDEX idx_place_addressline_place_id on place_addressline USING BTREE (place_id) {{db.tablespace.search_index}};
-
----------  PLACEX - storage for all indexed places -----------------
-
-DROP TABLE IF EXISTS placex;
-CREATE TABLE placex (
-  place_id BIGINT NOT NULL,
-  parent_place_id BIGINT,
-  linked_place_id BIGINT,
-  importance FLOAT,
-  indexed_date TIMESTAMP,
-  geometry_sector INTEGER NOT NULL,
-  rank_address SMALLINT NOT NULL,
-  rank_search SMALLINT NOT NULL,
-  partition SMALLINT NOT NULL,
-  indexed_status SMALLINT NOT NULL,
-  LIKE place INCLUDING CONSTRAINTS,
-  wikipedia TEXT, -- calculated wikipedia article name (language:title)
-  token_info JSONB, -- custom column for tokenizer use only
-  country_code varchar(2),
-  housenumber TEXT,
-  postcode TEXT,
-  centroid GEOMETRY(Geometry, 4326) NOT NULL
-  ) {{db.tablespace.search_data}};
-
-CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {{db.tablespace.search_index}};
-{% for osm_type in ('N', 'W', 'R') %}
-CREATE INDEX idx_placex_osmid_{{osm_type | lower}} ON placex
-  USING BTREE (osm_id) {{db.tablespace.search_index}}
-  WHERE osm_type = '{{osm_type}}';
-{% endfor %}
-
--- Usage: - removing linkage status on update
---        - lookup linked places for /details
-CREATE INDEX idx_placex_linked_place_id ON placex
-  USING BTREE (linked_place_id) {{db.tablespace.address_index}}
-  WHERE linked_place_id IS NOT NULL;
-
--- Usage: - check that admin boundaries do not overtake each other rank-wise
---        - check that place node in a admin boundary with the same address level
---        - boundary is not completely contained in a place area
---        - parenting of large-area or unparentable features
-CREATE INDEX idx_placex_geometry_address_area_candidates ON placex
-  USING gist (geometry) {{db.tablespace.address_index}}
-  WHERE rank_address between 1 and 25
-        and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon');
-
--- Usage: - POI is within building with housenumber
-CREATE INDEX idx_placex_geometry_buildings ON placex
-  USING SPGIST (geometry) {{db.tablespace.address_index}}
-  WHERE address is not null and rank_search = 30
-        and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon');
-
--- Usage: - linking of similar named places to boundaries
---        - linking of place nodes with same type to boundaries
-CREATE INDEX idx_placex_geometry_placenode ON placex
-  USING SPGIST (geometry) {{db.tablespace.address_index}}
-  WHERE osm_type = 'N' and rank_search < 26 and class = 'place';
-
--- Usage: - is node part of a way?
---        - find parent of interpolation spatially
-CREATE INDEX idx_placex_geometry_lower_rank_ways ON placex
-  USING SPGIST (geometry) {{db.tablespace.address_index}}
-  WHERE osm_type = 'W' and rank_search >= 26;
-
--- Usage: - linking place nodes by wikidata tag to boundaries
-CREATE INDEX idx_placex_wikidata on placex
-  USING BTREE ((extratags -> 'wikidata')) {{db.tablespace.address_index}}
-  WHERE extratags ? 'wikidata' and class = 'place'
-        and osm_type = 'N' and rank_search < 26;
-
--- The following two indexes function as a todo list for indexing.
-
-CREATE INDEX idx_placex_rank_address_sector ON placex
-  USING BTREE (rank_address, geometry_sector) {{db.tablespace.address_index}}
-  WHERE indexed_status > 0;
-
-CREATE INDEX idx_placex_rank_boundaries_sector ON placex
-  USING BTREE (rank_search, geometry_sector) {{db.tablespace.address_index}}
-  WHERE class = 'boundary' and type = 'administrative'
-        and indexed_status > 0;
-
-
 DROP SEQUENCE IF EXISTS seq_place;
 CREATE SEQUENCE seq_place start 1;
 
--- Table for synthetic postcodes.
-DROP TABLE IF EXISTS location_postcodes;
-CREATE TABLE location_postcodes (
-  place_id BIGINT NOT NULL,
-  parent_place_id BIGINT,
-  osm_id BIGINT,
-  rank_search SMALLINT NOT NULL,
-  indexed_status SMALLINT NOT NULL,
-  indexed_date TIMESTAMP,
-  country_code varchar(2) NOT NULL,
-  postcode TEXT NOT NULL,
-  centroid GEOMETRY(Geometry, 4326) NOT NULL,
-  geometry GEOMETRY(Geometry, 4326) NOT NULL
-  );
-CREATE UNIQUE INDEX idx_location_postcodes_id ON location_postcodes
-  USING BTREE (place_id) {{db.tablespace.search_index}};
-CREATE INDEX idx_location_postcodes_geometry ON location_postcodes
-  USING GIST (geometry) {{db.tablespace.search_index}};
-CREATE INDEX IF NOT EXISTS idx_location_postcodes_postcode
-  ON location_postcodes USING BTREE (postcode, country_code)
-  {{db.tablespace.search_index}};
-CREATE INDEX IF NOT EXISTS idx_location_postcodes_osmid
-  ON location_postcodes USING BTREE (osm_id) {{db.tablespace.search_index}};
-
--- Table to store location of entrance nodes
-DROP TABLE IF EXISTS placex_entrance;
-CREATE TABLE placex_entrance (
-  place_id BIGINT NOT NULL,
-  osm_id BIGINT NOT NULL,
-  type TEXT NOT NULL,
-  location GEOMETRY(Point, 4326) NOT NULL,
-  extratags HSTORE
-  );
-CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
-  USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};
-
--- Create an index on the place table for lookups to populate the entrance
--- table
-CREATE INDEX IF NOT EXISTS idx_placex_entrance_lookup ON place
-  USING BTREE (osm_id)
-  WHERE class IN ('routing:entrance', 'entrance');
-
-DROP TABLE IF EXISTS import_polygon_error;
-CREATE TABLE import_polygon_error (
-  osm_id BIGINT,
-  osm_type CHAR(1),
-  class TEXT NOT NULL,
-  type TEXT NOT NULL,
-  name HSTORE,
-  country_code varchar(2),
-  updated timestamp,
-  errormessage text,
-  prevgeometry GEOMETRY(Geometry, 4326),
-  newgeometry GEOMETRY(Geometry, 4326)
-  );
-CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error USING BTREE (osm_type, osm_id);
-
-DROP TABLE IF EXISTS import_polygon_delete;
-CREATE TABLE import_polygon_delete (
-  osm_id BIGINT,
-  osm_type CHAR(1),
-  class TEXT NOT NULL,
-  type TEXT NOT NULL
-  );
-CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete USING BTREE (osm_type, osm_id);
-
-DROP SEQUENCE IF EXISTS file;
-CREATE SEQUENCE file start 1;
-
-{% if 'wikimedia_importance' not in db.tables and 'wikipedia_article' not in db.tables %}
--- create dummy tables here, if nothing was imported
-CREATE TABLE wikimedia_importance (
-  language TEXT NOT NULL,
-  title TEXT NOT NULL,
-  importance double precision NOT NULL,
-  wikidata TEXT
-)  {{db.tablespace.address_data}};
-{% endif %}
+{% include('tables/status.sql') %}
+{% include('tables/nominatim_properties.sql') %}
+{% include('tables/location_area.sql') %}
+{% include('tables/tiger.sql') %}
+{% include('tables/interpolation.sql') %}
+{% include('tables/search_name.sql') %}
+{% include('tables/addressline.sql') %}
+{% include('tables/placex.sql') %}
+{% include('tables/postcodes.sql') %}
+{% include('tables/entrance.sql') %}
+{% include('tables/import_reports.sql') %}
+{% include('tables/importance_tables.sql') %}
 
 -- osm2pgsql does not create indexes on the middle tables for Nominatim
 -- Add one for lookup of associated street relations.
@@ -287,8 +32,3 @@ CREATE INDEX planet_osm_rels_relation_members_idx ON planet_osm_rels USING gin(p
   WITH (fastupdate=off)
   {{db.tablespace.address_index}};
 {% endif %}
-
--- Needed for lookups if a node is part of an interpolation.
-CREATE INDEX IF NOT EXISTS idx_place_interpolations
-    ON place USING gist(geometry) {{db.tablespace.address_index}}
-    WHERE osm_type = 'W' and address ? 'interpolation';

lib-sql/tables/addressline.sql

@@ -0,0 +1,20 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS place_addressline;
+
+CREATE TABLE place_addressline (
+  place_id BIGINT NOT NULL,
+  address_place_id BIGINT NOT NULL,
+  distance FLOAT NOT NULL,
+  cached_rank_address SMALLINT NOT NULL,
+  fromarea boolean NOT NULL,
+  isaddress boolean NOT NULL
+  ) {{db.tablespace.search_data}};
+
+CREATE INDEX idx_place_addressline_place_id ON place_addressline
+  USING BTREE (place_id) {{db.tablespace.search_index}};

lib-sql/tables/entrance.sql

@@ -0,0 +1,20 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+-- Table to store location of entrance nodes
+DROP TABLE IF EXISTS placex_entrance;
+
+CREATE TABLE placex_entrance (
+  place_id BIGINT NOT NULL,
+  osm_id BIGINT NOT NULL,
+  type TEXT NOT NULL,
+  location GEOMETRY(Point, 4326) NOT NULL,
+  extratags HSTORE
+  );
+
+CREATE UNIQUE INDEX idx_placex_entrance_place_id_osm_id ON placex_entrance
+  USING BTREE (place_id, osm_id) {{db.tablespace.search_index}};

lib-sql/tables/import_reports.sql

@@ -0,0 +1,35 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS import_polygon_error;
+CREATE TABLE import_polygon_error (
+  osm_id BIGINT,
+  osm_type CHAR(1),
+  class TEXT NOT NULL,
+  type TEXT NOT NULL,
+  name HSTORE,
+  country_code varchar(2),
+  updated timestamp,
+  errormessage text,
+  prevgeometry GEOMETRY(Geometry, 4326),
+  newgeometry GEOMETRY(Geometry, 4326)
+  );
+
+CREATE INDEX idx_import_polygon_error_osmid ON import_polygon_error
+  USING BTREE (osm_type, osm_id);
+
+
+DROP TABLE IF EXISTS import_polygon_delete;
+CREATE TABLE import_polygon_delete (
+  osm_id BIGINT,
+  osm_type CHAR(1),
+  class TEXT NOT NULL,
+  type TEXT NOT NULL
+  );
+
+CREATE INDEX idx_import_polygon_delete_osmid ON import_polygon_delete
+  USING BTREE (osm_type, osm_id);

lib-sql/tables/importance_tables.sql

@@ -0,0 +1,16 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+{% if 'wikimedia_importance' not in db.tables and 'wikipedia_article' not in db.tables %}
+-- create dummy tables here if nothing was imported
+CREATE TABLE wikimedia_importance (
+  language TEXT NOT NULL,
+  title TEXT NOT NULL,
+  importance double precision NOT NULL,
+  wikidata TEXT
+)  {{db.tablespace.address_data}};
+{% endif %}

lib-sql/tables/interpolation.sql

@@ -0,0 +1,35 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS location_property_osmline;
+CREATE TABLE location_property_osmline (
+    place_id BIGINT NOT NULL,
+    osm_id BIGINT NOT NULL,
+    parent_place_id BIGINT,
+    geometry_sector INTEGER NOT NULL,
+    indexed_date TIMESTAMP,
+    type TEXT,
+    startnumber INTEGER,
+    endnumber INTEGER,
+    step SMALLINT,
+    partition SMALLINT NOT NULL,
+    indexed_status SMALLINT NOT NULL,
+    linegeo GEOMETRY(Geometry, 4326) NOT NULL,
+    address HSTORE,
+    token_info JSONB, -- custom column for tokenizer use only
+    postcode TEXT,
+    country_code VARCHAR(2)
+  ){{db.tablespace.search_data}};
+
+CREATE UNIQUE INDEX idx_osmline_place_id ON location_property_osmline
+  USING BTREE (place_id) {{db.tablespace.search_index}};
+CREATE INDEX idx_osmline_geometry_sector ON location_property_osmline
+  USING BTREE (geometry_sector) {{db.tablespace.address_index}};
+CREATE INDEX idx_osmline_linegeo ON location_property_osmline
+  USING GIST (linegeo) {{db.tablespace.search_index}}
+  WHERE startnumber is not null;
+

lib-sql/tables/location_area.sql

@@ -0,0 +1,32 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS location_area CASCADE;
+CREATE TABLE location_area (
+  place_id BIGINT NOT NULL,
+  keywords INTEGER[] NOT NULL,
+  partition SMALLINT NOT NULL,
+  rank_search SMALLINT NOT NULL,
+  rank_address SMALLINT NOT NULL,
+  country_code VARCHAR(2),
+  isguess BOOL NOT NULL,
+  postcode TEXT,
+  centroid GEOMETRY(Point, 4326) NOT NULL,
+  geometry GEOMETRY(Geometry, 4326) NOT NULL
+  );
+
+CREATE TABLE location_area_large () INHERITS (location_area);
+
+DROP TABLE IF EXISTS location_area_country;
+CREATE TABLE location_area_country (
+  place_id BIGINT NOT NULL,
+  country_code varchar(2) NOT NULL,
+  geometry GEOMETRY(Geometry, 4326) NOT NULL
+  ) {{db.tablespace.address_data}};
+
+CREATE INDEX idx_location_area_country_geometry ON location_area_country
+  USING GIST (geometry) {{db.tablespace.address_index}};

lib-sql/tables/nominatim_properties.sql

@@ -0,0 +1,12 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS nominatim_properties;
+CREATE TABLE nominatim_properties (
+    property TEXT NOT NULL,
+    value TEXT
+);

lib-sql/tables/placex.sql

@@ -0,0 +1,87 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+-- placex - main table for searchable places
+
+DROP TABLE IF EXISTS placex;
+CREATE TABLE placex (
+  place_id BIGINT NOT NULL,
+  parent_place_id BIGINT,
+  linked_place_id BIGINT,
+  importance FLOAT NOT NULL,
+  indexed_date TIMESTAMP,
+  geometry_sector INTEGER NOT NULL,
+  rank_address SMALLINT NOT NULL,
+  rank_search SMALLINT NOT NULL,
+  partition SMALLINT NOT NULL,
+  indexed_status SMALLINT NOT NULL,
+  LIKE place INCLUDING CONSTRAINTS,
+  wikipedia TEXT, -- calculated wikipedia article name (language:title)
+  token_info JSONB, -- custom column for tokenizer use only
+  country_code varchar(2),
+  housenumber TEXT,
+  postcode TEXT,
+  centroid GEOMETRY(Geometry, 4326) NOT NULL
+  ) {{db.tablespace.search_data}};
+
+CREATE UNIQUE INDEX idx_place_id ON placex USING BTREE (place_id) {{db.tablespace.search_index}};
+{% for osm_type in ('N', 'W', 'R') %}
+CREATE INDEX idx_placex_osmid_{{osm_type | lower}} ON placex
+  USING BTREE (osm_id) {{db.tablespace.search_index}}
+  WHERE osm_type = '{{osm_type}}';
+{% endfor %}
+
+-- Usage: - removing linkage status on update
+--        - lookup linked places for /details
+CREATE INDEX idx_placex_linked_place_id ON placex
+  USING BTREE (linked_place_id) {{db.tablespace.address_index}}
+  WHERE linked_place_id IS NOT NULL;
+
+-- Usage: - check that admin boundaries do not overtake each other rank-wise
+--        - check that place node in a admin boundary with the same address level
+--        - boundary is not completely contained in a place area
+--        - parenting of large-area or unparentable features
+CREATE INDEX idx_placex_geometry_address_area_candidates ON placex
+  USING gist (geometry) {{db.tablespace.address_index}}
+  WHERE rank_address between 1 and 25
+        and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon');
+
+-- Usage: - POI is within building with housenumber
+CREATE INDEX idx_placex_geometry_buildings ON placex
+  USING SPGIST (geometry) {{db.tablespace.address_index}}
+  WHERE address is not null and rank_search = 30
+        and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon');
+
+-- Usage: - linking of similar named places to boundaries
+--        - linking of place nodes with same type to boundaries
+CREATE INDEX idx_placex_geometry_placenode ON placex
+  USING SPGIST (geometry) {{db.tablespace.address_index}}
+  WHERE osm_type = 'N' and rank_search < 26 and class = 'place';
+
+-- Usage: - is node part of a way?
+--        - find parent of interpolation spatially
+CREATE INDEX idx_placex_geometry_lower_rank_ways ON placex
+  USING SPGIST (geometry) {{db.tablespace.address_index}}
+  WHERE osm_type = 'W' and rank_search >= 26;
+
+-- Usage: - linking place nodes by wikidata tag to boundaries
+CREATE INDEX idx_placex_wikidata on placex
+  USING BTREE ((extratags -> 'wikidata')) {{db.tablespace.address_index}}
+  WHERE extratags ? 'wikidata' and class = 'place'
+        and osm_type = 'N' and rank_search < 26;
+
+-- The following two indexes function as a todo list for indexing.
+
+CREATE INDEX idx_placex_rank_address_sector ON placex
+  USING BTREE (rank_address, geometry_sector) {{db.tablespace.address_index}}
+  WHERE indexed_status > 0;
+
+CREATE INDEX idx_placex_rank_boundaries_sector ON placex
+  USING BTREE (rank_search, geometry_sector) {{db.tablespace.address_index}}
+  WHERE class = 'boundary' and type = 'administrative'
+        and indexed_status > 0;
+

lib-sql/tables/postcodes.sql

@@ -0,0 +1,32 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS location_postcodes;
+CREATE TABLE location_postcodes (
+  place_id BIGINT NOT NULL,
+  parent_place_id BIGINT,
+  osm_id BIGINT,
+  rank_search SMALLINT NOT NULL,
+  indexed_status SMALLINT NOT NULL,
+  indexed_date TIMESTAMP,
+  country_code varchar(2) NOT NULL,
+  postcode TEXT NOT NULL,
+  centroid GEOMETRY(Geometry, 4326) NOT NULL,
+  geometry GEOMETRY(Geometry, 4326) NOT NULL
+  );
+
+CREATE UNIQUE INDEX idx_location_postcodes_id ON location_postcodes
+  USING BTREE (place_id) {{db.tablespace.search_index}};
+CREATE INDEX idx_location_postcodes_geometry ON location_postcodes
+  USING GIST (geometry) {{db.tablespace.search_index}};
+CREATE INDEX idx_location_postcodes_centroid ON location_postcodes
+  USING GIST (centroid) {{db.tablespace.search_index}};
+CREATE INDEX IF NOT EXISTS idx_location_postcodes_postcode ON location_postcodes
+  USING BTREE (postcode, country_code) {{db.tablespace.search_index}};
+CREATE INDEX IF NOT EXISTS idx_location_postcodes_osmid ON location_postcodes
+  USING BTREE (osm_id) {{db.tablespace.search_index}};
+

lib-sql/tables/search_name.sql

@@ -0,0 +1,25 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS search_name;
+
+{% if not create_reverse_only %}
+
+CREATE TABLE search_name (
+  place_id BIGINT NOT NULL,
+  importance FLOAT NOT NULL,
+  address_rank SMALLINT NOT NULL,
+  name_vector integer[] NOT NULL,
+  nameaddress_vector integer[] NOT NULL,
+  country_code varchar(2),
+  centroid GEOMETRY(Geometry, 4326) NOT NULL
+  ) {{db.tablespace.search_data}};
+
+CREATE UNIQUE INDEX idx_search_name_place_id
+  ON search_name USING BTREE (place_id) {{db.tablespace.search_index}};
+
+{% endif %}

lib-sql/tables/status.sql

@@ -0,0 +1,23 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS import_status;
+CREATE TABLE import_status (
+  lastimportdate TIMESTAMP WITH TIME ZONE NOT NULL,
+  sequence_id INTEGER,
+  indexed BOOLEAN
+  );
+
+DROP TABLE IF EXISTS import_osmosis_log;
+CREATE TABLE import_osmosis_log (
+  batchend TIMESTAMP,
+  batchseq INTEGER,
+  batchsize BIGINT,
+  starttime TIMESTAMP,
+  endtime TIMESTAMP,
+  event TEXT
+  );

lib-sql/tables/tiger.sql

@@ -0,0 +1,17 @@
+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2026 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
+DROP TABLE IF EXISTS location_property_tiger;
+CREATE TABLE location_property_tiger (
+  place_id BIGINT NOT NULL,
+  parent_place_id BIGINT,
+  startnumber INTEGER NOT NULL,
+  endnumber INTEGER NOT NULL,
+  step SMALLINT NOT NULL,
+  partition SMALLINT NOT NULL,
+  linegeo GEOMETRY NOT NULL,
+  postcode TEXT);

src/nominatim_api/search/db_search_builder.py

@@ -177,6 +177,7 @@ class SearchBuilder:
                 sdata.lookups = partials.split_lookup(split, 'nameaddress_vector')
                 sdata.lookups.append(
                     dbf.FieldLookup('name_vector', hnr_tokens, lookups.Restrict))
+                expected_count = partials.min_count() / (5**(split - 1))
             else:
                 addr_fulls = [t.token for t in
                               self.query.get_tokens(address[0], qmod.TOKEN_WORD)]

src/nominatim_api/search/db_searches/address_search.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Implementation of search for an address (search with housenumber).
@@ -155,13 +155,7 @@ class AddressSearch(base.AbstractSearch):
         for ranking in self.rankings:
             penalty += ranking.sql_penalty(t)
 
-        sql = sa.select(t.c.place_id, t.c.search_rank, t.c.address_rank,
-                        t.c.country_code, t.c.centroid,
-                        t.c.name_vector, t.c.nameaddress_vector,
-                        sa.case((t.c.importance > 0, t.c.importance),
-                                else_=0.40001-(sa.cast(t.c.search_rank, sa.Float())/75))
-                          .label('importance'),
-                        penalty.label('penalty'))
+        sql = sa.select(t.c.place_id, penalty.label('penalty'))
 
         for lookup in self.lookups:
             sql = sql.where(lookup.sql_condition(t))
@@ -202,9 +196,7 @@ class AddressSearch(base.AbstractSearch):
 
         inner = sql.limit(10000).order_by(sa.desc(sa.text('importance'))).subquery()
 
-        sql = sa.select(inner.c.place_id, inner.c.search_rank, inner.c.address_rank,
-                        inner.c.country_code, inner.c.centroid, inner.c.importance,
-                        inner.c.penalty)
+        sql = sa.select(inner.c.place_id, inner.c.penalty)
 
         return sql.cte('searches')
 
@@ -240,12 +232,12 @@ class AddressSearch(base.AbstractSearch):
                                else_=1.0)
 
         if details.near is not None:
-            sql = sql.add_columns((-tsearch.c.centroid.ST_Distance(NEAR_PARAM))
+            sql = sql.add_columns((-t.c.centroid.ST_Distance(NEAR_PARAM))
                                   .label('importance'))
             sql = sql.order_by(sa.desc(sa.text('importance')))
         else:
-            sql = sql.order_by(penalty - tsearch.c.importance)
-            sql = sql.add_columns(tsearch.c.importance)
+            sql = sql.order_by(penalty - t.c.importance)
+            sql = sql.add_columns(t.c.importance)
 
         sql = sql.add_columns(penalty.label('accuracy'))\
                  .order_by(sa.text('accuracy'))
@@ -253,7 +245,7 @@ class AddressSearch(base.AbstractSearch):
         hnr_list = '|'.join(self.housenumbers.values)
 
         if self.has_address_terms:
-            sql = sql.where(sa.or_(tsearch.c.address_rank < 30,
+            sql = sql.where(sa.or_(t.c.rank_address < 30,
                                    sa.func.RegexpWord(hnr_list, t.c.housenumber)))
 
         inner = sql.subquery()

src/nominatim_api/search/db_searches/place_search.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Implementation of search for a named place (without housenumber).
@@ -58,12 +58,7 @@ class PlaceSearch(base.AbstractSearch):
         for ranking in self.rankings:
             penalty += ranking.sql_penalty(t)
 
-        sql = sa.select(t.c.place_id, t.c.search_rank, t.c.address_rank,
-                        t.c.country_code, t.c.centroid,
-                        t.c.name_vector, t.c.nameaddress_vector,
-                        sa.case((t.c.importance > 0, t.c.importance),
-                                else_=0.40001-(sa.cast(t.c.search_rank, sa.Float())/75))
-                          .label('importance'))
+        sql = sa.select(t.c.place_id, t.c.importance)
 
         for lookup in self.lookups:
             sql = sql.where(lookup.sql_condition(t))
@@ -103,12 +98,13 @@ class PlaceSearch(base.AbstractSearch):
 
         if details.excluded:
             sql = sql.where(base.exclude_places(t))
-        if details.min_rank > 0:
-            sql = sql.where(sa.or_(t.c.address_rank >= MIN_RANK_PARAM,
-                                   t.c.search_rank >= MIN_RANK_PARAM))
-        if details.max_rank < 30:
-            sql = sql.where(sa.or_(t.c.address_rank <= MAX_RANK_PARAM,
-                                   t.c.search_rank <= MAX_RANK_PARAM))
+        # Do not restrict ranks too much yet because rank restriction
+        # currently also depends on search_rank to account for state-cities
+        # like Berlin.
+        if details.max_rank < 26:
+            sql = sql.where(t.c.address_rank < 26)
+        elif details.max_rank < 30:
+            sql = sql.where(t.c.address_rank < MAX_RANK_PARAM)
 
         sql = sql.add_columns(penalty.label('penalty'))
 
@@ -116,11 +112,9 @@ class PlaceSearch(base.AbstractSearch):
                    .order_by(sa.desc(sa.text('importance')))\
                    .subquery()
 
-        sql = sa.select(inner.c.place_id, inner.c.search_rank, inner.c.address_rank,
-                        inner.c.country_code, inner.c.centroid, inner.c.importance,
-                        inner.c.penalty)
+        sql = sa.select(inner.c.place_id, inner.c.importance, inner.c.penalty)
 
-        # If the query is not an address search or has a geographic preference,
+        # If the query has no geographic preference,
         # preselect most important items to restrict the number of places
         # that need to be looked up in placex.
         if (details.viewbox is None or not details.bounded_viewbox)\
@@ -132,9 +126,7 @@ class PlaceSearch(base.AbstractSearch):
 
             inner = sql.subquery()
 
-            sql = sa.select(inner.c.place_id, inner.c.search_rank, inner.c.address_rank,
-                            inner.c.country_code, inner.c.centroid, inner.c.importance,
-                            inner.c.penalty)\
+            sql = sa.select(inner.c.place_id, inner.c.penalty)\
                     .where(inner.c.penalty - inner.c.importance < inner.c.min_penalty + 0.5)
 
         return sql.cte('searches')
@@ -169,12 +161,19 @@ class PlaceSearch(base.AbstractSearch):
                 penalty += sa.case((t.c.postcode.in_(self.postcodes.values), 0.0), else_=1.0)
 
         if details.near is not None:
-            sql = sql.add_columns((-tsearch.c.centroid.ST_Distance(NEAR_PARAM))
+            sql = sql.add_columns((-t.c.centroid.ST_Distance(NEAR_PARAM))
                                   .label('importance'))
             sql = sql.order_by(sa.desc(sa.text('importance')))
         else:
-            sql = sql.order_by(penalty - tsearch.c.importance)
-            sql = sql.add_columns(tsearch.c.importance)
+            sql = sql.order_by(penalty - t.c.importance)
+            sql = sql.add_columns(t.c.importance)
+
+        if details.min_rank > 0:
+            sql = sql.where(sa.or_(t.c.rank_address >= MIN_RANK_PARAM,
+                                   t.c.rank_search >= MIN_RANK_PARAM))
+        if details.max_rank < 30:
+            sql = sql.where(sa.or_(t.c.rank_address <= MAX_RANK_PARAM,
+                                   t.c.rank_search <= MAX_RANK_PARAM))
 
         sql = sql.add_columns(penalty.label('accuracy'))\
                  .order_by(sa.text('accuracy'))

src/nominatim_api/search/geocoder.py

@@ -170,11 +170,20 @@ class ForwardGeocoder:
                 if qword not in words:
                     wdist = max(difflib.SequenceMatcher(a=qword, b=w).quick_ratio() for w in words)
                     distance += len(qword) if wdist < 0.4 else 1
-            # Compensate for the fact that country names do not get a
-            # match penalty yet by the tokenizer.
-            # Temporary hack that needs to be removed!
+            # Countries with high importance can dominate results when matched
+            # via an alternate-language name. Apply a language-aware penalty
+            # to offset this.
             if result.rank_address == 4:
-                distance *= 2
+                if self.params.locales and result.names:
+                    loc_names = [result.names[t] for t in self.params.locales.name_tags
+                                 if t in result.names]
+                    if loc_names:
+                        norm_loc = self.query_analyzer.normalize_text(' '.join(loc_names))
+                        loc_words = set(w for w in re.split('[-,: ]+', norm_loc) if w)
+                        if loc_words and loc_words.isdisjoint(qwords):
+                            result.accuracy += result.calculated_importance() * 0.5
+                else:
+                    distance *= 2
             result.accuracy += distance * 0.3 / sum(len(w) for w in qwords)
 
     async def lookup_pois(self, categories: List[Tuple[str, str]],

src/nominatim_api/server/falcon/server.py

@@ -184,6 +184,10 @@ class APIMiddleware:
         formatter = load_format_dispatcher('v1', self.api.config.project_dir)
         for name, func in await api_impl.get_routes(self.api):
             endpoint = EndpointWrapper(name, func, self.api, formatter)
+            # If func is a LazySearchEndpoint, give it a reference to wrapper
+            # so it can replace wrapper.func dynamically
+            if hasattr(func, 'set_wrapper'):
+                func.set_wrapper(endpoint)
             self.app.add_route(f"/{name}", endpoint)
             if legacy_urls:
                 self.app.add_route(f"/{name}.php", endpoint)

src/nominatim_api/sql/sqlalchemy_schema.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 SQLAlchemy definitions for all tables used by the frontend.
@@ -112,7 +112,6 @@ class SearchTables:
             'search_name', meta,
             sa.Column('place_id', sa.BigInteger),
             sa.Column('importance', sa.Float),
-            sa.Column('search_rank', sa.SmallInteger),
             sa.Column('address_rank', sa.SmallInteger),
             sa.Column('name_vector', IntArray),
             sa.Column('nameaddress_vector', IntArray),

src/nominatim_api/types.py

@@ -8,7 +8,7 @@
 Complex datatypes used by the Nominatim API.
 """
 from typing import Optional, Union, Tuple, NamedTuple, TypeVar, Type, Dict, \
-                   Any, List, Sequence
+                   Any, List, Sequence, TYPE_CHECKING
 from collections import abc
 import dataclasses
 import datetime as dt
@@ -17,6 +17,8 @@ import math
 from struct import unpack
 from binascii import unhexlify
 
+if TYPE_CHECKING:
+    from .localization import Locales
 from .errors import UsageError
 
 
@@ -573,6 +575,13 @@ class SearchDetails(LookupDetails):
 
     viewbox_x2: Optional[Bbox] = None
 
+    locales: Optional['Locales'] = dataclasses.field(
+        default=None, metadata={'transform': lambda v: v})
+    """ Locale preferences of the caller.
+        Used during result re-ranking to prefer results that match the
+        caller's locale over results that only match in an alternate language.
+    """
+
     def __post_init__(self) -> None:
         if self.viewbox is not None:
             xext = (self.viewbox.maxlon - self.viewbox.minlon)/2

src/nominatim_api/v1/format.py

@@ -19,6 +19,7 @@ from ..localization import Locales
 from ..result_formatting import FormatDispatcher
 from .classtypes import ICONS
 from . import format_json, format_xml
+from .helpers import _add_admin_level
 from .. import logging as loglib
 from ..server import content_types as ct
 
@@ -157,7 +158,7 @@ def _format_details_json(result: DetailedResult, options: Mapping[str, Any]) ->
        .keyval_not_none('indexed_date', result.indexed_date, lambda v: v.isoformat())\
        .keyval_not_none('importance', result.importance)\
        .keyval('calculated_importance', result.calculated_importance())\
-       .keyval('extratags', result.extratags or {})\
+       .keyval('extratags', _add_admin_level(result) or {})\
        .keyval_not_none('calculated_wikipedia', result.wikipedia)\
        .keyval('rank_address', result.rank_address)\
        .keyval('rank_search', result.rank_search)\

src/nominatim_api/v1/format_json.py

@@ -12,6 +12,7 @@ from typing import Mapping, Any, Optional, Tuple, Union, List
 from ..utils.json_writer import JsonWriter
 from ..results import AddressLines, ReverseResults, SearchResults
 from . import classtypes as cl
+from .helpers import _add_admin_level
 from ..types import EntranceDetails
 
 
@@ -134,7 +135,7 @@ def format_base_json(results: Union[ReverseResults, SearchResults],
             write_entrances(out, result.entrances)
 
         if options.get('extratags', False):
-            out.keyval('extratags', result.extratags)
+            out.keyval('extratags', _add_admin_level(result))
 
         if options.get('namedetails', False):
             out.keyval('namedetails', result.names)
@@ -210,7 +211,7 @@ def format_base_geojson(results: Union[ReverseResults, SearchResults],
             write_entrances(out, result.entrances)
 
         if options.get('extratags', False):
-            out.keyval('extratags', result.extratags)
+            out.keyval('extratags', _add_admin_level(result))
 
         if options.get('namedetails', False):
             out.keyval('namedetails', result.names)
@@ -284,7 +285,7 @@ def format_base_geocodejson(results: Union[ReverseResults, SearchResults],
             write_entrances(out, result.entrances)
 
         if options.get('extratags', False):
-            out.keyval('extra', result.extratags)
+            out.keyval('extra', _add_admin_level(result))
 
         out.end_object().next().end_object().next()
 

src/nominatim_api/v1/format_xml.py

@@ -14,6 +14,7 @@ import xml.etree.ElementTree as ET
 from ..results import AddressLines, ReverseResult, ReverseResults, \
                       SearchResult, SearchResults
 from . import classtypes as cl
+from .helpers import _add_admin_level
 from ..types import EntranceDetails
 
 
@@ -125,8 +126,9 @@ def format_base_xml(results: Union[ReverseResults, SearchResults],
 
         if options.get('extratags', False):
             eroot = ET.SubElement(root if simple else place, 'extratags')
-            if result.extratags:
-                for k, v in result.extratags.items():
+            tags = _add_admin_level(result)
+            if tags:
+                for k, v in tags.items():
                     ET.SubElement(eroot, 'tag', attrib={'key': k, 'value': v})
 
         if options.get('namedetails', False):

src/nominatim_api/v1/helpers.py

@@ -12,10 +12,20 @@ from typing import Tuple, Optional, Any, Dict, Iterable
 from itertools import chain
 import re
 
-from ..results import SearchResults, SourceTable
+from ..results import SearchResults, SourceTable, BaseResult
 from ..types import SearchDetails, GeometryFormat
 
 
+def _add_admin_level(result: BaseResult) -> Optional[Dict[str, str]]:
+    """ Inject admin_level into extratags for boundary=administrative results.
+    """
+    tags = result.extratags
+    if result.category == ('boundary', 'administrative') and result.admin_level < 15:
+        tags = dict(tags) if tags else {}
+        tags['admin_level'] = str(result.admin_level)
+    return tags
+
+
 REVERSE_MAX_RANKS = [2, 2, 2,   # 0-2   Continent/Sea
                      4, 4,      # 3-4   Country
                      8,         # 5     State

src/nominatim_api/v1/server_glue.py

@@ -12,6 +12,7 @@ from typing import Optional, Any, Type, Dict, cast, Sequence, Tuple
 from functools import reduce
 import dataclasses
 from urllib.parse import urlencode
+import asyncio
 
 import sqlalchemy as sa
 
@@ -124,6 +125,12 @@ def parse_geometry_details(adaptor: ASGIAdaptor, fmt: str) -> Dict[str, Any]:
             }
 
 
+def has_search_name(conn: sa.engine.Connection) -> bool:
+    """ Check if the search_name table exists in the database.
+    """
+    return sa.inspect(conn).has_table('search_name')
+
+
 async def status_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
     """ Server glue for /status endpoint. See API docs for details.
     """
@@ -327,6 +334,8 @@ async def search_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
         details['layers'] = DataLayer.ADDRESS
     else:
         details['layers'] = get_layers(params)
+    details['locales'] = Locales.from_accept_languages(get_accepted_languages(params),
+                                                       params.config().OUTPUT_NAMES)
 
     # unstructured query parameters
     query = params.get('q', None)
@@ -352,8 +361,7 @@ async def search_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
     except UsageError as err:
         params.raise_error(str(err))
 
-    Locales.from_accept_languages(get_accepted_languages(params),
-                                  params.config().OUTPUT_NAMES).localize_results(results)
+    details['locales'].localize_results(results)
 
     if details['dedupe'] and len(results) > 1:
         results = helpers.deduplicate_results(results, max_results)
@@ -441,6 +449,61 @@ async def polygons_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
     return build_response(params, params.formatting().format_result(results, fmt, {}))
 
 
+async def search_unavailable_endpoint(api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
+    """ Server glue for /search endpoint in reverse-only mode.
+        Returns 404 when search functionality is not available.
+    """
+    params.raise_error('Search not available (reverse-only mode)', 404)
+
+
+class LazySearchEndpoint:
+    """
+    Lazy-loading search endpoint that replaces itself after first successful check.
+
+    - Falcon: EndpointWrapper stores this instance in wrapper.func
+      On first request, replace wrapper.func directly with real endpoint
+
+    - Starlette: _wrap_endpoint wraps this instance in a callback
+      store a delegate function and call it on subsequent requests
+    """
+    def __init__(self, api: NominatimAPIAsync, real_endpoint: EndpointFunc):
+        self.api = api
+        self.real_endpoint = real_endpoint
+        self._lock = asyncio.Lock()
+        self._wrapper: Any = None  # Store reference to Falcon's EndpointWrapper
+        self._delegate: Optional[EndpointFunc] = None
+
+    def set_wrapper(self, wrapper: Any) -> None:
+        self._wrapper = wrapper
+
+    async def __call__(self, api: NominatimAPIAsync, params: ASGIAdaptor) -> Any:
+        if self._delegate is None:
+            async with self._lock:
+                # Double-check after acquiring lock (thread safety)
+                if self._delegate is None:
+                    try:
+                        async with api.begin() as conn:
+                            has_table = await conn.connection.run_sync(
+                                has_search_name)
+
+                        if has_table:
+                            # For Starlette
+                            self._delegate = self.real_endpoint
+                            # For Falcon
+                            if self._wrapper is not None:
+                                self._wrapper.func = self.real_endpoint
+                        else:
+                            self._delegate = search_unavailable_endpoint
+                            if self._wrapper is not None:
+                                self._wrapper.func = search_unavailable_endpoint
+
+                    except (PGCORE_ERROR, sa.exc.OperationalError, OSError):
+                        # No _delegate set, so retry on next request
+                        params.raise_error('Search temporarily unavailable', 503)
+
+        return await self._delegate(api, params)
+
+
 async def get_routes(api: NominatimAPIAsync) -> Sequence[Tuple[str, EndpointFunc]]:
     routes = [
         ('status', status_endpoint),
@@ -451,15 +514,13 @@ async def get_routes(api: NominatimAPIAsync) -> Sequence[Tuple[str, EndpointFunc
         ('polygons', polygons_endpoint),
     ]
 
-    def has_search_name(conn: sa.engine.Connection) -> bool:
-        insp = sa.inspect(conn)
-        return insp.has_table('search_name')
-
     try:
         async with api.begin() as conn:
             if await conn.connection.run_sync(has_search_name):
                 routes.append(('search', search_endpoint))
-    except (PGCORE_ERROR, sa.exc.OperationalError):
-        pass  # ignored
+            else:
+                routes.append(('search', search_unavailable_endpoint))
+    except (PGCORE_ERROR, sa.exc.OperationalError, OSError):
+        routes.append(('search', LazySearchEndpoint(api, search_endpoint)))
 
     return routes

src/nominatim_db/clicmd/args.py

@@ -120,6 +120,7 @@ class NominatimArgs:
     data_object: Sequence[Tuple[str, int]]
     data_area: Sequence[Tuple[str, int]]
     ro_access: bool
+    postcode_force_reimport: bool
 
     # Arguments to 'replication'
     init: bool

src/nominatim_db/clicmd/index.py

@@ -64,4 +64,4 @@ class UpdateIndex:
             if not args.boundaries_only:
                 await indexer.index_by_rank(args.minrank, args.maxrank)
                 await indexer.index_postcodes()
-            has_pending = indexer.has_pending()
+            has_pending = indexer.has_pending(args.minrank, args.maxrank)

src/nominatim_db/clicmd/refresh.py

@@ -84,6 +84,10 @@ class UpdateRefresh:
                            help='Do not enable code for propagating updates')
         group.add_argument('--enable-debug-statements', action='store_true',
                            help='Enable debug warning statements in functions')
+        group = parser.add_argument_group('Arguments for postcode refresh')
+        group.add_argument('--force-reimport', action='store_true',
+                           dest='postcode_force_reimport',
+                           help='Recompute the postcodes from scratch instead of updating')
 
     def run(self, args: NominatimArgs) -> int:
         from ..tools import refresh, postcodes
@@ -96,7 +100,8 @@ class UpdateRefresh:
                 LOG.warning("Update postcodes centroid")
                 tokenizer = self._get_tokenizer(args.config)
                 postcodes.update_postcodes(args.config.get_libpq_dsn(),
-                                           args.project_dir, tokenizer)
+                                           args.project_dir, tokenizer,
+                                           force_reimport=args.postcode_force_reimport)
                 indexer = Indexer(args.config.get_libpq_dsn(), tokenizer,
                                   args.threads or 1)
                 asyncio.run(indexer.index_postcodes())

src/nominatim_db/db/query_pool.py

@@ -38,6 +38,7 @@ class QueryPool:
         """ Schedule a query for execution.
         """
         if self.is_cancelled:
+            self.clear_queue()
             await self.finish()
             return
 
@@ -47,6 +48,7 @@ class QueryPool:
         await asyncio.sleep(0)
 
         if self.is_cancelled:
+            self.clear_queue()
             await self.finish()
 
     async def finish(self) -> None:

src/nominatim_db/indexer/indexer.py

@@ -31,14 +31,19 @@ class Indexer:
         self.tokenizer = tokenizer
         self.num_threads = num_threads
 
-    def has_pending(self) -> bool:
+    def has_pending(self, minrank: int = 0, maxrank: int = 30) -> bool:
         """ Check if any data still needs indexing.
             This function must only be used after the import has finished.
             Otherwise it will be very expensive.
         """
         with connect(self.dsn) as conn:
             with conn.cursor() as cur:
-                cur.execute("SELECT 'a' FROM placex WHERE indexed_status > 0 LIMIT 1")
+                cur.execute(""" SELECT 'a'
+                                  FROM placex
+                                 WHERE rank_address BETWEEN %s AND %s
+                                   AND indexed_status > 0
+                                 LIMIT 1""",
+                            (minrank, maxrank))
                 return cur.rowcount > 0
 
     async def index_full(self, analyse: bool = True) -> None:

src/nominatim_db/tokenizer/sanitizers/clean_housenumbers.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2024 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Sanitizer that preprocesses address tags for house numbers. The sanitizer
@@ -10,6 +10,7 @@ allows to
 
 * define which tags are to be considered house numbers (see 'filter-kind')
 * split house number lists into individual numbers (see 'delimiters')
+* expand interpolated house numbers
 
 Arguments:
     delimiters: Define the set of characters to be used for
@@ -23,13 +24,19 @@ Arguments:
                      instead of a house number. Either takes a single string
                      or a list of strings, where each string is a regular
                      expression that must match the full house number value.
+    expand-interpolations: When true, expand house number ranges to separate numbers
+                           when an 'interpolation' is present. (default: true)
+
 """
-from typing import Callable, Iterator, List
+from typing import Callable, Iterator, Iterable, Union
+import re
 
 from ...data.place_name import PlaceName
 from .base import ProcessInfo
 from .config import SanitizerConfig
 
+RANGE_REGEX = re.compile(r'\d+-\d+')
+
 
 class _HousenumberSanitizer:
 
@@ -38,21 +45,40 @@ class _HousenumberSanitizer:
         self.split_regexp = config.get_delimiter()
 
         self.filter_name = config.get_filter('convert-to-name', 'FAIL_ALL')
+        self.expand_interpolations = config.get_bool('expand-interpolations', True)
 
     def __call__(self, obj: ProcessInfo) -> None:
         if not obj.address:
             return
 
-        new_address: List[PlaceName] = []
+        itype: Union[int, str, None] = None
+        if self.expand_interpolations:
+            itype = next((i.name for i in obj.address if i.kind == 'interpolation'), None)
+            if itype is not None:
+                if itype == 'all':
+                    itype = 1
+                elif len(itype) == 1 and itype.isdigit():
+                    itype = int(itype)
+                elif itype not in ('odd', 'even'):
+                    itype = None
+
+        new_address: list[PlaceName] = []
         for item in obj.address:
             if self.filter_kind(item.kind):
+                if itype is not None and RANGE_REGEX.fullmatch(item.name):
+                    hnrs = self._expand_range(itype, item.name)
+                    if hnrs:
+                        new_address.extend(item.clone(kind='housenumber', name=str(hnr))
+                                           for hnr in hnrs)
+                        continue
+
                 if self.filter_name(item.name):
                     obj.names.append(item.clone(kind='housenumber'))
                 else:
                     new_address.extend(item.clone(kind='housenumber', name=n)
                                        for n in self.sanitize(item.name))
-            else:
-                # Don't touch other address items.
+            elif item.kind != 'interpolation':
+                # Ignore interpolation, otherwise don't touch other address items.
                 new_address.append(item)
 
         obj.address = new_address
@@ -70,6 +96,22 @@ class _HousenumberSanitizer:
     def _regularize(self, hnr: str) -> Iterator[str]:
         yield hnr
 
+    def _expand_range(self, itype: Union[str, int], hnr: str) -> Iterable[int]:
+        first, last = (int(i) for i in hnr.split('-'))
+
+        if isinstance(itype, int):
+            step = itype
+        else:
+            step = 2
+            if (itype == 'even' and first % 2 == 1)\
+               or (itype == 'odd' and first % 2 == 0):
+                first += 1
+
+        if (last + 1 - first) / step < 10:
+            return range(first, last + 1, step)
+
+        return []
+
 
 def create(config: SanitizerConfig) -> Callable[[ProcessInfo], None]:
     """ Create a housenumber processing function.

src/nominatim_db/tools/database_import.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Functions for setting up and importing a new Nominatim database.
@@ -152,12 +152,11 @@ def create_tables(conn: Connection, config: Configuration, reverse_only: bool =
         When `reverse_only` is True, then the main table for searching will
         be skipped and only reverse search is possible.
     """
-    sql = SQLPreprocessor(conn, config)
-    sql.env.globals['db']['reverse_only'] = reverse_only
+    SQLPreprocessor(conn, config).run_sql_file(conn, 'tables.sql',
+                                               create_reverse_only=reverse_only)
 
-    sql.run_sql_file(conn, 'tables.sql')
-
-    sql.run_sql_file(conn, 'grants.sql')
+    # reinitiate the preprocessor to get all the newly created tables
+    SQLPreprocessor(conn, config).run_sql_file(conn, 'grants.sql')
 
 
 def create_table_triggers(conn: Connection, config: Configuration) -> None:
@@ -220,19 +219,16 @@ async def load_data(dsn: str, threads: int) -> None:
                 pysql.SQL("""INSERT INTO placex ({columns})
                                SELECT {columns} FROM place
                                 WHERE osm_id % {total} = {mod}
-                                  AND NOT (class='place'
-                                           and (type='houses' or type='postcode'))
-                                  AND ST_IsValid(geometry)
                           """).format(columns=_COPY_COLUMNS,
                                       total=pysql.Literal(placex_threads),
                                       mod=pysql.Literal(imod)), None)
 
         # Interpolations need to be copied separately
         await pool.put_query("""
-                INSERT INTO location_property_osmline (osm_id, address, linegeo)
-                  SELECT osm_id, address, geometry FROM place
-                  WHERE class='place' and type='houses' and osm_type='W'
-                        and ST_GeometryType(geometry) = 'ST_LineString' """, None)
+                INSERT INTO location_property_osmline (osm_id, type, address, linegeo)
+                  SELECT osm_id, type, address, geometry
+                  FROM place_interpolation
+                """, None)
 
     progress.cancel()
 

src/nominatim_db/tools/migration.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Functions for database migration to newer software versions.
@@ -14,7 +14,7 @@ from ..errors import UsageError
 from ..config import Configuration
 from ..db import properties
 from ..db.connection import connect, Connection, \
-                            table_exists, register_hstore
+                            table_exists, register_hstore, table_has_column
 from ..db.sql_preprocessor import SQLPreprocessor
 from ..version import NominatimVersion, NOMINATIM_VERSION, parse_version
 from ..tokenizer import factory as tokenizer_factory
@@ -350,3 +350,90 @@ def create_place_postcode_table(conn: Connection, config: Configuration, **_: An
               WHERE osm_type = 'N' and rank_search < 26 and class = 'place';
             ANALYSE;
             """)
+
+
+@_migration(5, 2, 99, 3)
+def create_place_interpolation_table(conn: Connection, config: Configuration, **_: Any) -> None:
+    """ Create place_interpolation table
+    """
+    sqlp = SQLPreprocessor(conn, config)
+    mutable = not is_frozen(conn)
+    has_place_table = table_exists(conn, 'place_interpolation')
+
+    if mutable and not has_place_table:
+        # create tables
+        conn.execute("""
+            CREATE TABLE place_interpolation (
+              osm_id BIGINT NOT NULL,
+              type TEXT NOT NULL,
+              address HSTORE,
+              nodes BIGINT[] NOT NULL,
+              geometry GEOMETRY(LineString, 4326)
+            );
+
+            CREATE TABLE IF NOT EXISTS place_interpolation_to_be_deleted (
+              osm_id BIGINT NOT NULL
+            );
+            """)
+        # copy data over
+        conn.execute("""
+            ALTER TABLE place DISABLE TRIGGER ALL;
+
+            WITH deleted AS (
+              DELETE FROM place
+                WHERE class='place' and type = 'houses'
+                RETURNING osm_type, osm_id,
+                          address->'interpolation' as itype,
+                          address - 'interpolation'::TEXT as address,
+                          geometry)
+            INSERT INTO place_interpolation (osm_id, type, address, nodes, geometry)
+              (SELECT d.osm_id, d.itype, d.address, p.nodes, d.geometry
+                 FROM deleted d, planet_osm_ways p
+                 WHERE osm_type = 'W'
+                       AND d.osm_id = p.id
+                       AND itype is not null
+                       AND ST_GeometryType(geometry) = 'ST_LineString');
+
+            ALTER TABLE place ENABLE TRIGGER ALL;
+            """)
+
+        # create indices
+        conn.execute("""
+            CREATE INDEX place_interpolation_nodes_idx ON place_interpolation
+              USING gin(nodes);
+            CREATE INDEX place_interpolation_osm_id_idx ON place_interpolation
+              USING btree(osm_id);
+            """)
+        # create triggers
+        sqlp.run_sql_file(conn, 'functions/interpolation.sql')
+        conn.execute("""
+            CREATE TRIGGER place_interpolation_before_insert BEFORE INSERT ON place_interpolation
+              FOR EACH ROW EXECUTE PROCEDURE place_interpolation_insert();
+            CREATE TRIGGER place_interpolation_before_delete BEFORE DELETE ON place_interpolation
+              FOR EACH ROW EXECUTE PROCEDURE place_interpolation_delete();
+            """)
+        # mutate location_property_osmline table
+        conn.execute("""
+            ALTER TABLE location_property_osmline ADD COLUMN type TEXT;
+
+            UPDATE location_property_osmline
+              SET type = coalesce(address->'interpolation', 'all'),
+                  address = address - 'interpolation'::TEXT;
+            """)
+
+
+@_migration(5, 2, 99, 4)
+def backfill_importance(conn: Connection, **_: Any) -> None:
+    """ Backfill missing importance values.
+    """
+    conn.execute("""UPDATE placex
+                    SET importance = 0.40001 - (rank_search::float / 75)
+                    WHERE importance is NULL OR importance <= 0
+                 """)
+    if table_exists(conn, 'search_name')\
+       and table_has_column(conn, 'search_name', 'search_rank'):
+        conn.execute("""UPDATE search_name
+                        SET importance = 0.40001 - (search_rank::float / 75)
+                        WHERE importance is NULL OR importance <= 0
+                     """)
+        conn.execute("ALTER TABLE search_name DROP COLUMN search_rank")

src/nominatim_db/tools/postcodes.py

@@ -78,7 +78,7 @@ class _PostcodeCollector:
                 self.collected[normalized] += (x, y)
 
     def commit(self, conn: Connection, analyzer: AbstractAnalyzer,
-               project_dir: Optional[Path]) -> None:
+               project_dir: Optional[Path], is_initial: bool) -> None:
         """ Update postcodes for the country from the postcodes selected so far.
 
             When 'project_dir' is set, then any postcode files found in this
@@ -87,11 +87,14 @@ class _PostcodeCollector:
         if project_dir is not None:
             self._update_from_external(analyzer, project_dir)
 
-        with conn.cursor() as cur:
-            cur.execute("""SELECT postcode FROM location_postcodes
-                           WHERE country_code = %s AND osm_id is null""",
-                        (self.country, ))
-            to_delete = [row[0] for row in cur if row[0] not in self.collected]
+        if is_initial:
+            to_delete = []
+        else:
+            with conn.cursor() as cur:
+                cur.execute("""SELECT postcode FROM location_postcodes
+                               WHERE country_code = %s AND osm_id is null""",
+                            (self.country, ))
+                to_delete = [row[0] for row in cur if row[0] not in self.collected]
 
         to_add = [dict(zip(('pc', 'x', 'y'), (k, *v.centroid())))
                   for k, v in self.collected.items()]
@@ -102,22 +105,32 @@ class _PostcodeCollector:
 
         with conn.cursor() as cur:
             if to_add:
-                cur.executemany(pysql.SQL(
-                    """INSERT INTO location_postcodes
-                         (country_code, rank_search, postcode, centroid, geometry)
-                       VALUES ({}, {}, %(pc)s,
-                               ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326),
-                               expand_by_meters(ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326), {}))
-                    """).format(pysql.Literal(self.country),
-                                pysql.Literal(_extent_to_rank(self.extent)),
-                                pysql.Literal(self.extent)),
-                    to_add)
+                columns = ['country_code',
+                           'rank_search',
+                           'postcode',
+                           'centroid',
+                           'geometry']
+                values = [pysql.Literal(self.country),
+                          pysql.Literal(_extent_to_rank(self.extent)),
+                          pysql.Placeholder('pc'),
+                          pysql.SQL('ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326)'),
+                          pysql.SQL("""expand_by_meters(
+                                           ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326), {})""")
+                               .format(pysql.Literal(self.extent))]
+                if is_initial:
+                    columns.extend(('place_id', 'indexed_status'))
+                    values.extend((pysql.SQL("nextval('seq_place')"), pysql.Literal(1)))
+
+                cur.executemany(pysql.SQL("INSERT INTO location_postcodes ({}) VALUES ({})")
+                                     .format(pysql.SQL(',')
+                                                  .join(pysql.Identifier(c) for c in columns),
+                                             pysql.SQL(',').join(values)),
+                                to_add)
             if to_delete:
                 cur.execute("""DELETE FROM location_postcodes
                                WHERE country_code = %s and postcode = any(%s)
                                      AND osm_id is null
                             """, (self.country, to_delete))
-            cur.execute("ANALYSE location_postcodes")
 
     def _update_from_external(self, analyzer: AbstractAnalyzer, project_dir: Path) -> None:
         """ Look for an external postcode file for the active country in
@@ -164,7 +177,8 @@ class _PostcodeCollector:
         return None
 
 
-def update_postcodes(dsn: str, project_dir: Optional[Path], tokenizer: AbstractTokenizer) -> None:
+def update_postcodes(dsn: str, project_dir: Optional[Path],
+                     tokenizer: AbstractTokenizer, force_reimport: bool = False) -> None:
     """ Update the table of postcodes from the input tables
         placex and place_postcode.
     """
@@ -176,45 +190,76 @@ def update_postcodes(dsn: str, project_dir: Optional[Path], tokenizer: AbstractT
                               SET country_code = get_country_code(centroid)
                               WHERE country_code is null
                          """)
+            if force_reimport:
+                conn.execute("TRUNCATE location_postcodes")
+                is_initial = True
+            else:
+                is_initial = _is_postcode_table_empty(conn)
+            if is_initial:
+                conn.execute("""ALTER TABLE location_postcodes
+                                DISABLE TRIGGER location_postcodes_before_insert""")
             # Now update first postcode areas
-            _update_postcode_areas(conn, analyzer, matcher)
+            _update_postcode_areas(conn, analyzer, matcher, is_initial)
             # Then fill with estimated postcode centroids from other info
-            _update_guessed_postcode(conn, analyzer, matcher, project_dir)
+            _update_guessed_postcode(conn, analyzer, matcher, project_dir, is_initial)
+            if is_initial:
+                conn.execute("""ALTER TABLE location_postcodes
+                                ENABLE TRIGGER location_postcodes_before_insert""")
             conn.commit()
 
         analyzer.update_postcodes_from_db()
 
 
+def _is_postcode_table_empty(conn: Connection) -> bool:
+    """ Check if there are any entries in the location_postcodes table yet.
+    """
+    with conn.cursor() as cur:
+        cur.execute("SELECT place_id FROM location_postcodes LIMIT 1")
+        return cur.fetchone() is None
+
+
 def _insert_postcode_areas(conn: Connection, country_code: str,
-                           extent: int, pcs: list[dict[str, str]]) -> None:
+                           extent: int, pcs: list[dict[str, str]],
+                           is_initial: bool) -> None:
     if pcs:
         with conn.cursor() as cur:
+            columns = ['osm_id', 'country_code',
+                       'rank_search', 'postcode',
+                       'centroid', 'geometry']
+            values = [pysql.Identifier('osm_id'), pysql.Identifier('country_code'),
+                      pysql.Literal(_extent_to_rank(extent)), pysql.Placeholder('out'),
+                      pysql.Identifier('centroid'), pysql.Identifier('geometry')]
+            if is_initial:
+                columns.extend(('place_id', 'indexed_status'))
+                values.extend((pysql.SQL("nextval('seq_place')"), pysql.Literal(1)))
+
             cur.executemany(
                 pysql.SQL(
-                    """ INSERT INTO location_postcodes
-                            (osm_id, country_code, rank_search, postcode, centroid, geometry)
-                            SELECT osm_id, country_code, {}, %(out)s, centroid, geometry
-                            FROM place_postcode
+                    """ INSERT INTO location_postcodes ({})
+                            SELECT {} FROM place_postcode
                             WHERE osm_type = 'R'
                                   and country_code = {} and postcode = %(in)s
                                   and geometry is not null
-                    """).format(pysql.Literal(_extent_to_rank(extent)),
+                    """).format(pysql.SQL(',')
+                                     .join(pysql.Identifier(c) for c in columns),
+                                pysql.SQL(',').join(values),
                                 pysql.Literal(country_code)),
                 pcs)
 
 
 def _update_postcode_areas(conn: Connection, analyzer: AbstractAnalyzer,
-                           matcher: PostcodeFormatter) -> None:
+                           matcher: PostcodeFormatter, is_initial: bool) -> None:
     """ Update the postcode areas made from postcode boundaries.
     """
     # first delete all areas that have gone
-    conn.execute(""" DELETE FROM location_postcodes pc
-                     WHERE pc.osm_id is not null
-                       AND NOT EXISTS(
-                              SELECT * FROM place_postcode pp
-                              WHERE pp.osm_type = 'R' and pp.osm_id = pc.osm_id
-                                    and geometry is not null)
-                """)
+    if not is_initial:
+        conn.execute(""" DELETE FROM location_postcodes pc
+                         WHERE pc.osm_id is not null
+                           AND NOT EXISTS(
+                                  SELECT * FROM place_postcode pp
+                                  WHERE pp.osm_type = 'R' and pp.osm_id = pc.osm_id
+                                        and geometry is not null)
+                    """)
     # now insert all in country batches, triggers will ensure proper updates
     with conn.cursor() as cur:
         cur.execute(""" SELECT country_code, postcode FROM place_postcode
@@ -230,7 +275,8 @@ def _update_postcode_areas(conn: Connection, analyzer: AbstractAnalyzer,
                 fmt = matcher.get_matcher(country_code)
             elif country_code != cc:
                 _insert_postcode_areas(conn, country_code,
-                                       matcher.get_postcode_extent(country_code), pcs)
+                                       matcher.get_postcode_extent(country_code), pcs,
+                                       is_initial)
                 country_code = cc
                 fmt = matcher.get_matcher(country_code)
                 pcs = []
@@ -241,21 +287,26 @@ def _update_postcode_areas(conn: Connection, analyzer: AbstractAnalyzer,
 
         if country_code is not None and pcs:
             _insert_postcode_areas(conn, country_code,
-                                   matcher.get_postcode_extent(country_code), pcs)
+                                   matcher.get_postcode_extent(country_code), pcs,
+                                   is_initial)
 
 
 def _update_guessed_postcode(conn: Connection, analyzer: AbstractAnalyzer,
-                             matcher: PostcodeFormatter, project_dir: Optional[Path]) -> None:
+                             matcher: PostcodeFormatter, project_dir: Optional[Path],
+                             is_initial: bool) -> None:
     """ Computes artificial postcode centroids from the placex table,
         potentially enhances it with external data and then updates the
         postcodes in the table 'location_postcodes'.
     """
     # First get the list of countries that currently have postcodes.
     # (Doing this before starting to insert, so it is fast on import.)
-    with conn.cursor() as cur:
-        cur.execute("""SELECT DISTINCT country_code FROM location_postcodes
-                        WHERE osm_id is null""")
-        todo_countries = {row[0] for row in cur}
+    if is_initial:
+        todo_countries: set[str] = set()
+    else:
+        with conn.cursor() as cur:
+            cur.execute("""SELECT DISTINCT country_code FROM location_postcodes
+                            WHERE osm_id is null""")
+            todo_countries = {row[0] for row in cur}
 
     # Next, get the list of postcodes that are already covered by areas.
     area_pcs = defaultdict(set)
@@ -275,6 +326,7 @@ def _update_guessed_postcode(conn: Connection, analyzer: AbstractAnalyzer,
                         FROM place_postcode WHERE geometry is not null)
                     """)
         cur.execute("CREATE INDEX ON _global_postcode_area USING gist(geometry)")
+
     # Recompute the list of valid postcodes from placex.
     with conn.cursor(name="placex_postcodes") as cur:
         cur.execute("""
@@ -296,7 +348,7 @@ def _update_guessed_postcode(conn: Connection, analyzer: AbstractAnalyzer,
         for country, postcode, x, y in cur:
             if collector is None or country != collector.country:
                 if collector is not None:
-                    collector.commit(conn, analyzer, project_dir)
+                    collector.commit(conn, analyzer, project_dir, is_initial)
                 collector = _PostcodeCollector(country, matcher.get_matcher(country),
                                                matcher.get_postcode_extent(country),
                                                exclude=area_pcs[country])
@@ -304,14 +356,14 @@ def _update_guessed_postcode(conn: Connection, analyzer: AbstractAnalyzer,
             collector.add(postcode, x, y)
 
         if collector is not None:
-            collector.commit(conn, analyzer, project_dir)
+            collector.commit(conn, analyzer, project_dir, is_initial)
 
     # Now handle any countries that are only in the postcode table.
     for country in todo_countries:
         fmt = matcher.get_matcher(country)
         ext = matcher.get_postcode_extent(country)
         _PostcodeCollector(country, fmt, ext,
-                           exclude=area_pcs[country]).commit(conn, analyzer, project_dir)
+                           exclude=area_pcs[country]).commit(conn, analyzer, project_dir, False)
 
     conn.execute("DROP TABLE IF EXISTS _global_postcode_area")
 

src/nominatim_db/version.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Version information for Nominatim.
@@ -55,7 +55,7 @@ def parse_version(version: str) -> NominatimVersion:
     return NominatimVersion(*[int(x) for x in parts[:2] + parts[2].split('-')])
 
 
-NOMINATIM_VERSION = parse_version('5.2.99-2')
+NOMINATIM_VERSION = parse_version('5.2.99-4')
 
 POSTGRESQL_REQUIRED_VERSION = (12, 0)
 POSTGIS_REQUIRED_VERSION = (3, 0)

test/bdd/features/api/search/params.feature

@@ -318,6 +318,28 @@ Feature: Search queries
           | jsonv2 | json |
           | geojson | geojson |
 
+    Scenario Outline: Search boundary=administrative with extratags=1 returns admin_level
+        When sending v1/search with format <format>
+          | q           | featureType | extratags |
+          | Triesenberg | city        | 1         |
+        Then a HTTP 200 is returned
+        And the result is valid <outformat>
+        And more than 0 results are returned
+        And result 0 contains
+          | <cname>  | <tname>        |
+          | boundary | administrative |
+        And result 0 contains in field <ename>
+          | param       | value |
+          | admin_level | 8     |
+
+        Examples:
+          | format      | outformat   | cname    | tname     | ename     |
+          | xml         | xml         | class    | type      | extratags |
+          | json        | json        | class    | type      | extratags |
+          | jsonv2      | json        | category | type      | extratags |
+          | geojson     | geojson     | category | type      | extratags |
+          | geocodejson | geocodejson | osm_key  | osm_value | extra     |
+
     Scenario Outline: Search with namedetails
         When sending v1/search with format <format>
           | q       | namedetails |

test/bdd/features/db/import/addressing.feature

@@ -241,8 +241,8 @@ Feature: Address computation
     Scenario: buildings with only addr:postcodes do not appear in the address of a way
         Given the grid with origin DE
             | 1 |   |   |   |   | 8 |   | 6 |   | 2 |
-            |   |10 |11 |   |   |   |   |   |   |   |
-            |   |13 |12 |   |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |
+            |   |13 |   |   |   |   |   |   |   |   |
             | 20|   |   | 21|   |   |   |   |   |   |
             |   |   |   |   |   |   |   |   |   |   |
             |   |   |   |   |   | 9 |   |   |   |   |
@@ -255,9 +255,9 @@ Feature: Address computation
         And the named places
             | osm | class    | type           | geometry |
             | W93 | highway  | residential    | 20,21    |
-        And the places
-            | osm | class    | type        | addr+postcode | geometry |
-            | W22 | place    | postcode    | 11234         | (10,11,12,13,10) |
+        And the postcodes
+            | osm |  postcode | centroid |
+            | W22 |  11234    | 13 |
         When importing
         Then place_addressline contains exactly
             | object | address  |

test/bdd/features/db/import/interpolation.feature

@@ -8,12 +8,9 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 6       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2   |
         When importing
         Then W1 expands to no interpolation
 
@@ -25,15 +22,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 6       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2   |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -47,15 +41,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 8       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 2,1      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 2,1      | 2,1   |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 2,1 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -69,15 +60,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 1       |
           | N2  | place | house  | 11      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | odd                | 1,2      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | odd  | 1,2      | 1,2   |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -91,15 +79,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 1       |
           | N2  | place | house  | 4       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | all                | 1,2      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | all  | 1,2      | 1,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -113,15 +98,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 12      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3,2    |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3,2    | 1,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -135,15 +117,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 10      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3,2 |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3,2    | 1,3,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -158,15 +137,12 @@ Feature: Import of address interpolations
           | N1  | place | house  | 2       |
           | N2  | place | house  | 14      |
           | N3  | place | house  | 10      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3,2    |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3,2    | 1,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -184,15 +160,12 @@ Feature: Import of address interpolations
           | N2  | place | house | 14      |
           | N3  | place | house | 10      |
           | N4  | place | house | 18      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3,2,4  |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3,2,4  | 1,3,2,4 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1,3,2,4  |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3,2,4 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -209,15 +182,12 @@ Feature: Import of address interpolations
           | N1  | place | house | 2       |
           | N2  | place | house | 14      |
           | N3  | place | house | 10      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 2,3,1    |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 2,3,1    | 2,3,1 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 2,3,1 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -233,15 +203,12 @@ Feature: Import of address interpolations
           | N1  | place | house | 2       |
           | N2  | place | house | 8       |
           | N3  | place | house | 7       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3,2    |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3,2    | 1,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -257,15 +224,12 @@ Feature: Import of address interpolations
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
           | N3  | place | house | 10      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2,3,2  |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2,3,2  | 1,2,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1,2,3    |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -281,15 +245,12 @@ Feature: Import of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2,3,2  |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2,3,2  | 1,2,3,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1,2,3    |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2,3,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -306,18 +267,14 @@ Feature: Import of address interpolations
           | N2  | place | house | 6       | 2        |
           | N3  | place | house | 12      | 1        |
           | N4  | place | house | 16      | 2        |
-        And the places
-          | osm | class   | type    | addr+interpolation | street       | geometry |
-          | W10 | place   | houses  | even               |              | 1,2      |
-          | W11 | place   | houses  | even               | Cloud Street | 1,2      |
+        And the interpolations
+          | osm | type | street       | nodes | geometry | nodes |
+          | W10 | even |              | 1,2   | 1,2      | 1,2   |
+          | W11 | even | Cloud Street | 3,4   | 1,2      | 3,4   |
         And the places
           | osm | class   | type     | name         | geometry |
           | W2  | highway | tertiary | Sun Way      | 10,11    |
           | W3  | highway | tertiary | Cloud Street | 20,21    |
-        And the ways
-          | id | nodes |
-          | 10 | 1,2   |
-          | 11 | 3,4   |
         When importing
         Then placex contains
           | object | parent_place_id |
@@ -351,18 +308,14 @@ Feature: Import of address interpolations
           | N2  | place | house | 6       |              | 2        |
           | N3  | place | house | 12      | Cloud Street | 1        |
           | N4  | place | house | 16      | Cloud Street | 2        |
-        And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W10 | place   | houses  | even               | 1,2      |
-          | W11 | place   | houses  | even               | 1,2      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W10 | even | 1,2      | 1,2 |
+          | W11 | even | 1,2      | 3,4 |
         And the places
           | osm | class   | type     | name         | geometry |
           | W2  | highway | tertiary | Sun Way      | 10,11    |
           | W3  | highway | tertiary | Cloud Street | 20,21    |
-        And the ways
-          | id  | nodes |
-          | 10  | 1,2 |
-          | 11  | 3,4 |
         When importing
         Then placex contains
           | object | parent_place_id |
@@ -391,15 +344,12 @@ Feature: Import of address interpolations
           | N1  | place | house       | 10      | 144.9632341 -37.76163 |
           | N2  | place | house       | 6       | 144.9630541 -37.7628174 |
           | N3  | shop  | supermarket | 2       | 144.9629794 -37.7630755 |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even    | 144.9632341 -37.76163,144.9630541 -37.7628172,144.9629794 -37.7630755 |
+        And the interpolations
+          | osm | type | geometry                                                              | nodes |
+          | W1  | even | 144.9632341 -37.76163,144.9630541 -37.7628172,144.9629794 -37.7630755 | 1,2,3 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 144.9632341 -37.76163,144.9629794 -37.7630755    |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2,3 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -415,24 +365,21 @@ Feature: Import of address interpolations
           | N1  | place   | house  | 23      |
           | N2  | amenity | school |         |
           | N3  | place   | house  | 29      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | odd                | 1,2,3 |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | odd  | 1,2,3    | 1,2,3 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2,3 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
           | 25    | 27  | 0.0000166 0,0.00002 0,0.0000333 0 |
 
     Scenario: Ways without node entries are ignored
-        Given the places
-          | osm | class | type   | housenr | geometry |
-          | W1  | place | houses | even    | 1 1, 1 1.001 |
+        Given the interpolations
+          | osm | type | geometry     | nodes |
+          | W1  | even | 1 1, 1 1.001 | 34,45 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1 1, 1 1.001 |
@@ -447,9 +394,9 @@ Feature: Import of address interpolations
           | osm | class | type   |
           | N1  | place | house  |
           | N2  | place | house  |
-        Given the places
-          | osm | class | type   | housenr | geometry |
-          | W1  | place | houses | even    | 1,2 |
+        Given the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2   |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
@@ -464,15 +411,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 0       |
           | N2  | place | house  | 10      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2 |
         And the places
           | osm | class   | type        | name        | geometry |
           | W10 | highway | residential | London Road |4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -497,12 +441,9 @@ Feature: Import of address interpolations
           | osm | class   | type        | name     | geometry |
           | W1  | highway | residential | Vert St  | 1,2      |
           | W2  | highway | residential | Horiz St | 2,3      |
-        And the places
-          | osm | class | type   | addr+interpolation | addr+inclusion | geometry |
-          | W10 | place | houses | even               | actual         | 8,9      |
-        And the ways
-          | id | nodes |
-          | 10 | 8,9   |
+        And the interpolations
+          | osm | type | addr+inclusion | geometry | nodes |
+          | W10 | even | actual         | 8,9      | 8,9   |
         When importing
         Then placex contains
           | object | parent_place_id |
@@ -521,15 +462,12 @@ Feature: Import of address interpolations
           | osm | class | type   | housenr |
           | N1  | place | house  | 2       |
           | N2  | place | house  | 6       |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | <value>            | 1,2      |
+        And the interpolations
+          | osm | type    | geometry | nodes |
+          | W1  | <value> | 1,2      | 1,2 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes |
-          | 1  | 1,2 |
         When importing
         Then W1 expands to no interpolation
 
@@ -549,15 +487,12 @@ Feature: Import of address interpolations
           | N2  | place | house  | 18      | 3 |
           | N3  | place | house  | 24      | 9 |
           | N4  | place | house  | 42      | 4 |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,2,3,4  |
+        And the interpolations
+          | osm | type | geometry | nodes   |
+          | W1  | even | 1,2,3,4  | 1,2,3,4 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1,4      |
-        And the ways
-          | id | nodes   |
-          | 1  | 1,2,3,4 |
         When importing
         Then W1 expands to interpolation
           | start | end |
@@ -576,15 +511,12 @@ Feature: Import of address interpolations
           | N2  | place | house  | 6       | 8 |
           | N3  | place | house  | 10      | 8 |
           | N4  | place | house  | 14      | 9 |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 7,8,8,9  |
+        And the interpolations
+          | osm | type | geometry | nodes   |
+          | W1  | even | 7,8,8,9  | 1,2,3,4 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 4,5      |
-        And the ways
-          | id | nodes   |
-          | 1  | 1,2,3,4 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |
@@ -601,15 +533,12 @@ Feature: Import of address interpolations
           | N2  | place | house  | 8       |
           | N3  | place | house  | 12      |
           | N4  | place | house  | 14      |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 8,9      |
+        And the interpolations
+          | osm | type | geometry | nodes       |
+          | W1  | even | 8,9      | 1,8,9,2,3,4 |
         And the named places
           | osm | class   | type        | geometry |
           | W10 | highway | residential | 1,4      |
-        And the ways
-          | id | nodes       |
-          | 1  | 1,8,9,2,3,4 |
         When importing
         Then W1 expands to interpolation
           | start | end | geometry |

test/bdd/features/db/import/linking.feature

@@ -297,8 +297,9 @@ Feature: Linking of places
          | R1         | LabelPlace |
 
 
+    @skip
     Scenario: Linked places expand default language names
-        Given the grid with origin CO
+        Given the grid
             | 1 |   | 2 |
             |   | 9 |   |
             | 4 |   | 3 |

test/bdd/features/db/query/housenumbers.feature

@@ -287,34 +287,62 @@ Feature: Searching of house numbers
          | N1  |
 
 
-    Scenario: Interpolations are found according to their type
-        Given the grid
-         | 10  |  | 11  |
-         | 100 |  | 101 |
-         | 20  |  | 21  |
+    Scenario: A housenumber with interpolation is found
+        Given the places
+         | osm | class    | type | housenr | addr+interpolation | geometry |
+         | N1  | building | yes  | 1-5     | odd                | 9        |
         And the places
-         | osm  | class   | type        | name    | geometry |
-         | W100 | highway | residential | Ringstr | 100, 101 |
-        And the places
-         | osm | class | type   | addr+interpolation | geometry |
-         | W10 | place | houses | even               | 10, 11   |
-         | W20 | place | houses | odd                | 20, 21   |
-        And the places
-         | osm | class | type  | housenr | geometry |
-         | N10 | place | house | 10      | 10 |
-         | N11 | place | house | 20      | 11 |
-         | N20 | place | house | 11      | 20 |
-         | N21 | place | house | 21      | 21 |
-        And the ways
-         | id | nodes |
-         | 10 | 10, 11 |
-         | 20 | 20, 21 |
+         | osm | class   | type | name      | geometry |
+         | W10 | highway | path | Rue Paris | 1,2,3    |
         When importing
-        When geocoding "Ringstr 12"
+        When geocoding "Rue Paris 1"
+        Then the result set contains
+         | object | address+house_number |
+         | N1     | 1-5 |
+        When geocoding "Rue Paris 3"
+        Then the result set contains
+         | object | address+house_number |
+         | N1     | 1-5 |
+        When geocoding "Rue Paris 5"
+        Then the result set contains
+         | object | address+house_number |
+         | N1     | 1-5 |
+        When geocoding "Rue Paris 2"
         Then the result set contains
          | object |
-         | W10 |
-        When geocoding "Ringstr 13"
+         | W10  |
+
+    Scenario: A housenumber with bad interpolation is ignored
+        Given the places
+         | osm | class    | type | housenr | addr+interpolation | geometry |
+         | N1  | building | yes  | 1-5     | bad                | 9        |
+        And the places
+         | osm | class   | type | name      | geometry |
+         | W10 | highway | path | Rue Paris | 1,2,3    |
+        When importing
+        When geocoding "Rue Paris 1-5"
+        Then the result set contains
+         | object | address+house_number |
+         | N1     | 1-5 |
+        When geocoding "Rue Paris 3"
         Then the result set contains
          | object |
-         | W20 |
+         | W10    |
+
+
+    Scenario: A bad housenumber with a good interpolation is just a housenumber
+        Given the places
+         | osm | class    | type | housenr | addr+interpolation | geometry |
+         | N1  | building | yes  | 1-100   | all                | 9        |
+        And the places
+         | osm | class   | type | name      | geometry |
+         | W10 | highway | path | Rue Paris | 1,2,3    |
+        When importing
+        When geocoding "Rue Paris 1-100"
+        Then the result set contains
+         | object | address+house_number |
+         | N1     | 1-100 |
+        When geocoding "Rue Paris 3"
+        Then the result set contains
+         | object |
+         | W10    |

test/bdd/features/db/query/interpolation.feature

@@ -11,16 +11,13 @@ Feature: Query of address interpolations
         Given the places
           | osm | class   | type    | name    | geometry |
           | W10 | highway | primary | Nickway | 10,12,13 |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | odd                | 1,3      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | odd  | 1,3      | 1,3   |
         And the places
           | osm | class | type  | housenr | geometry |
           | N1  | place | house | 1       | 1        |
           | N3  | place | house | 5       | 3        |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3   |
         When importing
         When reverse geocoding at node 2
         Then the result contains
@@ -36,16 +33,13 @@ Feature: Query of address interpolations
         Given the places
           | osm | class   | type    | name    | geometry |
           | W10 | highway | primary | Nickway | 10,12,13 |
-        And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W1  | place | houses | even               | 1,3      |
+        And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,3      | 1,3   |
         And the places
           | osm | class | type  | housenr | geometry |
           | N1  | place | house | 2       | 1        |
           | N3  | place | house | 18      | 3        |
-        And the ways
-          | id | nodes |
-          | 1  | 1,3   |
         When importing
         When reverse geocoding at node 2
         Then the result contains
@@ -55,3 +49,32 @@ Feature: Query of address interpolations
         Then all results contain
           | object | display_name  | centroid!wkt |
           | W1     | 10, Nickway   | 2 |
+
+
+    Scenario: Interpolations are found according to their type
+        Given the grid
+         | 10  |  | 11  |
+         | 100 |  | 101 |
+         | 20  |  | 21  |
+        And the places
+         | osm  | class   | type        | name    | geometry |
+         | W100 | highway | residential | Ringstr | 100, 101 |
+        And the interpolations
+         | osm | type | geometry | nodes |
+         | W10 | even | 10, 11   | 10, 11 |
+         | W20 | odd  | 20, 21   | 20, 21 |
+        And the places
+         | osm | class | type  | housenr | geometry |
+         | N10 | place | house | 10      | 10 |
+         | N11 | place | house | 20      | 11 |
+         | N20 | place | house | 11      | 20 |
+         | N21 | place | house | 21      | 21 |
+        When importing
+        When geocoding "Ringstr 12"
+        Then the result set contains
+         | object |
+         | W10 |
+        When geocoding "Ringstr 13"
+        Then the result set contains
+         | object |
+         | W20 |

test/bdd/features/db/query/search_simple.feature

@@ -80,3 +80,23 @@ Feature: Searching of simple objects
         | Chicago     | Illinois  | IL  |
         | Auburn      | Alabama   | AL  |
         | New Orleans | Louisiana | LA  |
+
+    # github #3210
+    Scenario: Country with alternate-language name does not dominate when locale differs
+        Given the 1.0 grid with origin DE
+         | 1 |    | 2 |
+         |   | 10 |   |
+         | 4 |    | 3 |
+        Given the places
+         | osm  | class    | type           | admin | name+name | name+name:fi | name+name:de | country | geometry    |
+         | R1   | boundary | administrative | 2     | Turgei    | Turgi        | Testland     | de      | (1,2,3,4,1) |
+        Given the places
+         | osm  | class | type    | name+name | geometry |
+         | N10  | place | village | Turgi     | 10       |
+        When importing
+        And geocoding "Turgi"
+         | accept-language |
+         | de              |
+        Then result 0 contains
+         | object |
+         | N10    |

test/bdd/features/db/update/interpolation.feature

@@ -11,18 +11,15 @@ Feature: Update of address interpolations
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Sun Way      | 10,11    |
           | W3  | highway | unclassified | Cloud Street | 20,21    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2   |
       When importing
       Then W10 expands to no interpolation
       When updating places
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And updating places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W10 | place | houses | even               | 1,2      |
+      And updating interpolations
+          | osm | type | geometry | nodes |
+          | W10 | even | 1,2      | 1,2   |
       Then placex contains
           | object | parent_place_id |
           | N1     | W2 |
@@ -41,16 +38,13 @@ Feature: Update of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W10 | place | houses | even               | 1,2      |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W10 | even | 1,2      | 1,2   |
       And the places
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Sun Way      | 10,11    |
           | W3  | highway | unclassified | Cloud Street | 20,21    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2 |
       When importing
       Then placex contains
           | object | parent_place_id |
@@ -59,9 +53,9 @@ Feature: Update of address interpolations
       And W10 expands to interpolation
           | parent_place_id | start | end |
           | W2              | 4     | 4   |
-      When updating places
-          | osm | class   | type    | addr+interpolation | street       | geometry |
-          | W10 | place   | houses  | even               | Cloud Street | 1,2      |
+      When updating interpolations
+          | osm | type | street       | nodes | geometry |
+          | W10 | even | Cloud Street | 1,2   | 1,2      |
       Then placex contains
           | object | parent_place_id |
           | N1     | W3 |
@@ -80,16 +74,13 @@ Feature: Update of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W10 | place | houses | even               | 1,2      |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W10 | even | 1,2      | 1,2   |
       And the places
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Sun Way      | 10,11    |
           | W3  | highway | unclassified | Cloud Street | 20,21    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2 |
       When importing
       Then placex contains
           | object | parent_place_id |
@@ -120,16 +111,13 @@ Feature: Update of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And the places
-          | osm | class | type   | addr+interpolation | geometry |
-          | W10 | place | houses | even               | 1,2      |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W10 | even | 1,2      | 1,2   |
       And the places
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Sun Way      | 10,11    |
           | W3  | highway | unclassified | Cloud Street | 20,21    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2 |
       When importing
       Then placex contains
           | object | parent_place_id |
@@ -155,15 +143,12 @@ Feature: Update of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And the places
-          | osm | class   | type    | addr+interpolation | street      | geometry |
-          | W10 | place   | houses  | even               | Cloud Street| 1,2      |
+      And the interpolations
+          | osm | type | street      | geometry | nodes |
+          | W10 | even | Cloud Street| 1,2      | 1,2   |
       And the places
           | osm | class   | type         | name     | geometry |
           | W2  | highway | unclassified | Sun Way  | 10,11    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2   |
       When importing
       Then placex contains
           | object | parent_place_id |
@@ -193,16 +178,13 @@ Feature: Update of address interpolations
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
-      And the places
-          | osm | class   | type    | addr+interpolation | street      | geometry |
-          | W10 | place   | houses  | even               | Cloud Street| 1,2      |
+      And the interpolations
+          | osm | type | street      | geometry | nodes |
+          | W10 | even | Cloud Street| 1,2      | 1,2   |
       And the places
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Sun Way      | 10,11    |
           | W3  | highway | unclassified | Cloud Street | 20,21    |
-      And the ways
-          | id  | nodes |
-          | 10  | 1,2 |
       When importing
       Then placex contains
           | object | parent_place_id |
@@ -220,67 +202,6 @@ Feature: Update of address interpolations
           | parent_place_id | start | end |
           | W2              | 4     | 4   |
 
-    Scenario: building becomes interpolation
-      Given the grid
-          | 10 |   |    |   | 11 |
-          |    | 1 |    | 2 |    |
-          |    | 4 |    | 3 |    |
-      And the places
-          | osm | class    | type  | housenr | geometry    |
-          | W1  | place    | house | 3       | (1,2,3,4,1) |
-      And the places
-          | osm | class   | type         | name         | geometry |
-          | W2  | highway | unclassified | Cloud Street | 10,11    |
-      When importing
-      Then placex contains
-          | object | parent_place_id |
-          | W1     | W2 |
-      Given the ways
-          | id  | nodes |
-          | 1   | 1,2   |
-      When updating places
-          | osm | class | type  | housenr |
-          | N1  | place | house | 2       |
-          | N2  | place | house | 6       |
-      And updating places
-          | osm | class   | type    | addr+interpolation | street      | geometry |
-          | W1  | place   | houses  | even               | Cloud Street| 1,2      |
-      Then placex has no entry for W1
-      And W1 expands to interpolation
-          | parent_place_id | start | end |
-          | W2              | 4     | 4   |
-
-    Scenario: interpolation becomes building
-      Given the grid
-          | 10 |   |    |   | 11 |
-          |    | 1 |    | 2 |    |
-          |    | 4 |    | 3 |    |
-      And the places
-          | osm | class | type  | housenr |
-          | N1  | place | house | 2       |
-          | N2  | place | house | 6       |
-      And the places
-          | osm | class   | type         | name         | geometry |
-          | W2  | highway | unclassified | Cloud Street | 10,11    |
-      And the ways
-          | id  | nodes |
-          | 1   | 1,2 |
-      And the places
-          | osm | class   | type    | addr+interpolation | street      | geometry |
-          | W1  | place   | houses  | even               | Cloud Street| 1,2      |
-      When importing
-      Then placex has no entry for W1
-      And W1 expands to interpolation
-          | parent_place_id | start | end |
-          | W2              | 4     | 4   |
-      When updating places
-          | osm | class    | type  | housenr | geometry    |
-          | W1  | place    | house | 3       | (1,2,3,4,1) |
-      Then placex contains
-          | object | parent_place_id |
-          | W1     | W2 |
-      And W1 expands to no interpolation
-
     Scenario: housenumbers added to interpolation
       Given the grid
           | 10 |   |    |   | 11 |
@@ -288,18 +209,18 @@ Feature: Update of address interpolations
       And the places
           | osm | class   | type         | name         | geometry |
           | W2  | highway | unclassified | Cloud Street | 10,11    |
-      And the ways
-          | id  | nodes |
-          | 1   | 1,2 |
-      And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W1  | place   | houses  | even               | 1,2 |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2   |
       When importing
       Then W1 expands to no interpolation
       When updating places
           | osm | class | type  | housenr |
           | N1  | place | house | 2       |
           | N2  | place | house | 6       |
+      And updating interpolations
+          | osm | type | geometry | nodes |
+          | W1  | even | 1,2      | 1,2   |
       Then W1 expands to interpolation
           | parent_place_id | start | end |
           | W2              | 4     | 4   |
@@ -311,12 +232,9 @@ Feature: Update of address interpolations
       And the places
           | osm | class   | type         | name         | geometry |
           | W1  | highway | unclassified | Cloud Street | 1, 2     |
-      And the ways
-          | id  | nodes |
-          | 2   | 3,4,5 |
-      And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W2  | place   | houses  | even    | 3,4,5    |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4,5    | 3,4,5 |
       And the places
           | osm | class | type  | housenr |
           | N3  | place | house | 2       |
@@ -328,12 +246,14 @@ Feature: Update of address interpolations
       When updating places
           | osm | class | type  | housenr |
           | N4  | place | house | 6       |
+      And updating interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4,5    | 3,4,5 |
       Then W2 expands to interpolation
           | parent_place_id | start | end |
           | W1              | 4     | 4   |
           | W1              | 8     | 8   |
 
-    @skip
     Scenario: housenumber removed in middle of interpolation
       Given the grid
           | 1 |  |  |   |  | 2 |
@@ -341,12 +261,9 @@ Feature: Update of address interpolations
       And the places
           | osm | class   | type         | name         | geometry |
           | W1  | highway | unclassified | Cloud Street | 1, 2     |
-      And the ways
-          | id  | nodes |
-          | 2   | 3,4,5 |
-      And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W2  | place   | houses  | even    | 3,4,5    |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4,5    | 3,4,5 |
       And the places
           | osm | class | type  | housenr |
           | N3  | place | house | 2       |
@@ -358,6 +275,9 @@ Feature: Update of address interpolations
           | W1              | 4     | 4   |
           | W1              | 8     | 8   |
       When marking for delete N4
+      And updating interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4,5    | 3,4,5 |
       Then W2 expands to interpolation
           | parent_place_id | start | end |
           | W1              | 4     | 8   |
@@ -369,12 +289,9 @@ Feature: Update of address interpolations
       And the places
           | osm | class   | type         | name         | geometry |
           | W1  | highway | unclassified | Cloud Street | 1, 2     |
-      And the ways
-          | id  | nodes |
-          | 2   | 3,4   |
-      And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W2  | place   | houses  | even    | 3,4      |
+      And the interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4      | 3,4   |
       And the places
           | osm | class | type  | housenr |
           | N3  | place | house | 2       |
@@ -386,33 +303,9 @@ Feature: Update of address interpolations
       When updating places
           | osm | class | type  | housenr |
           | N4  | place | house | 8       |
+      And updating interpolations
+          | osm | type | geometry | nodes |
+          | W2  | even | 3,4      | 3,4   |
       Then W2 expands to interpolation
           | parent_place_id | start | end |
           | W1              | 4     | 6   |
-
-    Scenario: Legal interpolation type changed to illegal one
-      Given the grid
-          | 1 |  | 2 |
-          | 3 |  | 4 |
-      And the places
-          | osm | class   | type         | name         | geometry |
-          | W1  | highway | unclassified | Cloud Street | 1, 2     |
-      And the ways
-          | id  | nodes |
-          | 2   | 3,4   |
-      And the places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W2  | place   | houses  | even               | 3,4      |
-      And the places
-          | osm | class | type  | housenr |
-          | N3  | place | house | 2       |
-          | N4  | place | house | 6       |
-      When importing
-      Then W2 expands to interpolation
-          | parent_place_id | start | end |
-          | W1              | 4     | 4   |
-      When updating places
-          | osm | class   | type    | addr+interpolation | geometry |
-          | W2  | place   | houses  | 12-2               | 3,4      |
-      Then W2 expands to no interpolation
-

test/bdd/features/db/update/simple.feature

@@ -68,19 +68,6 @@ Feature: Update of simple objects
           | object | class | type    | centroid!wkt |
           | N3     | shop  | grocery | 1 -1 |
 
-    Scenario: remove postcode place when house number is added
-        Given the places
-          | osm | class | type     | postcode | geometry |
-          | N3  | place | postcode | 12345    | country:de |
-        When importing
-        Then placex has no entry for N3
-        When updating places
-          | osm | class | type  | postcode | housenr | geometry |
-          | N3  | place | house | 12345    | 13      | country:de |
-        Then placex contains
-          | object | class | type |
-          | N3     | place | house |
-
     Scenario: remove boundary when changing from polygon to way
         Given the grid
           | 1 | 2 |

test/bdd/features/osm2pgsql/import/interpolation.feature

@@ -0,0 +1,42 @@
+Feature: Import of interpolations
+    Test if interpolation objects are correctly imported into the
+    place_interpolation table
+
+    Background:
+        Given the grid
+            | 1 | 2 |
+            | 4 | 3 |
+
+    Scenario: Simple address interpolations
+        When loading osm data
+            """
+            n1
+            n2
+            w13001 Taddr:interpolation=odd,addr:street=Blumenstrasse Nn1,n2
+            w13002 Taddr:interpolation=even,place=city Nn1,n2
+            w13003 Taddr:interpolation=odd Nn1,n1
+            """
+        Then place contains exactly
+            | object | class | type |
+            | W13002 | place | city |
+        And place_interpolation contains exactly
+            | osm_id | type | address!dict              | nodes!ints | geometry!wkt |
+            | 13001  | odd  | "street": "Blumenstrasse" | 1,2        | 1,2          |
+            | 13002  | even | -                         | 1,2        | 1,2          |
+
+    Scenario: Address interpolation with housenumber
+        When loading osm data
+            """
+            n1
+            n2
+            n3
+            n4
+            w34 Taddr:interpolation=all,addr:housenumber=2-4,building=yes Nn1,n2,n3,n4,n1
+            w35 Taddr:interpolation=all,addr:housenumber=5,building=yes Nn1,n2,n3,n4,n1
+            w36 Taddr:interpolation=all,addr:housenumber=2a-c Nn1,n2,n3,n4,n1
+            """
+        Then place contains exactly
+            | object | class    | type  | address!dict                                |
+            | W35    | building | yes   | "housenumber": "5", "interpolation": "all" |
+            | W34    | building | yes   | "housenumber": "2-4", "interpolation": "all" |
+            | W36    | place    | house | "housenumber": "2a-c", "interpolation": "all" |

test/bdd/features/osm2pgsql/import/tags.feature

@@ -205,18 +205,6 @@ Feature: Tag evaluation
             | N12005 | 12345    | -        |
 
 
-    Scenario: Address interpolations
-        When loading osm data
-            """
-            n13001 Taddr:interpolation=odd
-            n13002 Taddr:interpolation=even,place=city
-            """
-        Then place contains exactly
-            | object | class | type   | address!dict            |
-            | N13001 | place | houses | 'interpolation': 'odd'  |
-            | N13002 | place | houses | 'interpolation': 'even' |
-
-
     Scenario: Footways
         When loading osm data
             """

test/bdd/features/osm2pgsql/update/interpolations.feature

@@ -14,20 +14,24 @@ Feature: Updates of address interpolation objects
             n2 Taddr:housenumber=17
             w33 Thighway=residential,name=Tao Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
+            | W33    | highway | residential |
 
         When updating osm data
             """
             w99 Taddr:interpolation=odd Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
-            | W99    | place | houses |
+            | W33    | highway | residential |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 99     | odd  |
         When indexing
         Then placex contains exactly
             | object | class   | type   |
@@ -46,11 +50,13 @@ Feature: Updates of address interpolation objects
             n2 Taddr:housenumber=7
             w99 Taddr:interpolation=odd Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
-            | W99    | place | houses |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 99     | odd  |
 
         When updating osm data
             """
@@ -60,6 +66,8 @@ Feature: Updates of address interpolation objects
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
+        And place_interpolation contains exactly
+            | osm_id |
         When indexing
         Then placex contains exactly
             | object | class | type   |
@@ -77,21 +85,27 @@ Feature: Updates of address interpolation objects
             w33 Thighway=residential Nn1,n2
             w99 Thighway=residential Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class   | type   |
             | N1     | place   | house  |
             | N2     | place   | house  |
+            | W33    | highway | residential  |
             | W99    | highway | residential  |
+        And place_interpolation contains exactly
+            | osm_id |
 
         When updating osm data
             """
             w99 Taddr:interpolation=odd Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
-            | W99    | place | houses |
+            | W33    | highway | residential  |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 99     | odd  |
         When indexing
         Then placex contains exactly
             | object | class   | type   |
@@ -110,11 +124,13 @@ Feature: Updates of address interpolation objects
             n2 Taddr:housenumber=17
             w99 Taddr:interpolation=odd Nn1,n2
             """
-        Then place contains
+        Then place contains exactly
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
-            | W99    | place | houses |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 99     | odd  |
 
         When updating osm data
             """
@@ -125,6 +141,8 @@ Feature: Updates of address interpolation objects
             | N1     | place   | house  |
             | N2     | place   | house  |
             | W99    | highway | residential  |
+        And place_interpolation contains exactly
+            | osm_id |
         When indexing
         Then placex contains exactly
             | object | class   | type   |

test/bdd/features/osm2pgsql/update/postcodes.feature

@@ -112,7 +112,9 @@ Feature: Update of postcode only objects
             | object | class | type   |
             | N1     | place | house  |
             | N2     | place | house  |
-            | W34    | place | houses |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 34     | odd  |
 
         When updating osm data
             """
@@ -122,9 +124,11 @@ Feature: Update of postcode only objects
             | object | class | type     |
             | N1     | place | house    |
             | N2     | place | house    |
-        Then place_postcode contains exactly
+        And place_postcode contains exactly
             | object | postcode |
             | W34    | 4456     |
+        And place_interpolation contains exactly
+            | osm_id |
         When indexing
         Then location_property_osmline contains exactly
             | osm_id |
@@ -158,7 +162,9 @@ Feature: Update of postcode only objects
             | N1     | place   | house  |
             | N2     | place   | house  |
             | W33    | highway | residential |
-            | W34    | place   | houses |
+        And place_interpolation contains exactly
+            | osm_id | type |
+            | 34     | odd  |
         And place_postcode contains exactly
             | object |
         When indexing

test/bdd/test_db.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Collector for BDD import acceptance tests.
@@ -14,6 +14,7 @@ import re
 from collections import defaultdict
 
 import psycopg
+import psycopg.sql as pysql
 
 import pytest
 from pytest_bdd import when, then, given
@@ -50,6 +51,34 @@ def _collect_place_ids(conn):
     return pids
 
 
+@pytest.fixture
+def row_factory(db_conn):
+    def _insert_row(table, **data):
+        columns = []
+        placeholders = []
+        values = []
+        for k, v in data.items():
+            columns.append(pysql.Identifier(k))
+            if isinstance(v, tuple):
+                placeholders.append(pysql.SQL(v[0]))
+                values.append(v[1])
+            elif isinstance(v, (pysql.Literal, pysql.SQL)):
+                placeholders.append(v)
+            else:
+                placeholders.append(pysql.Placeholder())
+                values.append(v)
+
+        sql = pysql.SQL("INSERT INTO {table} ({columns}) VALUES({values})")\
+                   .format(table=pysql.Identifier(table),
+                           columns=pysql.SQL(',').join(columns),
+                           values=pysql.SQL(',').join(placeholders))
+
+        db_conn.execute(sql, values)
+        db_conn.commit()
+
+    return _insert_row
+
+
 @pytest.fixture
 def test_config_env(pytestconfig):
     dbname = pytestconfig.getini('nominatim_test_db')
@@ -85,18 +114,36 @@ def import_places(db_conn, named, datatable, node_grid):
 
 
 @given(step_parse('the entrances'), target_fixture=None)
-def import_place_entrances(db_conn, datatable, node_grid):
+def import_place_entrances(row_factory, datatable, node_grid):
     """ Insert todo rows into the place_entrance table.
     """
-    with db_conn.cursor() as cur:
-        for row in datatable[1:]:
-            data = PlaceColumn(node_grid).add_row(datatable[0], row, False)
-            assert data.columns['osm_type'] == 'N'
+    for row in datatable[1:]:
+        data = PlaceColumn(node_grid).add_row(datatable[0], row, False)
+        assert data.columns['osm_type'] == 'N'
 
-            cur.execute("""INSERT INTO place_entrance (osm_id, type, extratags, geometry)
-                           VALUES (%s, %s, %s, {})""".format(data.get_wkt()),
-                        (data.columns['osm_id'], data.columns['type'],
-                         data.columns.get('extratags')))
+        params = {'osm_id': data.columns['osm_id'],
+                  'type': data.columns['type'],
+                  'extratags': data.columns.get('extratags'),
+                  'geometry': pysql.SQL(data.get_wkt())}
+
+        row_factory('place_entrance', **params)
+
+
+@given(step_parse('the interpolations'), target_fixture=None)
+def import_place_interpolations(row_factory, datatable, node_grid):
+    """ Insert todo rows into the place_entrance table.
+    """
+    for row in datatable[1:]:
+        data = PlaceColumn(node_grid).add_row(datatable[0], row, False)
+        assert data.columns['osm_type'] == 'W'
+
+        params = {'osm_id': data.columns['osm_id'],
+                  'type': data.columns['type'],
+                  'address': data.columns.get('address'),
+                  'nodes': [int(x) for x in data.columns['nodes'].split(',')],
+                  'geometry': pysql.SQL(data.get_wkt())}
+
+        row_factory('place_interpolation', **params)
 
 
 @given(step_parse('the postcodes'), target_fixture=None)
@@ -135,43 +182,41 @@ def import_place_postcode(db_conn, datatable, node_grid):
 
 
 @given('the ways', target_fixture=None)
-def import_ways(db_conn, datatable):
+def import_ways(row_factory, datatable):
     """ Import raw ways into the osm2pgsql way middle table.
     """
-    with db_conn.cursor() as cur:
-        id_idx = datatable[0].index('id')
-        node_idx = datatable[0].index('nodes')
-        for line in datatable[1:]:
-            tags = psycopg.types.json.Json(
-                {k[5:]: v for k, v in zip(datatable[0], line)
-                 if k.startswith("tags+")})
-            nodes = [int(x) for x in line[node_idx].split(',')]
-
-            cur.execute("INSERT INTO planet_osm_ways (id, nodes, tags) VALUES (%s, %s, %s)",
-                        (line[id_idx], nodes, tags))
+    id_idx = datatable[0].index('id')
+    node_idx = datatable[0].index('nodes')
+    for line in datatable[1:]:
+        row_factory('planet_osm_ways',
+                    id=line[id_idx],
+                    nodes=[int(x) for x in line[node_idx].split(',')],
+                    tags=psycopg.types.json.Json(
+                        {k[5:]: v for k, v in zip(datatable[0], line)
+                         if k.startswith("tags+")}))
 
 
 @given('the relations', target_fixture=None)
-def import_rels(db_conn, datatable):
+def import_rels(row_factory, datatable):
     """ Import raw relations into the osm2pgsql relation middle table.
     """
-    with db_conn.cursor() as cur:
-        id_idx = datatable[0].index('id')
-        memb_idx = datatable[0].index('members')
-        for line in datatable[1:]:
-            tags = psycopg.types.json.Json(
-                {k[5:]: v for k, v in zip(datatable[0], line)
-                 if k.startswith("tags+")})
-            members = []
-            if line[memb_idx]:
-                for member in line[memb_idx].split(','):
-                    m = re.fullmatch(r'\s*([RWN])(\d+)(?::(\S+))?\s*', member)
-                    if not m:
-                        raise ValueError(f'Illegal member {member}.')
-                    members.append({'ref': int(m[2]), 'role': m[3] or '', 'type': m[1]})
+    id_idx = datatable[0].index('id')
+    memb_idx = datatable[0].index('members')
+    for line in datatable[1:]:
+        tags = psycopg.types.json.Json(
+            {k[5:]: v for k, v in zip(datatable[0], line)
+             if k.startswith("tags+")})
+        members = []
+        if line[memb_idx]:
+            for member in line[memb_idx].split(','):
+                m = re.fullmatch(r'\s*([RWN])(\d+)(?::(\S+))?\s*', member)
+                if not m:
+                    raise ValueError(f'Illegal member {member}.')
+                members.append({'ref': int(m[2]), 'role': m[3] or '', 'type': m[1]})
 
-            cur.execute('INSERT INTO planet_osm_rels (id, tags, members) VALUES (%s, %s, %s)',
-                        (int(line[id_idx]), tags, psycopg.types.json.Json(members)))
+        row_factory('planet_osm_rels',
+                    id=int(line[id_idx]), tags=tags,
+                    members=psycopg.types.json.Json(members))
 
 
 @when('importing', target_fixture='place_ids')
@@ -221,6 +266,28 @@ def update_place_entrances(db_conn, datatable, node_grid):
     db_conn.commit()
 
 
+@when('updating interpolations', target_fixture=None)
+def update_place_interpolations(db_conn, row_factory, update_config, datatable, node_grid):
+    """ Update rows in the place_entrance table.
+    """
+    for row in datatable[1:]:
+        data = PlaceColumn(node_grid).add_row(datatable[0], row, False)
+        assert data.columns['osm_type'] == 'W'
+
+        params = {'osm_id': data.columns['osm_id'],
+                  'type': data.columns['type'],
+                  'address': data.columns.get('address'),
+                  'nodes': [int(x) for x in data.columns['nodes'].split(',')],
+                  'geometry': pysql.SQL(data.get_wkt())}
+
+        row_factory('place_interpolation', **params)
+
+    db_conn.execute('SELECT flush_deleted_places()')
+    db_conn.commit()
+
+    cli.nominatim(['index', '-q', '--minrank', '30'], update_config.environ)
+
+
 @when('refreshing postcodes')
 def do_postcode_update(update_config):
     """ Recompute the postcode centroids.
@@ -237,6 +304,8 @@ def do_delete_place(db_conn, update_config, node_grid, otype, oid):
         cur.execute('TRUNCATE place_to_be_deleted')
         cur.execute('DELETE FROM place WHERE osm_type = %s and osm_id = %s',
                     (otype, oid))
+        cur.execute('DELETE FROM place_interpolation WHERE osm_id = %s',
+                    (oid, ))
         cur.execute('SELECT flush_deleted_places()')
         if otype == 'N':
             cur.execute('DELETE FROM place_entrance WHERE osm_id = %s',

test/bdd/utils/checks.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Helper functions to compare expected values.
@@ -61,6 +61,8 @@ COMPARISON_FUNCS = {
     'fm': lambda val, exp: re.fullmatch(exp, val) is not None,
     'dict': lambda val, exp: (val is None if exp == '-'
                               else (val == ast.literal_eval('{' + exp + '}'))),
+    'ints': lambda val, exp: (val is None if exp == '-'
+                              else (val == [int(i) for i in exp.split(',')])),
     'in_box': within_box
 }
 
@@ -84,6 +86,8 @@ class ResultAttr:
         !fm     - consider comparison string a regular expression and match full value
         !wkt    - convert the expected value to a WKT string before comparing
         !in_box - the expected value is a comma-separated bbox description
+        !dict   - compare as a dictitionary, member order does not matter
+        !ints   - compare as integer array
     """
 
     def __init__(self, obj, key, grid=None):

test/bdd/utils/place_inserter.py

@@ -54,7 +54,6 @@ class PlaceColumn:
         elif key in ('name', 'address', 'extratags'):
             self.columns[key] = ast.literal_eval('{' + value + '}')
         else:
-            assert key in ('class', 'type'), "Unknown column '{}'.".format(key)
             self.columns[key] = None if value == '' else value
 
     def _set_key_name(self, value):

test/python/api/test_result_formatting_v1.py

@@ -12,6 +12,7 @@ For functional tests see BDD test suite.
 """
 import datetime as dt
 import json
+import xml.etree.ElementTree as ET
 
 import pytest
 
@@ -332,3 +333,98 @@ def test_search_details_keywords_address():
     assert js['keywords'] == {'address': [{'id': 23, 'token': 'foo'},
                                           {'id': 24, 'token': 'foo'}],
                               'name': []}
+
+
+# admin_level injection into extratags
+
+SEARCH_FORMATS = ['json', 'jsonv2', 'geojson', 'geocodejson', 'xml']
+
+
+@pytest.mark.parametrize('fmt', SEARCH_FORMATS)
+def test_search_extratags_boundary_administrative_injects_admin_level(fmt):
+    search = napi.SearchResult(napi.SourceTable.PLACEX,
+                               ('boundary', 'administrative'),
+                               napi.Point(1.0, 2.0),
+                               admin_level=6,
+                               extratags={'place': 'city'})
+
+    raw = v1_format.format_result(napi.SearchResults([search]), fmt,
+                                  {'extratags': True})
+
+    if fmt == 'xml':
+        root = ET.fromstring(raw)
+        tags = {tag.attrib['key']: tag.attrib['value']
+                for tag in root.find('.//extratags').findall('tag')}
+        assert tags['admin_level'] == '6'
+        assert tags['place'] == 'city'
+    else:
+        result = json.loads(raw)
+        if fmt == 'geocodejson':
+            extra = result['features'][0]['properties']['geocoding']['extra']
+        elif fmt == 'geojson':
+            extra = result['features'][0]['properties']['extratags']
+        else:
+            extra = result[0]['extratags']
+
+        assert extra['admin_level'] == '6'
+        assert extra['place'] == 'city'
+
+
+@pytest.mark.parametrize('fmt', SEARCH_FORMATS)
+def test_search_extratags_non_boundary_no_admin_level_injection(fmt):
+    search = napi.SearchResult(napi.SourceTable.PLACEX,
+                               ('place', 'city'),
+                               napi.Point(1.0, 2.0),
+                               admin_level=8,
+                               extratags={'place': 'city'})
+
+    raw = v1_format.format_result(napi.SearchResults([search]), fmt,
+                                  {'extratags': True})
+
+    if fmt == 'xml':
+        root = ET.fromstring(raw)
+        tags = {tag.attrib['key']: tag.attrib['value']
+                for tag in root.find('.//extratags').findall('tag')}
+        assert 'admin_level' not in tags
+        assert tags['place'] == 'city'
+    else:
+        result = json.loads(raw)
+        if fmt == 'geocodejson':
+            extra = result['features'][0]['properties']['geocoding']['extra']
+        elif fmt == 'geojson':
+            extra = result['features'][0]['properties']['extratags']
+        else:
+            extra = result[0]['extratags']
+
+        assert 'admin_level' not in extra
+        assert extra['place'] == 'city'
+
+
+@pytest.mark.parametrize('fmt', SEARCH_FORMATS)
+def test_search_extratags_boundary_admin_level_15_no_injection(fmt):
+    search = napi.SearchResult(napi.SourceTable.PLACEX,
+                               ('boundary', 'administrative'),
+                               napi.Point(1.0, 2.0),
+                               admin_level=15,
+                               extratags={'place': 'city'})
+
+    raw = v1_format.format_result(napi.SearchResults([search]), fmt,
+                                  {'extratags': True})
+
+    if fmt == 'xml':
+        root = ET.fromstring(raw)
+        tags = {tag.attrib['key']: tag.attrib['value']
+                for tag in root.find('.//extratags').findall('tag')}
+        assert 'admin_level' not in tags
+        assert tags['place'] == 'city'
+    else:
+        result = json.loads(raw)
+        if fmt == 'geocodejson':
+            extra = result['features'][0]['properties']['geocoding']['extra']
+        elif fmt == 'geojson':
+            extra = result['features'][0]['properties']['extratags']
+        else:
+            extra = result[0]['extratags']
+
+        assert 'admin_level' not in extra
+        assert extra['place'] == 'city'

test/python/cli/test_cmd_index.py

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2025 by the Nominatim developer community.
+# For a full list of authors see the git log.
+"""
+Tests for index command of the command-line interface wrapper.
+"""
+import pytest
+
+import nominatim_db.indexer.indexer
+
+
+class TestCliIndexWithDb:
+
+    @pytest.fixture(autouse=True)
+    def setup_cli_call(self, cli_call, cli_tokenizer_mock):
+        self.call_nominatim = cli_call
+        self.tokenizer_mock = cli_tokenizer_mock
+
+    def test_index_empty_subset(self, monkeypatch, async_mock_func_factory, placex_row):
+        placex_row(rank_address=1, indexed_status=1)
+        placex_row(rank_address=20, indexed_status=1)
+
+        mocks = [
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_boundaries'),
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_by_rank'),
+            async_mock_func_factory(nominatim_db.indexer.indexer.Indexer, 'index_postcodes'),
+        ]
+
+        def _reject_repeat_call(*args, **kwargs):
+            assert False, "Did not expect multiple Indexer.has_pending invocations"
+
+        has_pending_calls = [nominatim_db.indexer.indexer.Indexer.has_pending, _reject_repeat_call]
+        monkeypatch.setattr(nominatim_db.indexer.indexer.Indexer, 'has_pending',
+                            lambda *args, **kwargs: has_pending_calls.pop(0)(*args, **kwargs))
+
+        assert self.call_nominatim('index', '--minrank', '5', '--maxrank', '10') == 0
+
+        for mock in mocks:
+            assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)

test/python/config/test_config.py

@@ -200,14 +200,15 @@ def test_get_path_empty(make_config):
     assert not config.get_path('TOKENIZER_CONFIG')
 
 
-def test_get_path_absolute(make_config, monkeypatch):
+def test_get_path_absolute(make_config, monkeypatch, tmp_path):
     config = make_config()
 
-    monkeypatch.setenv('NOMINATIM_FOOBAR', '/dont/care')
+    p = (tmp_path / "does_not_exist").resolve()
+    monkeypatch.setenv('NOMINATIM_FOOBAR', str(p))
     result = config.get_path('FOOBAR')
 
     assert isinstance(result, Path)
-    assert str(result) == '/dont/care'
+    assert str(result) == str(p)
 
 
 def test_get_path_relative(make_config, monkeypatch, tmp_path):

test/python/conftest.py

@@ -2,12 +2,16 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 import itertools
 import sys
+import asyncio
 from pathlib import Path
 
+if sys.platform == 'win32':
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+
 import psycopg
 from psycopg import sql as pysql
 import pytest
@@ -17,12 +21,11 @@ SRC_DIR = (Path(__file__) / '..' / '..' / '..').resolve()
 sys.path.insert(0, str(SRC_DIR / 'src'))
 
 from nominatim_db.config import Configuration
-from nominatim_db.db import connection
+from nominatim_db.db import connection, properties
 from nominatim_db.db.sql_preprocessor import SQLPreprocessor
 import nominatim_db.tokenizer.factory
 
 import dummy_tokenizer
-import mocks
 from cursor import CursorForTesting
 
 
@@ -132,28 +135,50 @@ def project_env(tmp_path):
 
 
 @pytest.fixture
-def property_table(table_factory, temp_db_conn):
-    table_factory('nominatim_properties', 'property TEXT, value TEXT')
-
-    return mocks.MockPropertyTable(temp_db_conn)
+def country_table(table_factory):
+    table_factory('country_name', 'partition INT, country_code varchar(2), name hstore')
 
 
 @pytest.fixture
-def status_table(table_factory):
+def country_row(country_table, temp_db_cursor):
+    def _add(partition=None, country=None, names=None):
+        temp_db_cursor.insert_row('country_name', partition=partition,
+                                  country_code=country, name=names)
+
+    return _add
+
+
+@pytest.fixture
+def load_sql(temp_db_conn, country_table):
+    conf = Configuration(None)
+
+    def _run(*filename, **kwargs):
+        for fn in filename:
+            SQLPreprocessor(temp_db_conn, conf).run_sql_file(temp_db_conn, fn, **kwargs)
+
+    return _run
+
+
+@pytest.fixture
+def property_table(load_sql, temp_db_conn):
+    load_sql('tables/nominatim_properties.sql')
+
+    class _PropTable:
+        def set(self, name, value):
+            properties.set_property(temp_db_conn, name, value)
+
+        def get(self, name):
+            return properties.get_property(temp_db_conn, name)
+
+    return _PropTable()
+
+
+@pytest.fixture
+def status_table(load_sql):
     """ Create an empty version of the status table and
         the status logging table.
     """
-    table_factory('import_status',
-                  """lastimportdate timestamp with time zone NOT NULL,
-                     sequence_id integer,
-                     indexed boolean""")
-    table_factory('import_osmosis_log',
-                  """batchend timestamp,
-                     batchseq integer,
-                     batchsize bigint,
-                     starttime timestamp,
-                     endtime timestamp,
-                     event text""")
+    load_sql('tables/status.sql')
 
 
 @pytest.fixture
@@ -167,9 +192,9 @@ def place_table(temp_db_with_extensions, table_factory):
                      type text NOT NULL,
                      name hstore,
                      admin_level smallint,
-                     address hstore,
-                     extratags hstore,
-                     geometry Geometry(Geometry,4326) NOT NULL""")
+                     address HSTORE,
+                     extratags HSTORE,
+                     geometry GEOMETRY(Geometry,4326) NOT NULL""")
 
 
 @pytest.fixture
@@ -178,12 +203,14 @@ def place_row(place_table, temp_db_cursor):
         prerequisite to the fixture.
     """
     idseq = itertools.count(1001)
+
     def _insert(osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None,
-                admin_level=None, address=None, extratags=None, geom=None):
-        temp_db_cursor.execute("INSERT INTO place VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
-                               (osm_id or next(idseq), osm_type, cls, typ, names,
-                                admin_level, address, extratags,
-                                geom or 'SRID=4326;POINT(0 0)'))
+                admin_level=None, address=None, extratags=None, geom='POINT(0 0)'):
+        args = {'osm_type': osm_type, 'osm_id': osm_id or next(idseq),
+                'class': cls, 'type': typ, 'name': names, 'admin_level': admin_level,
+                'address': address, 'extratags': extratags,
+                'geometry': _with_srid(geom)}
+        temp_db_cursor.insert_row('place', **args)
 
     return _insert
 
@@ -196,57 +223,141 @@ def place_postcode_table(temp_db_with_extensions, table_factory):
                   """osm_type char(1) NOT NULL,
                      osm_id bigint NOT NULL,
                      postcode text NOT NULL,
-                     country_code text,
-                     centroid Geometry(Point, 4326) NOT NULL,
-                     geometry Geometry(Geometry, 4326)""")
+                     country_code TEXT,
+                     centroid GEOMETRY(Point, 4326) NOT NULL,
+                     geometry GEOMETRY(Geometry, 4326)""")
 
 
 @pytest.fixture
 def place_postcode_row(place_postcode_table, temp_db_cursor):
-    """ A factory for rows in the place table. The table is created as a
+    """ A factory for rows in the place_postcode table. The table is created as a
         prerequisite to the fixture.
     """
     idseq = itertools.count(5001)
+
     def _insert(osm_type='N', osm_id=None, postcode=None, country=None,
-                centroid=None, geom=None):
-        temp_db_cursor.execute("INSERT INTO place_postcode VALUES (%s, %s, %s, %s, %s, %s)",
-                               (osm_type, osm_id or next(idseq),
-                                postcode, country,
-                                _with_srid(centroid, 'POINT(12.0 4.0)'),
-                                _with_srid(geom)))
+                centroid='POINT(12.0 4.0)', geom=None):
+        temp_db_cursor.insert_row('place_postcode',
+                                  osm_type=osm_type, osm_id=osm_id or next(idseq),
+                                  postcode=postcode, country_code=country,
+                                  centroid=_with_srid(centroid),
+                                  geometry=_with_srid(geom))
 
     return _insert
 
 
 @pytest.fixture
-def placex_table(temp_db_with_extensions, temp_db_conn):
-    """ Create an empty version of the place table.
+def place_interpolation_table(temp_db_with_extensions, table_factory):
+    """ Create an empty version of the place_interpolation table.
     """
-    return mocks.MockPlacexTable(temp_db_conn)
-
-
-@pytest.fixture
-def osmline_table(temp_db_with_extensions, table_factory):
-    table_factory('location_property_osmline',
-                  """place_id BIGINT,
-                     osm_id BIGINT,
-                     parent_place_id BIGINT,
-                     geometry_sector INTEGER,
-                     indexed_date TIMESTAMP,
-                     startnumber INTEGER,
-                     endnumber INTEGER,
-                     partition SMALLINT,
-                     indexed_status SMALLINT,
-                     linegeo GEOMETRY,
-                     interpolationtype TEXT,
+    table_factory('place_interpolation',
+                  """osm_id bigint NOT NULL,
+                     type TEXT,
                      address HSTORE,
-                     postcode TEXT,
-                     country_code VARCHAR(2)""")
+                     nodes BIGINT[],
+                     geometry GEOMETRY(Geometry, 4326)""")
 
 
 @pytest.fixture
-def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions):
-    table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
+def place_interpolation_row(place_interpolation_table, temp_db_cursor):
+    """ A factory for rows in the place_interpolation table. The table is created as a
+        prerequisite to the fixture.
+    """
+    idseq = itertools.count(30001)
+
+    def _insert(osm_id=None, typ='odd', address=None,
+                nodes=None, geom='LINESTRING(0.1 0.21, 0.1 0.2)'):
+        params = {'osm_id': osm_id or next(idseq),
+                  'type': typ, 'address': address, 'nodes': nodes,
+                  'geometry': _with_srid(geom)}
+        temp_db_cursor.insert_row('place_interpolation', **params)
+
+    return _insert
+
+
+@pytest.fixture
+def placex_table(temp_db_with_extensions, temp_db_conn, load_sql, place_table):
+    """ Create an empty version of the placex table.
+    """
+    load_sql('tables/placex.sql')
+    temp_db_conn.execute("CREATE SEQUENCE IF NOT EXISTS seq_place START 1")
+
+
+@pytest.fixture
+def placex_row(placex_table, temp_db_cursor):
+    """ A factory for rows in the placex table. The table is created as a
+        prerequisite to the fixture.
+    """
+    idseq = itertools.count(1001)
+
+    def _add(osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None,
+             admin_level=None, address=None, extratags=None, geom='POINT(10 4)',
+             country=None, housenumber=None, rank_search=30, rank_address=30,
+             centroid='POINT(10 4)', indexed_status=0, indexed_date=None,
+             importance=0.00001):
+        args = {'place_id': pysql.SQL("nextval('seq_place')"),
+                'osm_type': osm_type, 'osm_id': osm_id or next(idseq),
+                'class': cls, 'type': typ, 'name': names, 'admin_level': admin_level,
+                'address': address, 'housenumber': housenumber,
+                'rank_search': rank_search, 'rank_address': rank_address,
+                'extratags': extratags, 'importance': importance,
+                'centroid': _with_srid(centroid), 'geometry': _with_srid(geom),
+                'country_code': country,
+                'indexed_status': indexed_status, 'indexed_date': indexed_date,
+                'partition': pysql.Literal(0), 'geometry_sector': pysql.Literal(1)}
+        return temp_db_cursor.insert_row('placex', **args)
+
+    return _add
+
+
+@pytest.fixture
+def osmline_table(temp_db_with_extensions, load_sql):
+    load_sql('tables/interpolation.sql')
+
+
+@pytest.fixture
+def osmline_row(osmline_table, temp_db_cursor):
+    idseq = itertools.count(20001)
+
+    def _add(osm_id=None, geom='LINESTRING(12.0 11.0, 12.003 11.0)'):
+        return temp_db_cursor.insert_row(
+            'location_property_osmline',
+            place_id=pysql.SQL("nextval('seq_place')"),
+            osm_id=osm_id or next(idseq),
+            geometry_sector=pysql.Literal(20),
+            partition=pysql.Literal(0),
+            indexed_status=1,
+            linegeo=_with_srid(geom))
+
+    return _add
+
+
+@pytest.fixture
+def postcode_table(temp_db_with_extensions, load_sql):
+    load_sql('tables/postcodes.sql')
+
+
+@pytest.fixture
+def postcode_row(postcode_table, temp_db_cursor):
+    def _add(country, postcode, x=34.5, y=-9.33):
+        geom = _with_srid(f"POINT({x} {y})")
+        return temp_db_cursor.insert_row(
+            'location_postcodes',
+            place_id=pysql.SQL("nextval('seq_place')"),
+            indexed_status=pysql.Literal(1),
+            country_code=country, postcode=postcode,
+            centroid=geom,
+            rank_search=pysql.Literal(16),
+            geometry=('ST_Expand(%s::geometry, 0.005)', geom))
+
+    return _add
+
+
+@pytest.fixture
+def sql_preprocessor_cfg(tmp_path, table_factory, temp_db_with_extensions, country_row):
+    for part in range(3):
+        country_row(partition=part)
+
     cfg = Configuration(None)
     cfg.set_libdirs(sql=tmp_path)
     return cfg

test/python/cursor.py

@@ -2,12 +2,13 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Specialised psycopg cursor with shortcut functions useful for testing.
 """
 import psycopg
+from psycopg import sql as pysql
 
 
 class CursorForTesting(psycopg.Cursor):
@@ -52,7 +53,49 @@ class CursorForTesting(psycopg.Cursor):
     def table_rows(self, table, where=None):
         """ Return the number of rows in the given table.
         """
-        if where is None:
-            return self.scalar('SELECT count(*) FROM ' + table)
+        sql = pysql.SQL('SELECT count(*) FROM') + pysql.Identifier(table)
+        if where is not None:
+            sql += pysql.SQL('WHERE') + pysql.SQL(where)
 
-        return self.scalar('SELECT count(*) FROM {} WHERE {}'.format(table, where))
+        return self.scalar(sql)
+
+    def insert_row(self, table, **data):
+        """ Insert a row into the given table.
+
+            'data' is a dictionary of column names and associated values.
+            When the value is a pysql.Literal or pysql.SQL, then the expression
+            will be inserted as is instead of loading the value. When the
+            value is a tuple, then the first element will be added as an
+            SQL expression for the value and the second element is treated
+            as the actual value to insert. The SQL expression must contain
+            a %s placeholder in that case.
+
+            If data contains a 'place_id' column, then the value of the
+            place_id column after insert is returned. Otherwise the function
+            returns nothing.
+        """
+        columns = []
+        placeholders = []
+        values = []
+        for k, v in data.items():
+            columns.append(pysql.Identifier(k))
+            if isinstance(v, tuple):
+                placeholders.append(pysql.SQL(v[0]))
+                values.append(v[1])
+            elif isinstance(v, (pysql.Literal, pysql.SQL)):
+                placeholders.append(v)
+            else:
+                placeholders.append(pysql.Placeholder())
+                values.append(v)
+
+        sql = pysql.SQL("INSERT INTO {table} ({columns}) VALUES({values})")\
+                   .format(table=pysql.Identifier(table),
+                           columns=pysql.SQL(',').join(columns),
+                           values=pysql.SQL(',').join(placeholders))
+
+        if 'place_id' in data:
+            sql += pysql.SQL('RETURNING place_id')
+
+        self.execute(sql, values)
+
+        return self.fetchone()[0] if 'place_id' in data else None

test/python/data/test_country_info.py

@@ -53,11 +53,10 @@ def test_setup_country_tables(src_dir, temp_db_with_extensions, dsn, temp_db_cur
 
 @pytest.mark.parametrize("languages", (None, ['fr', 'en']))
 def test_create_country_names(temp_db_with_extensions, temp_db_conn, temp_db_cursor,
-                              table_factory, tokenizer_mock, languages, loaded_country):
-
-    table_factory('country_name', 'country_code varchar(2), name hstore',
-                  content=(('us', '"name"=>"us1","name:af"=>"us2"'),
-                           ('fr', '"name"=>"Fra", "name:en"=>"Fren"')))
+                              country_row, tokenizer_mock, languages, loaded_country):
+    temp_db_cursor.execute('TRUNCATE country_name')
+    country_row(country='us', names={"name": "us1", "name:af": "us2"})
+    country_row(country='fr', names={"name": "Fra", "name:en": "Fren"})
 
     assert temp_db_cursor.scalar("SELECT count(*) FROM country_name") == 2
 

test/python/indexer/test_indexing.py

@@ -1,13 +1,12 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for running the indexing.
 """
-import itertools
+
 import pytest
 import pytest_asyncio  # noqa
 
@@ -15,129 +14,57 @@ from nominatim_db.indexer import indexer
 from nominatim_db.tokenizer import factory
 
 
-class IndexerTestDB:
+class TestIndexing:
+    @pytest.fixture(autouse=True)
+    def setup(self, temp_db_conn, project_env, tokenizer_mock,
+              placex_table, postcode_table, osmline_table):
+        self.conn = temp_db_conn
+        temp_db_conn.execute("""
+            CREATE OR REPLACE FUNCTION date_update() RETURNS TRIGGER AS $$
+            BEGIN
+              IF NEW.indexed_status = 0 and OLD.indexed_status != 0 THEN
+                NEW.indexed_date = now();
+              END IF;
+              RETURN NEW;
+            END; $$ LANGUAGE plpgsql;
 
-    def __init__(self, conn):
-        self.placex_id = itertools.count(100000)
-        self.osmline_id = itertools.count(500000)
-        self.postcode_id = itertools.count(700000)
+            DROP TYPE IF EXISTS prepare_update_info CASCADE;
+            CREATE TYPE prepare_update_info AS (
+                         name HSTORE,
+                         address HSTORE,
+                         rank_address SMALLINT,
+                         country_code TEXT,
+                         class TEXT,
+                         type TEXT,
+                         linked_place_id BIGINT
+                       );
+            CREATE OR REPLACE FUNCTION placex_indexing_prepare(p placex,
+                                                 OUT result prepare_update_info) AS $$
+            BEGIN
+              result.address := p.address;
+              result.name := p.name;
+              result.class := p.class;
+              result.type := p.type;
+              result.country_code := p.country_code;
+              result.rank_address := p.rank_address;
+            END; $$ LANGUAGE plpgsql STABLE;
 
-        self.conn = conn
-        self.conn.autocimmit = True
-        with self.conn.cursor() as cur:
-            cur.execute("""CREATE TABLE placex (place_id BIGINT,
-                                                name HSTORE,
-                                                class TEXT,
-                                                type TEXT,
-                                                linked_place_id BIGINT,
-                                                rank_address SMALLINT,
-                                                rank_search SMALLINT,
-                                                indexed_status SMALLINT,
-                                                indexed_date TIMESTAMP,
-                                                partition SMALLINT,
-                                                admin_level SMALLINT,
-                                                country_code TEXT,
-                                                address HSTORE,
-                                                token_info JSONB,
-                                                geometry_sector INTEGER)""")
-            cur.execute("""CREATE TABLE location_property_osmline (
-                               place_id BIGINT,
-                               osm_id BIGINT,
-                               address HSTORE,
-                               token_info JSONB,
-                               indexed_status SMALLINT,
-                               indexed_date TIMESTAMP,
-                               geometry_sector INTEGER)""")
-            cur.execute("""CREATE TABLE location_postcodes (
-                               place_id BIGINT,
-                               indexed_status SMALLINT,
-                               indexed_date TIMESTAMP,
-                               country_code varchar(2),
-                               postcode TEXT)""")
-            cur.execute("""CREATE OR REPLACE FUNCTION date_update() RETURNS TRIGGER
-                           AS $$
-                           BEGIN
-                             IF NEW.indexed_status = 0 and OLD.indexed_status != 0 THEN
-                               NEW.indexed_date = now();
-                             END IF;
-                             RETURN NEW;
-                           END; $$ LANGUAGE plpgsql;""")
-            cur.execute("DROP TYPE IF EXISTS prepare_update_info CASCADE")
-            cur.execute("""CREATE TYPE prepare_update_info AS (
-                             name HSTORE,
-                             address HSTORE,
-                             rank_address SMALLINT,
-                             country_code TEXT,
-                             class TEXT,
-                             type TEXT,
-                             linked_place_id BIGINT
-                           )""")
-            cur.execute("""CREATE OR REPLACE FUNCTION placex_indexing_prepare(p placex,
-                                                     OUT result prepare_update_info)
-                           AS $$
-                           BEGIN
-                             result.address := p.address;
-                             result.name := p.name;
-                             result.class := p.class;
-                             result.type := p.type;
-                             result.country_code := p.country_code;
-                             result.rank_address := p.rank_address;
-                           END;
-                           $$ LANGUAGE plpgsql STABLE;
-                        """)
-            cur.execute("""CREATE OR REPLACE FUNCTION
-                             get_interpolation_address(in_address HSTORE, wayid BIGINT)
-                           RETURNS HSTORE AS $$
-                           BEGIN
-                             RETURN in_address;
-                           END;
-                           $$ LANGUAGE plpgsql STABLE;
-                        """)
+            CREATE OR REPLACE FUNCTION get_interpolation_address(in_address HSTORE, wayid BIGINT)
+            RETURNS HSTORE AS $$ SELECT in_address $$ LANGUAGE sql STABLE;
+        """)
 
-            for table in ('placex', 'location_property_osmline', 'location_postcodes'):
-                cur.execute("""CREATE TRIGGER {0}_update BEFORE UPDATE ON {0}
-                               FOR EACH ROW EXECUTE PROCEDURE date_update()
-                            """.format(table))
+        for table in ('placex', 'location_property_osmline', 'location_postcodes'):
+            temp_db_conn.execute("""CREATE TRIGGER {0}_update BEFORE UPDATE ON {0}
+                                    FOR EACH ROW EXECUTE PROCEDURE date_update()
+                                 """.format(table))
+
+        self.tokenizer = factory.create_tokenizer(project_env)
 
     def scalar(self, query):
         with self.conn.cursor() as cur:
             cur.execute(query)
             return cur.fetchone()[0]
 
-    def add_place(self, cls='place', typ='locality',
-                  rank_search=30, rank_address=30, sector=20):
-        next_id = next(self.placex_id)
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO placex
-                              (place_id, class, type, rank_search, rank_address,
-                               indexed_status, geometry_sector)
-                              VALUES (%s, %s, %s, %s, %s, 1, %s)""",
-                        (next_id, cls, typ, rank_search, rank_address, sector))
-        return next_id
-
-    def add_admin(self, **kwargs):
-        kwargs['cls'] = 'boundary'
-        kwargs['typ'] = 'administrative'
-        return self.add_place(**kwargs)
-
-    def add_osmline(self, sector=20):
-        next_id = next(self.osmline_id)
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO location_property_osmline
-                              (place_id, osm_id, indexed_status, geometry_sector)
-                              VALUES (%s, %s, 1, %s)""",
-                        (next_id, next_id, sector))
-        return next_id
-
-    def add_postcode(self, country, postcode):
-        next_id = next(self.postcode_id)
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO location_postcodes
-                            (place_id, indexed_status, country_code, postcode)
-                            VALUES (%s, 1, %s, %s)""",
-                        (next_id, country, postcode))
-        return next_id
-
     def placex_unindexed(self):
         return self.scalar('SELECT count(*) from placex where indexed_status > 0')
 
@@ -145,148 +72,133 @@ class IndexerTestDB:
         return self.scalar("""SELECT count(*) from location_property_osmline
                               WHERE indexed_status > 0""")
 
+    @pytest.mark.parametrize("threads", [1, 15])
+    @pytest.mark.asyncio
+    async def test_index_all_by_rank(self, dsn, threads, placex_row, osmline_row):
+        for rank in range(31):
+            placex_row(rank_address=rank, rank_search=rank, indexed_status=1)
+        osmline_row()
 
-@pytest.fixture
-def test_db(temp_db_conn):
-    yield IndexerTestDB(temp_db_conn)
+        assert self.placex_unindexed() == 31
+        assert self.osmline_unindexed() == 1
 
+        idx = indexer.Indexer(dsn, self.tokenizer, threads)
+        await idx.index_by_rank(0, 30)
 
-@pytest.fixture
-def test_tokenizer(tokenizer_mock, project_env):
-    return factory.create_tokenizer(project_env)
+        assert self.placex_unindexed() == 0
+        assert self.osmline_unindexed() == 0
 
+        assert self.scalar("""SELECT count(*) from placex
+                                 WHERE indexed_status = 0 and indexed_date is null""") == 0
+        # ranks come in order of rank address
+        assert self.scalar("""
+            SELECT count(*) FROM placex p WHERE rank_address > 0
+              AND indexed_date >= (SELECT min(indexed_date) FROM placex o
+                                   WHERE p.rank_address < o.rank_address)""") == 0
+        # placex address ranked objects come before interpolations
+        assert self.scalar(
+            """SELECT count(*) FROM placex WHERE rank_address > 0
+                 AND indexed_date >
+                       (SELECT min(indexed_date) FROM location_property_osmline)""") == 0
+        # rank 0 comes after all other placex objects
+        assert self.scalar(
+            """SELECT count(*) FROM placex WHERE rank_address > 0
+                 AND indexed_date >
+                       (SELECT min(indexed_date) FROM placex WHERE rank_address = 0)""") == 0
 
-@pytest.mark.parametrize("threads", [1, 15])
-@pytest.mark.asyncio
-async def test_index_all_by_rank(test_db, threads, test_tokenizer):
-    for rank in range(31):
-        test_db.add_place(rank_address=rank, rank_search=rank)
-    test_db.add_osmline()
+    @pytest.mark.parametrize("threads", [1, 15])
+    @pytest.mark.asyncio
+    async def test_index_partial_without_30(self, dsn, threads, placex_row, osmline_row):
+        for rank in range(31):
+            placex_row(rank_address=rank, rank_search=rank, indexed_status=1)
+        osmline_row()
 
-    assert test_db.placex_unindexed() == 31
-    assert test_db.osmline_unindexed() == 1
+        assert self.placex_unindexed() == 31
+        assert self.osmline_unindexed() == 1
 
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest', test_tokenizer, threads)
-    await idx.index_by_rank(0, 30)
+        idx = indexer.Indexer(dsn, self.tokenizer, threads)
+        await idx.index_by_rank(4, 15)
 
-    assert test_db.placex_unindexed() == 0
-    assert test_db.osmline_unindexed() == 0
+        assert self.placex_unindexed() == 19
+        assert self.osmline_unindexed() == 1
 
-    assert test_db.scalar("""SELECT count(*) from placex
-                             WHERE indexed_status = 0 and indexed_date is null""") == 0
-    # ranks come in order of rank address
-    assert test_db.scalar("""
-        SELECT count(*) FROM placex p WHERE rank_address > 0
-          AND indexed_date >= (SELECT min(indexed_date) FROM placex o
-                               WHERE p.rank_address < o.rank_address)""") == 0
-    # placex address ranked objects come before interpolations
-    assert test_db.scalar(
-        """SELECT count(*) FROM placex WHERE rank_address > 0
-             AND indexed_date >
-                   (SELECT min(indexed_date) FROM location_property_osmline)""") == 0
-    # rank 0 comes after all other placex objects
-    assert test_db.scalar(
-        """SELECT count(*) FROM placex WHERE rank_address > 0
-             AND indexed_date >
-                   (SELECT min(indexed_date) FROM placex WHERE rank_address = 0)""") == 0
+        assert self.scalar("""
+                        SELECT count(*) FROM placex
+                          WHERE indexed_status = 0 AND not rank_address between 4 and 15""") == 0
 
+    @pytest.mark.parametrize("threads", [1, 15])
+    @pytest.mark.asyncio
+    async def test_index_partial_with_30(self, dsn, threads, placex_row, osmline_row):
+        for rank in range(31):
+            placex_row(rank_address=rank, rank_search=rank, indexed_status=1)
+        osmline_row()
 
-@pytest.mark.parametrize("threads", [1, 15])
-@pytest.mark.asyncio
-async def test_index_partial_without_30(test_db, threads, test_tokenizer):
-    for rank in range(31):
-        test_db.add_place(rank_address=rank, rank_search=rank)
-    test_db.add_osmline()
+        assert self.placex_unindexed() == 31
+        assert self.osmline_unindexed() == 1
 
-    assert test_db.placex_unindexed() == 31
-    assert test_db.osmline_unindexed() == 1
+        idx = indexer.Indexer(dsn, self.tokenizer, threads)
+        await idx.index_by_rank(28, 30)
 
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest',
-                          test_tokenizer, threads)
-    await idx.index_by_rank(4, 15)
+        assert self.placex_unindexed() == 28
+        assert self.osmline_unindexed() == 0
 
-    assert test_db.placex_unindexed() == 19
-    assert test_db.osmline_unindexed() == 1
+        assert self.scalar("""
+                        SELECT count(*) FROM placex
+                          WHERE indexed_status = 0 AND rank_address between 0 and 27""") == 0
 
-    assert test_db.scalar("""
-                    SELECT count(*) FROM placex
-                      WHERE indexed_status = 0 AND not rank_address between 4 and 15""") == 0
+    @pytest.mark.parametrize("threads", [1, 15])
+    @pytest.mark.asyncio
+    async def test_index_boundaries(self, dsn, threads, placex_row, osmline_row):
+        for rank in range(4, 10):
+            placex_row(cls='boundary', typ='administrative',
+                       rank_address=rank, rank_search=rank, indexed_status=1)
+        for rank in range(31):
+            placex_row(rank_address=rank, rank_search=rank, indexed_status=1)
+        osmline_row()
 
+        assert self.placex_unindexed() == 37
+        assert self.osmline_unindexed() == 1
 
-@pytest.mark.parametrize("threads", [1, 15])
-@pytest.mark.asyncio
-async def test_index_partial_with_30(test_db, threads, test_tokenizer):
-    for rank in range(31):
-        test_db.add_place(rank_address=rank, rank_search=rank)
-    test_db.add_osmline()
+        idx = indexer.Indexer(dsn, self.tokenizer, threads)
+        await idx.index_boundaries()
 
-    assert test_db.placex_unindexed() == 31
-    assert test_db.osmline_unindexed() == 1
+        assert self.placex_unindexed() == 31
+        assert self.osmline_unindexed() == 1
 
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest', test_tokenizer, threads)
-    await idx.index_by_rank(28, 30)
+        assert self.scalar("""
+                        SELECT count(*) FROM placex
+                          WHERE indexed_status = 0 AND class != 'boundary'""") == 0
 
-    assert test_db.placex_unindexed() == 28
-    assert test_db.osmline_unindexed() == 0
+    @pytest.mark.parametrize("threads", [1, 15])
+    @pytest.mark.asyncio
+    async def test_index_postcodes(self, dsn, threads, postcode_row):
+        for postcode in range(1000):
+            postcode_row(country='de', postcode=postcode)
+        for postcode in range(32000, 33000):
+            postcode_row(country='us', postcode=postcode)
 
-    assert test_db.scalar("""
-                    SELECT count(*) FROM placex
-                      WHERE indexed_status = 0 AND rank_address between 0 and 27""") == 0
+        idx = indexer.Indexer(dsn, self.tokenizer, threads)
+        await idx.index_postcodes()
 
+        assert self.scalar("""SELECT count(*) FROM location_postcodes
+                                      WHERE indexed_status != 0""") == 0
 
-@pytest.mark.parametrize("threads", [1, 15])
-@pytest.mark.asyncio
-async def test_index_boundaries(test_db, threads, test_tokenizer):
-    for rank in range(4, 10):
-        test_db.add_admin(rank_address=rank, rank_search=rank)
-    for rank in range(31):
-        test_db.add_place(rank_address=rank, rank_search=rank)
-    test_db.add_osmline()
+    @pytest.mark.parametrize("analyse", [True, False])
+    @pytest.mark.asyncio
+    async def test_index_full(self, dsn, analyse, placex_row, osmline_row, postcode_row):
+        for rank in range(4, 10):
+            placex_row(cls='boundary', typ='administrative',
+                       rank_address=rank, rank_search=rank, indexed_status=1)
+        for rank in range(31):
+            placex_row(rank_address=rank, rank_search=rank, indexed_status=1)
+        osmline_row()
+        for postcode in range(1000):
+            postcode_row(country='de', postcode=postcode)
 
-    assert test_db.placex_unindexed() == 37
-    assert test_db.osmline_unindexed() == 1
+        idx = indexer.Indexer(dsn, self.tokenizer, 4)
+        await idx.index_full(analyse=analyse)
 
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest', test_tokenizer, threads)
-    await idx.index_boundaries()
-
-    assert test_db.placex_unindexed() == 31
-    assert test_db.osmline_unindexed() == 1
-
-    assert test_db.scalar("""
-                    SELECT count(*) FROM placex
-                      WHERE indexed_status = 0 AND class != 'boundary'""") == 0
-
-
-@pytest.mark.parametrize("threads", [1, 15])
-@pytest.mark.asyncio
-async def test_index_postcodes(test_db, threads, test_tokenizer):
-    for postcode in range(1000):
-        test_db.add_postcode('de', postcode)
-    for postcode in range(32000, 33000):
-        test_db.add_postcode('us', postcode)
-
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest', test_tokenizer, threads)
-    await idx.index_postcodes()
-
-    assert test_db.scalar("""SELECT count(*) FROM location_postcodes
-                                  WHERE indexed_status != 0""") == 0
-
-
-@pytest.mark.parametrize("analyse", [True, False])
-@pytest.mark.asyncio
-async def test_index_full(test_db, analyse, test_tokenizer):
-    for rank in range(4, 10):
-        test_db.add_admin(rank_address=rank, rank_search=rank)
-    for rank in range(31):
-        test_db.add_place(rank_address=rank, rank_search=rank)
-    test_db.add_osmline()
-    for postcode in range(1000):
-        test_db.add_postcode('de', postcode)
-
-    idx = indexer.Indexer('dbname=test_nominatim_python_unittest', test_tokenizer, 4)
-    await idx.index_full(analyse=analyse)
-
-    assert test_db.placex_unindexed() == 0
-    assert test_db.osmline_unindexed() == 0
-    assert test_db.scalar("""SELECT count(*) FROM location_postcodes
-                             WHERE indexed_status != 0""") == 0
+        assert self.placex_unindexed() == 0
+        assert self.osmline_unindexed() == 0
+        assert self.scalar("""SELECT count(*) FROM location_postcodes
+                                 WHERE indexed_status != 0""") == 0

test/python/mocks.py

@@ -1,85 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# This file is part of Nominatim. (https://nominatim.org)
-#
-# Copyright (C) 2025 by the Nominatim developer community.
-# For a full list of authors see the git log.
-"""
-Custom mocks for testing.
-"""
-import itertools
-
-from nominatim_db.db import properties
-
-
-class MockPlacexTable:
-    """ A placex table for testing.
-    """
-    def __init__(self, conn):
-        self.idseq = itertools.count(10000)
-        self.conn = conn
-        with conn.cursor() as cur:
-            cur.execute("""CREATE TABLE placex (
-                               place_id BIGINT,
-                               parent_place_id BIGINT,
-                               linked_place_id BIGINT,
-                               importance FLOAT,
-                               indexed_date TIMESTAMP,
-                               geometry_sector INTEGER,
-                               rank_address SMALLINT,
-                               rank_search SMALLINT,
-                               partition SMALLINT,
-                               indexed_status SMALLINT,
-                               osm_id int8,
-                               osm_type char(1),
-                               class text,
-                               type text,
-                               name hstore,
-                               admin_level smallint,
-                               address hstore,
-                               extratags hstore,
-                               token_info jsonb,
-                               geometry Geometry(Geometry,4326),
-                               wikipedia TEXT,
-                               country_code varchar(2),
-                               housenumber TEXT,
-                               postcode TEXT,
-                               centroid GEOMETRY(Geometry, 4326))""")
-            cur.execute("CREATE SEQUENCE IF NOT EXISTS seq_place")
-        conn.commit()
-
-    def add(self, osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None,
-            admin_level=None, address=None, extratags=None, geom='POINT(10 4)',
-            country=None, housenumber=None, rank_search=30, centroid=None):
-        with self.conn.cursor() as cur:
-            cur.execute("""INSERT INTO placex (place_id, osm_type, osm_id, class,
-                                               type, name, admin_level, address,
-                                               housenumber, rank_search,
-                                               extratags, centroid, geometry, country_code)
-                            VALUES(nextval('seq_place'), %s, %s, %s, %s, %s, %s,
-                                   %s, %s, %s, %s, %s, %s, %s)
-                            RETURNING place_id""",
-                        (osm_type, osm_id or next(self.idseq), cls, typ, names,
-                         admin_level, address, housenumber, rank_search,
-                         extratags, centroid, 'SRID=4326;' + geom,
-                         country))
-            place_id = cur.fetchone()[0]
-        self.conn.commit()
-        return place_id
-
-
-class MockPropertyTable:
-    """ A property table for testing.
-    """
-    def __init__(self, conn):
-        self.conn = conn
-
-    def set(self, name, value):
-        """ Set a property in the table to the given value.
-        """
-        properties.set_property(self.conn, name, value)
-
-    def get(self, name):
-        """ Set a property in the table to the given value.
-        """
-        return properties.get_property(self.conn, name)

test/python/tokenizer/sanitizers/test_clean_housenumbers.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for the sanitizer that normalizes housenumbers.
@@ -67,3 +67,25 @@ def test_convert_to_name_unconverted(def_config, number):
 
     assert 'housenumber' not in set(p.kind for p in names)
     assert ('housenumber', number) in set((p.kind, p.name) for p in address)
+
+
+@pytest.mark.parametrize('hnr,itype,out', [
+                            ('1-5', 'all', (1, 2, 3, 4, 5)),
+                            ('1-5', 'odd', (1, 3, 5)),
+                            ('1-5', 'even', (2, 4)),
+                            ('6-9', '1', (6, 7, 8, 9)),
+                            ('6-9', '2', (6, 8)),
+                            ('6-9', '3', (6, 9)),
+                            ('6-9', '5', (6,)),
+                            ('6-9', 'odd', (7, 9)),
+                            ('6-9', 'even', (6, 8)),
+                            ('6-22', 'even', (6, 8, 10, 12, 14, 16, 18, 20, 22))
+                            ])
+def test_convert_interpolations(sanitize, hnr, itype, out):
+    assert set(sanitize(housenumber=hnr, interpolation=itype)) \
+            == {('housenumber', str(i)) for i in out}
+
+
+@pytest.mark.parametrize('hnr', ('23', '23-', '3z-f', '1-10', '5-1', '1-4-5'))
+def test_ignore_interpolation_with_bad_housenumber(sanitize, hnr):
+    assert sanitize(housenumber=hnr, interpolation='all') == [('housenumber', hnr)]

test/python/tokenizer/test_icu.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for ICU tokenizer.
@@ -15,7 +15,6 @@ import pytest
 from nominatim_db.tokenizer import icu_tokenizer
 import nominatim_db.tokenizer.icu_rule_loader
 from nominatim_db.db import properties
-from nominatim_db.db.sql_preprocessor import SQLPreprocessor
 from nominatim_db.data.place_info import PlaceInfo
 
 from mock_icu_word_table import MockIcuWordTable
@@ -90,13 +89,9 @@ def analyzer(tokenizer_factory, test_config, monkeypatch,
 
 
 @pytest.fixture
-def sql_functions(temp_db_conn, def_config, src_dir):
-    orig_sql = def_config.lib_dir.sql
-    def_config.lib_dir.sql = src_dir / 'lib-sql'
-    sqlproc = SQLPreprocessor(temp_db_conn, def_config)
-    sqlproc.run_sql_file(temp_db_conn, 'functions/utils.sql')
-    sqlproc.run_sql_file(temp_db_conn, 'tokenizer/icu_tokenizer.sql')
-    def_config.lib_dir.sql = orig_sql
+def sql_functions(load_sql):
+    load_sql('functions/utils.sql')
+    load_sql('tokenizer/icu_tokenizer.sql')
 
 
 @pytest.fixture
@@ -653,22 +648,21 @@ class TestUpdateWordTokens:
         self.tok.update_word_tokens()
         assert word_table.count_housenumbers() == 1
 
-    def test_keep_housenumbers_from_placex_table(self, add_housenumber, word_table,
-                                                 placex_table):
+    def test_keep_housenumbers_from_placex_table(self, add_housenumber, word_table, placex_row):
         add_housenumber(9999, '5432a')
         add_housenumber(9990, '34z')
-        placex_table.add(housenumber='34z')
-        placex_table.add(housenumber='25432a')
+        placex_row(housenumber='34z')
+        placex_row(housenumber='25432a')
 
         assert word_table.count_housenumbers() == 2
         self.tok.update_word_tokens()
         assert word_table.count_housenumbers() == 1
 
     def test_keep_housenumbers_from_placex_table_hnr_list(self, add_housenumber,
-                                                          word_table, placex_table):
+                                                          word_table, placex_row):
         add_housenumber(9991, '9 b')
         add_housenumber(9990, '34z')
-        placex_table.add(housenumber='9 a;9 b;9 c')
+        placex_row(housenumber='9 a;9 b;9 c')
 
         assert word_table.count_housenumbers() == 2
         self.tok.update_word_tokens()

test/python/tools/test_admin.py

@@ -2,17 +2,17 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for maintenance and analysis functions.
 """
 import pytest
+import datetime as dt
 
 from nominatim_db.errors import UsageError
 from nominatim_db.tools import admin
 from nominatim_db.tokenizer import factory
-from nominatim_db.db.sql_preprocessor import SQLPreprocessor
 
 
 @pytest.fixture(autouse=True)
@@ -61,15 +61,14 @@ def test_analyse_indexing_unknown_osmid(project_env):
         admin.analyse_indexing(project_env, osm_id='W12345674')
 
 
-def test_analyse_indexing_with_place_id(project_env, temp_db_cursor):
-    temp_db_cursor.execute("INSERT INTO placex (place_id) VALUES(12345)")
+def test_analyse_indexing_with_place_id(project_env, placex_row):
+    place_id = placex_row()
 
-    admin.analyse_indexing(project_env, place_id=12345)
+    admin.analyse_indexing(project_env, place_id=place_id)
 
 
-def test_analyse_indexing_with_osm_id(project_env, temp_db_cursor):
-    temp_db_cursor.execute("""INSERT INTO placex (place_id, osm_type, osm_id)
-                              VALUES(9988, 'N', 10000)""")
+def test_analyse_indexing_with_osm_id(project_env, placex_row):
+    placex_row(osm_type='N', osm_id=10000)
 
     admin.analyse_indexing(project_env, osm_id='N10000')
 
@@ -77,8 +76,8 @@ def test_analyse_indexing_with_osm_id(project_env, temp_db_cursor):
 class TestAdminCleanDeleted:
 
     @pytest.fixture(autouse=True)
-    def setup_polygon_delete(self, project_env, table_factory, place_table,
-                             osmline_table, temp_db_cursor, temp_db_conn, def_config, src_dir):
+    def setup_polygon_delete(self, project_env, table_factory, place_interpolation_table,
+                             placex_row, osmline_table, temp_db_cursor, load_sql):
         """ Set up place_force_delete function and related tables
         """
         self.project_env = project_env
@@ -91,12 +90,15 @@ class TestAdminCleanDeleted:
                       ((100, 'N', 'boundary', 'administrative'),
                        (145, 'N', 'boundary', 'administrative'),
                        (175, 'R', 'landcover', 'grass')))
-        temp_db_cursor.execute("""
-            INSERT INTO placex (place_id, osm_id, osm_type, class, type,
-                                indexed_date, indexed_status)
-            VALUES(1, 100, 'N', 'boundary', 'administrative', current_date - INTERVAL '1 month', 1),
-                  (2, 145, 'N', 'boundary', 'administrative', current_date - INTERVAL '3 month', 1),
-                  (3, 175, 'R', 'landcover', 'grass', current_date - INTERVAL '3 months', 1)""")
+
+        now = dt.datetime.now()
+        placex_row(osm_type='N', osm_id=100, cls='boundary', typ='administrative',
+                   indexed_status=1, indexed_date=now - dt.timedelta(days=30))
+        placex_row(osm_type='N', osm_id=145, cls='boundary', typ='administrative',
+                   indexed_status=1, indexed_date=now - dt.timedelta(days=90))
+        placex_row(osm_type='R', osm_id=175, cls='landcover', typ='grass',
+                   indexed_status=1, indexed_date=now - dt.timedelta(days=90))
+
         # set up tables and triggers for utils function
         table_factory('place_to_be_deleted',
                       """osm_id BIGINT,
@@ -104,22 +106,25 @@ class TestAdminCleanDeleted:
                       class TEXT NOT NULL,
                       type TEXT NOT NULL,
                       deferred BOOLEAN""")
-        table_factory('country_name', 'partition INT')
+        table_factory('place_interpolation_to_be_deleted',
+                      """osm_id BIGINT,
+                      osm_type CHAR(1)""")
         table_factory('import_polygon_error', """osm_id BIGINT,
                       osm_type CHAR(1),
                       class TEXT NOT NULL,
                       type TEXT NOT NULL""")
-        temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_delete()
-                               RETURNS TRIGGER AS $$
-                               BEGIN RETURN NULL; END;
-                               $$ LANGUAGE plpgsql;""")
-        temp_db_cursor.execute("""CREATE TRIGGER place_before_delete BEFORE DELETE ON place
-                               FOR EACH ROW EXECUTE PROCEDURE place_delete();""")
-        orig_sql = def_config.lib_dir.sql
-        def_config.lib_dir.sql = src_dir / 'lib-sql'
-        sqlproc = SQLPreprocessor(temp_db_conn, def_config)
-        sqlproc.run_sql_file(temp_db_conn, 'functions/utils.sql')
-        def_config.lib_dir.sql = orig_sql
+        temp_db_cursor.execute("""
+            CREATE OR REPLACE FUNCTION place_delete() RETURNS TRIGGER AS $$
+                BEGIN RETURN NULL; END;
+            $$ LANGUAGE plpgsql;
+
+            CREATE TRIGGER place_before_delete BEFORE DELETE ON place
+            FOR EACH ROW EXECUTE PROCEDURE place_delete();
+
+            CREATE TRIGGER place_interpolation_before_delete BEFORE DELETE ON place_interpolation
+            FOR EACH ROW EXECUTE PROCEDURE place_delete();
+        """)
+        load_sql('functions/utils.sql')
 
     def test_admin_clean_deleted_no_records(self):
         admin.clean_deleted_relations(self.project_env, age='1 year')

test/python/tools/test_check_database.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for database integrity checks.
@@ -46,8 +46,7 @@ def test_check_database_version_bad(property_table, temp_db_conn, def_config):
     assert chkdb.check_database_version(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 
-def test_check_placex_table_good(table_factory, temp_db_conn, def_config):
-    table_factory('placex')
+def test_check_placex_table_good(placex_table, temp_db_conn, def_config):
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
@@ -55,13 +54,13 @@ def test_check_placex_table_bad(temp_db_conn, def_config):
     assert chkdb.check_placex_table(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 
-def test_check_placex_table_size_good(table_factory, temp_db_conn, def_config):
-    table_factory('placex', content=((1, ), (2, )))
+def test_check_placex_table_size_good(placex_row, temp_db_conn, def_config):
+    for _ in range(2):
+        placex_row()
     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
-def test_check_placex_table_size_bad(table_factory, temp_db_conn, def_config):
-    table_factory('placex')
+def test_check_placex_table_size_bad(placex_table, temp_db_conn, def_config):
     assert chkdb.check_placex_size(temp_db_conn, def_config) == chkdb.CheckState.FATAL
 
 
@@ -84,15 +83,22 @@ def test_check_tokenizer(temp_db_conn, def_config, monkeypatch,
     assert chkdb.check_tokenizer(temp_db_conn, def_config) == state
 
 
-def test_check_indexing_good(table_factory, temp_db_conn, def_config):
-    table_factory('placex', 'place_id int, indexed_status smallint',
-                  content=((1, 0), (2, 0)))
+def test_check_indexing_good(placex_row, temp_db_conn, def_config):
+    for _ in range(2):
+        placex_row(indexed_status=0)
     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.OK
 
 
-def test_check_indexing_bad(table_factory, temp_db_conn, def_config):
-    table_factory('placex', 'place_id int, indexed_status smallint',
-                  content=((1, 0), (2, 2)))
+def test_check_indexing_bad(placex_row, temp_db_conn, def_config):
+    for status in (0, 2):
+        placex_row(indexed_status=status)
+    assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.FAIL
+
+
+def test_check_indexing_bad_frozen(placex_row, temp_db_conn, def_config):
+    for status in (0, 2):
+        placex_row(indexed_status=status)
+    temp_db_conn.execute('DROP TABLE place')
     assert chkdb.check_indexing(temp_db_conn, def_config) == chkdb.CheckState.WARN
 
 

test/python/tools/test_database_import.py

@@ -78,8 +78,8 @@ def test_setup_skeleton_already_exists(temp_db):
         database_import.setup_database_skeleton(f'dbname={temp_db}')
 
 
-def test_import_osm_data_simple(table_factory, osm2pgsql_options, capfd):
-    table_factory('place', content=((1, ), ))
+def test_import_osm_data_simple(place_row, osm2pgsql_options, capfd):
+    place_row()
 
     database_import.import_osm_data(Path('file.pbf'), osm2pgsql_options)
     captured = capfd.readouterr()
@@ -92,8 +92,8 @@ def test_import_osm_data_simple(table_factory, osm2pgsql_options, capfd):
     assert 'file.pbf' in captured.out
 
 
-def test_import_osm_data_multifile(table_factory, tmp_path, osm2pgsql_options, capfd):
-    table_factory('place', content=((1, ), ))
+def test_import_osm_data_multifile(place_row, tmp_path, osm2pgsql_options, capfd):
+    place_row()
     osm2pgsql_options['osm2pgsql_cache'] = 0
 
     files = [tmp_path / 'file1.osm', tmp_path / 'file2.osm']
@@ -107,22 +107,19 @@ def test_import_osm_data_multifile(table_factory, tmp_path, osm2pgsql_options, c
     assert 'file2.osm' in captured.out
 
 
-def test_import_osm_data_simple_no_data(table_factory, osm2pgsql_options):
-    table_factory('place')
-
+def test_import_osm_data_simple_no_data(place_row, osm2pgsql_options):
     with pytest.raises(UsageError, match='No data imported'):
         database_import.import_osm_data(Path('file.pbf'), osm2pgsql_options)
 
 
-def test_import_osm_data_simple_ignore_no_data(table_factory, osm2pgsql_options):
-    table_factory('place')
-
+def test_import_osm_data_simple_ignore_no_data(place_table, osm2pgsql_options):
     database_import.import_osm_data(Path('file.pbf'), osm2pgsql_options,
                                     ignore_errors=True)
 
 
-def test_import_osm_data_drop(table_factory, temp_db_cursor, tmp_path, osm2pgsql_options):
-    table_factory('place', content=((1, ), ))
+def test_import_osm_data_drop(place_row, table_factory, temp_db_cursor,
+                              tmp_path, osm2pgsql_options):
+    place_row()
     table_factory('planet_osm_nodes')
 
     flatfile = tmp_path / 'flatfile'
@@ -136,8 +133,8 @@ def test_import_osm_data_drop(table_factory, temp_db_cursor, tmp_path, osm2pgsql
     assert not temp_db_cursor.table_exists('planet_osm_nodes')
 
 
-def test_import_osm_data_default_cache(table_factory, osm2pgsql_options, capfd):
-    table_factory('place', content=((1, ), ))
+def test_import_osm_data_default_cache(place_row, osm2pgsql_options, capfd):
+    place_row()
 
     osm2pgsql_options['osm2pgsql_cache'] = 0
 
@@ -168,16 +165,43 @@ def test_truncate_database_tables(temp_db_conn, temp_db_cursor, table_factory, w
 
 @pytest.mark.parametrize("threads", (1, 5))
 @pytest.mark.asyncio
-async def test_load_data(dsn, place_row, placex_table, osmline_table,
+async def test_load_data(dsn, place_row, place_interpolation_row, placex_table, osmline_table,
                          temp_db_cursor, threads):
-    for func in ('precompute_words', 'getorcreate_housenumber_id', 'make_standard_name'):
-        temp_db_cursor.execute(pysql.SQL("""CREATE FUNCTION {} (src TEXT)
-                                            RETURNS TEXT AS $$ SELECT 'a'::TEXT $$ LANGUAGE SQL
-                                         """).format(pysql.Identifier(func)))
     for oid in range(100, 130):
         place_row(osm_id=oid)
-    place_row(osm_type='W', osm_id=342, cls='place', typ='houses',
-              geom='SRID=4326;LINESTRING(0 0, 10 10)')
+    place_interpolation_row(osm_id=342, typ='odd', geom='LINESTRING(0 0, 10 10)')
+
+    temp_db_cursor.execute("""
+        CREATE OR REPLACE FUNCTION placex_insert() RETURNS TRIGGER AS $$
+        BEGIN
+          NEW.place_id := nextval('seq_place');
+          NEW.indexed_status := 1;
+          NEW.importance := 0.00001;
+          NEW.centroid := ST_Centroid(NEW.geometry);
+          NEW.partition := 0;
+          NEW.geometry_sector := 2424;
+          NEW.rank_address := 30;
+          NEW.rank_search := 30;
+        RETURN NEW;
+        END; $$ LANGUAGE plpgsql STABLE PARALLEL SAFE;
+
+        CREATE OR REPLACE FUNCTION osmline_insert() RETURNS TRIGGER AS $$
+        BEGIN
+          NEW.place_id := nextval('seq_place');
+          IF NEW.indexed_status IS NULL THEN
+            NEW.indexed_status := 1;
+            NEW.partition := 0;
+            NEW.geometry_sector := 2424;
+          END IF;
+        RETURN NEW;
+        END; $$ LANGUAGE plpgsql STABLE PARALLEL SAFE;
+
+        CREATE TRIGGER placex_before_insert BEFORE INSERT ON placex
+        FOR EACH ROW EXECUTE PROCEDURE placex_insert();
+
+        CREATE TRIGGER osmline_before_insert BEFORE INSERT ON location_property_osmline
+        FOR EACH ROW EXECUTE PROCEDURE osmline_insert();
+    """)
 
     await database_import.load_data(dsn, threads)
 
@@ -188,52 +212,53 @@ async def test_load_data(dsn, place_row, placex_table, osmline_table,
 class TestSetupSQL:
 
     @pytest.fixture(autouse=True)
-    def init_env(self, temp_db, tmp_path, def_config, sql_preprocessor_cfg):
-        def_config.lib_dir.sql = tmp_path / 'sql'
-        def_config.lib_dir.sql.mkdir()
-
+    def osm2ppsql_skel(self, def_config, temp_db_with_extensions, place_row,
+                       country_table, table_factory, temp_db_conn):
         self.config = def_config
+        place_row()
+        table_factory('osm2pgsql_properties', 'property TEXT, value TEXT',
+                      (('db_format', 2),))
 
-    def write_sql(self, fname, content):
-        (self.config.lib_dir.sql / fname).write_text(content, encoding='utf-8')
+        table_factory('planet_osm_rels', 'id BIGINT, members JSONB, tags JSONB')
+        temp_db_conn.execute("""
+            CREATE OR REPLACE FUNCTION planet_osm_member_ids(jsonb, character)
+              RETURNS bigint[] AS $$
+                SELECT array_agg((el->>'ref')::int8)
+                FROM jsonb_array_elements($1) AS el WHERE el->>'type' = $2
+              $$ LANGUAGE sql IMMUTABLE;
+            """)
 
     @pytest.mark.parametrize("reverse", [True, False])
-    def test_create_tables(self, temp_db_conn, temp_db_cursor, reverse):
-        self.write_sql('tables.sql',
-                       """CREATE FUNCTION test() RETURNS bool
-                          AS $$ SELECT {{db.reverse_only}} $$ LANGUAGE SQL""")
-
-        self.write_sql('grants.sql', "-- Mock grants file for testing\n")
+    def test_create_tables(self, table_factory, temp_db_conn, temp_db_cursor, reverse):
+        table_factory('country_osm_grid')
 
         database_import.create_tables(temp_db_conn, self.config, reverse)
 
-        temp_db_cursor.scalar('SELECT test()') == reverse
+        assert temp_db_cursor.table_exists('placex')
+        assert not reverse == temp_db_cursor.table_exists('search_name')
 
-    def test_create_table_triggers(self, temp_db_conn, temp_db_cursor):
-        self.write_sql('table-triggers.sql',
-                       """CREATE FUNCTION test() RETURNS TEXT
-                          AS $$ SELECT 'a'::text $$ LANGUAGE SQL""")
+    def test_create_table_triggers(self, temp_db_conn, placex_table, osmline_table,
+                                   place_interpolation_table, postcode_table, load_sql):
+        load_sql('functions.sql')
 
         database_import.create_table_triggers(temp_db_conn, self.config)
 
-        temp_db_cursor.scalar('SELECT test()') == 'a'
-
-    def test_create_partition_tables(self, temp_db_conn, temp_db_cursor):
-        self.write_sql('partition-tables.src.sql',
-                       """CREATE FUNCTION test() RETURNS TEXT
-                          AS $$ SELECT 'b'::text $$ LANGUAGE SQL""")
+    def test_create_partition_tables(self, country_row, temp_db_conn, temp_db_cursor, load_sql):
+        for i in range(3):
+            country_row(partition=i)
+        load_sql('tables/location_area.sql')
 
         database_import.create_partition_tables(temp_db_conn, self.config)
 
-        temp_db_cursor.scalar('SELECT test()') == 'b'
+        for i in range(3):
+            assert temp_db_cursor.table_exists(f"location_area_large_{i}")
+            assert temp_db_cursor.table_exists(f"search_name_{i}")
 
     @pytest.mark.parametrize("drop", [True, False])
     @pytest.mark.asyncio
-    async def test_create_search_indices(self, temp_db_conn, temp_db_cursor, drop):
-        self.write_sql('indices.sql',
-                       """CREATE FUNCTION test() RETURNS bool
-                          AS $$ SELECT {{drop}} $$ LANGUAGE SQL""")
-
+    async def test_create_search_indices(self, temp_db_conn, temp_db_cursor, drop, load_sql):
+        load_sql('tables.sql', 'functions/ranking.sql')
         await database_import.create_search_indices(temp_db_conn, self.config, drop)
 
-        temp_db_cursor.scalar('SELECT test()') == drop
+        assert temp_db_cursor.index_exists('placex', 'idx_placex_geometry')
+        assert not drop == temp_db_cursor.index_exists('placex', 'idx_placex_geometry_buildings')

test/python/tools/test_import_special_phrases.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
     Tests for import special phrases methods
@@ -125,9 +125,8 @@ def test_grant_access_to_web_user(temp_db_conn, temp_db_cursor, table_factory,
                               phrase_class, phrase_type)
 
 
-def test_create_place_classtype_table_and_indexes(
-        temp_db_cursor, def_config, placex_table,
-        sp_importer, temp_db_conn, monkeypatch):
+def test_create_place_classtype_table_and_indexes(temp_db_cursor, def_config, placex_row,
+                                                  sp_importer, temp_db_conn, monkeypatch):
     """
         Test that _create_place_classtype_table_and_indexes()
         create the right place_classtype tables and place_id indexes
@@ -136,7 +135,7 @@ def test_create_place_classtype_table_and_indexes(
     """
     pairs = set([('class1', 'type1'), ('class2', 'type2')])
     for pair in pairs:
-        placex_table.add(cls=pair[0], typ=pair[1])   # adding to db
+        placex_row(cls=pair[0], typ=pair[1])   # adding to db
     sp_importer._create_classtype_table_and_indexes(pairs)
     temp_db_conn.commit()
 
@@ -178,7 +177,7 @@ def test_remove_non_existent_tables_from_db(sp_importer, default_phrases,
 
 @pytest.mark.parametrize("should_replace", [(True), (False)])
 def test_import_phrases(monkeypatch, temp_db_cursor, def_config, sp_importer,
-                        placex_table, table_factory, tokenizer_mock,
+                        placex_row, table_factory, tokenizer_mock,
                         xml_wiki_content, should_replace):
     """
         Check that the main import_phrases() method is well executed.
@@ -199,8 +198,8 @@ def test_import_phrases(monkeypatch, temp_db_cursor, def_config, sp_importer,
     type_test = 'zip_line'
 
     tokenizer = tokenizer_mock()
-    placex_table.add(cls=class_test, typ=type_test)  # in db for special phrase filtering
-    placex_table.add(cls='amenity', typ='animal_shelter')  # in db for special phrase filtering
+    placex_row(cls=class_test, typ=type_test)  # in db for special phrase filtering
+    placex_row(cls='amenity', typ='animal_shelter')  # in db for special phrase filtering
     sp_importer.import_phrases(tokenizer, should_replace)
 
     assert len(tokenizer.analyser_cache['special_phrases']) == 19
@@ -257,7 +256,7 @@ def check_placeid_and_centroid_indexes(temp_db_cursor, phrase_class, phrase_type
 
 @pytest.mark.parametrize("should_replace", [(True), (False)])
 def test_import_phrases_special_phrase_filtering(monkeypatch, temp_db_cursor, def_config,
-                                                 sp_importer, placex_table, tokenizer_mock,
+                                                 sp_importer, placex_row, tokenizer_mock,
                                                  xml_wiki_content, should_replace):
 
     monkeypatch.setattr('nominatim_db.tools.special_phrases.sp_wiki_loader._get_wiki_content',
@@ -266,7 +265,7 @@ def test_import_phrases_special_phrase_filtering(monkeypatch, temp_db_cursor, de
     class_test = 'aerialway'
     type_test = 'zip_line'
 
-    placex_table.add(cls=class_test, typ=type_test)  # add to the database to make valid
+    placex_row(cls=class_test, typ=type_test)  # add to the database to make valid
     tokenizer = tokenizer_mock()
     sp_importer.import_phrases(tokenizer, should_replace)
 
@@ -276,11 +275,11 @@ def test_import_phrases_special_phrase_filtering(monkeypatch, temp_db_cursor, de
     assert check_grant_access(temp_db_cursor, def_config.DATABASE_WEBUSER, class_test, type_test)
 
 
-def test_get_classtype_pairs_directly(placex_table, temp_db_conn, sp_importer):
+def test_get_classtype_pairs_directly(placex_row, temp_db_conn, sp_importer):
     for _ in range(101):
-        placex_table.add(cls='highway', typ='residential')
+        placex_row(cls='highway', typ='residential')
     for _ in range(99):
-        placex_table.add(cls='amenity', typ='toilet')
+        placex_row(cls='amenity', typ='toilet')
 
     temp_db_conn.commit()
 

test/python/tools/test_postcodes.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for functions to maintain the artificial postcode table.
@@ -11,88 +11,27 @@ import subprocess
 
 import pytest
 
+from psycopg.rows import tuple_row
+
 from nominatim_db.tools import postcodes
 from nominatim_db.data import country_info
-from nominatim_db.db.sql_preprocessor import SQLPreprocessor
 
 import dummy_tokenizer
 
 
-class MockPostcodeTable:
-    """ A location_postcodes table for testing.
-    """
-    def __init__(self, conn, config):
-        self.conn = conn
-        SQLPreprocessor(conn, config).run_sql_file(conn, 'functions/postcode_triggers.sql')
-        with conn.cursor() as cur:
-            cur.execute("""CREATE TABLE location_postcodes (
-                               place_id BIGINT,
-                               osm_id BIGINT,
-                               parent_place_id BIGINT,
-                               rank_search SMALLINT,
-                               indexed_status SMALLINT,
-                               indexed_date TIMESTAMP,
-                               country_code varchar(2),
-                               postcode TEXT,
-                               geometry GEOMETRY(Geometry, 4326),
-                               centroid GEOMETRY(Point, 4326))""")
-            cur.execute("""CREATE OR REPLACE FUNCTION token_normalized_postcode(postcode TEXT)
-                           RETURNS TEXT AS $$ BEGIN RETURN postcode; END; $$ LANGUAGE plpgsql;
-
-                           CREATE OR REPLACE FUNCTION get_country_code(place geometry)
-                           RETURNS TEXT AS $$ BEGIN
-                           RETURN null;
-                           END; $$ LANGUAGE plpgsql;
-                        """)
-            cur.execute("""CREATE OR REPLACE FUNCTION expand_by_meters(geom GEOMETRY, meters FLOAT)
-                           RETURNS GEOMETRY AS $$
-                           SELECT ST_Envelope(ST_Buffer(geom::geography, meters, 1)::geometry)
-                           $$ LANGUAGE sql;""")
-
-        conn.commit()
-
-    def add(self, country, postcode, x, y):
-        with self.conn.cursor() as cur:
-            cur.execute(
-                """INSERT INTO location_postcodes
-                       (place_id, indexed_status, country_code, postcode, centroid, geometry)
-                     VALUES (nextval('seq_place'), 1, %(cc)s, %(pc)s,
-                             ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326),
-                             ST_Expand(ST_SetSRID(ST_MakePoint(%(x)s, %(y)s), 4326), 0.005))""",
-                {'cc': country, 'pc': postcode, 'x': x, 'y': y})
-
-        self.conn.commit()
-
-    @property
-    def row_set(self):
-        with self.conn.cursor() as cur:
-            cur.execute("""SELECT osm_id, country_code, postcode,
-                                  ST_X(centroid), ST_Y(centroid)
-                           FROM location_postcodes""")
-            return set((tuple(row) for row in cur))
-
-
 @pytest.fixture
-def postcode_table(def_config, temp_db_conn, placex_table, table_factory):
-    country_info.setup_country_config(def_config)
-    table_factory('country_name', 'partition INT', ((0, ), (1, ), (2, )))
-    return MockPostcodeTable(temp_db_conn, def_config)
-
-
-@pytest.fixture
-def insert_implicit_postcode(placex_table, place_postcode_row):
+def insert_implicit_postcode(placex_row, place_postcode_row):
     """ Insert data into the placex and place table
         which can then be used to compute one postcode.
     """
     def _insert_implicit_postcode(osm_id, country, geometry, postcode, in_placex=False):
         if in_placex:
-            placex_table.add(osm_id=osm_id, country=country, geom=geometry,
-                             centroid=f'SRID=4326;{geometry}',
-                             address={'postcode': postcode})
+            placex_row(osm_id=osm_id, country=country, geom=geometry,
+                       centroid=geometry,
+                       address={'postcode': postcode})
         else:
             place_postcode_row(osm_id=osm_id, centroid=geometry,
                                country=country, postcode=postcode)
-
     return _insert_implicit_postcode
 
 
@@ -105,7 +44,6 @@ def insert_postcode_area(place_postcode_row):
         place_postcode_row(osm_type='R', osm_id=osm_id, postcode=postcode, country=country,
                            centroid=f"POINT({x} {y})",
                            geom=f"POLYGON(({x1} {y1}, {x1} {y2}, {x2} {y2}, {x2} {y1}, {x1} {y1}))")
-
     return _do
 
 
@@ -125,186 +63,198 @@ def postcode_update(dsn, temp_db_conn):
                             BEFORE INSERT ON location_postcodes
                             FOR EACH ROW EXECUTE PROCEDURE postcodes_insert()""")
         temp_db_conn.commit()
-
         postcodes.update_postcodes(dsn, data_path, tokenizer)
-
     return _do
 
 
-def test_postcodes_empty(postcode_update, postcode_table, place_postcode_table):
-    postcode_update()
+class TestPostcodes:
+    @pytest.fixture(autouse=True)
+    def setup(self, def_config, postcode_table, placex_table, place_postcode_table,
+              load_sql, temp_db_conn):
+        self.conn = temp_db_conn
+        country_info.setup_country_config(def_config)
+        load_sql('functions/postcode_triggers.sql')
 
-    assert not postcode_table.row_set
+        temp_db_conn.execute("""
+            CREATE OR REPLACE FUNCTION token_normalized_postcode(postcode TEXT)
+            RETURNS TEXT AS $$
+              SELECT postcode
+            $$ LANGUAGE sql;
 
+            CREATE OR REPLACE FUNCTION get_country_code(place geometry)
+            RETURNS TEXT AS $$
+              SELECT NULL
+            $$ LANGUAGE sql;
 
-@pytest.mark.parametrize('in_placex', [True, False])
-def test_postcodes_add_new_point(postcode_update, postcode_table,
-                                 insert_implicit_postcode, in_placex):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', '9486', in_placex)
-    postcode_table.add('yy', '9486', 99, 34)
+            CREATE OR REPLACE FUNCTION expand_by_meters(geom GEOMETRY, meters FLOAT)
+            RETURNS GEOMETRY AS $$
+              SELECT ST_Envelope(ST_Buffer(geom::geography, meters, 1)::geometry)
+            $$ LANGUAGE sql;
+        """)
 
-    postcode_update()
+    @property
+    def row_set(self):
+        with self.conn.cursor(row_factory=tuple_row) as cur:
+            cur.execute("""SELECT osm_id, country_code, postcode,
+                                  ST_X(centroid), ST_Y(centroid)
+                           FROM location_postcodes""")
+            return {r for r in cur}
 
-    assert postcode_table.row_set == {(None, 'xx', '9486', 10, 12), }
+    def test_postcodes_empty(self, postcode_update):
+        postcode_update()
 
+        assert not self.row_set
 
-def test_postcodes_add_new_area(postcode_update, insert_postcode_area, postcode_table):
-    insert_postcode_area(345, 'de', '10445', 23.5, 46.2)
+    @pytest.mark.parametrize('in_placex', [True, False])
+    def test_postcodes_add_new_point(self, postcode_update, postcode_row,
+                                     insert_implicit_postcode, in_placex):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', '9486', in_placex)
+        postcode_row('yy', '9486', 99, 34)
 
-    postcode_update()
+        postcode_update()
 
-    assert postcode_table.row_set == {(345, 'de', '10445', 23.5, 46.2)}
+        assert self.row_set == {(None, 'xx', '9486', 10, 12), }
 
+    def test_postcodes_add_new_area(self, postcode_update, insert_postcode_area):
+        insert_postcode_area(345, 'de', '10445', 23.5, 46.2)
 
-@pytest.mark.parametrize('in_placex', [True, False])
-def test_postcodes_add_area_and_point(postcode_update, insert_postcode_area,
-                                      insert_implicit_postcode, postcode_table, in_placex):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', '10445', in_placex)
-    insert_postcode_area(345, 'xx', '10445', 23.5, 46.2)
+        postcode_update()
 
-    postcode_update()
+        assert self.row_set == {(345, 'de', '10445', 23.5, 46.2)}
 
-    assert postcode_table.row_set == {(345, 'xx', '10445', 23.5, 46.2)}
+    @pytest.mark.parametrize('in_placex', [True, False])
+    def test_postcodes_add_area_and_point(self, postcode_update, insert_postcode_area,
+                                          insert_implicit_postcode, in_placex):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', '10445', in_placex)
+        insert_postcode_area(345, 'xx', '10445', 23.5, 46.2)
 
+        postcode_update()
 
-@pytest.mark.parametrize('in_placex', [True, False])
-def test_postcodes_add_point_within_area(postcode_update, insert_postcode_area,
-                                         insert_implicit_postcode, postcode_table, in_placex):
-    insert_implicit_postcode(1, 'xx', 'POINT(23.5 46.2)', '10446', in_placex)
-    insert_postcode_area(345, 'xx', '10445', 23.5, 46.2)
+        assert self.row_set == {(345, 'xx', '10445', 23.5, 46.2)}
 
-    postcode_update()
+    @pytest.mark.parametrize('in_placex', [True, False])
+    def test_postcodes_add_point_within_area(self, postcode_update, insert_postcode_area,
+                                             insert_implicit_postcode, in_placex):
+        insert_implicit_postcode(1, 'xx', 'POINT(23.5 46.2)', '10446', in_placex)
+        insert_postcode_area(345, 'xx', '10445', 23.5, 46.2)
 
-    assert postcode_table.row_set == {(345, 'xx', '10445', 23.5, 46.2)}
+        postcode_update()
 
+        assert self.row_set == {(345, 'xx', '10445', 23.5, 46.2)}
 
-@pytest.mark.parametrize('coords', [(99, 34), (10, 34), (99, 12),
-                                    (9, 34), (9, 11), (23, 11)])
-def test_postcodes_replace_coordinates(postcode_update, postcode_table, tmp_path,
-                                       insert_implicit_postcode, coords):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
-    postcode_table.add('xx', 'AB 4511', *coords)
+    @pytest.mark.parametrize('coords', [(99, 34), (10, 34), (99, 12),
+                                        (9, 34), (9, 11), (23, 11)])
+    def test_postcodes_replace_coordinates(self, postcode_update, postcode_row, tmp_path,
+                                           insert_implicit_postcode, coords):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+        postcode_row('xx', 'AB 4511', *coords)
 
-    postcode_update(tmp_path)
+        postcode_update(tmp_path)
 
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
 
+    def test_postcodes_replace_coordinates_close(self, postcode_update, postcode_row,
+                                                 insert_implicit_postcode):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+        postcode_row('xx', 'AB 4511', 10, 11.99999999)
 
-def test_postcodes_replace_coordinates_close(postcode_update, postcode_table,
-                                             insert_implicit_postcode):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
-    postcode_table.add('xx', 'AB 4511', 10, 11.99999999)
+        postcode_update()
 
-    postcode_update()
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 11.99999999)}
 
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 11.99999999)}
+    def test_postcodes_remove_point(self, postcode_update, postcode_row,
+                                    insert_implicit_postcode):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+        postcode_row('xx', 'badname', 10, 12)
 
+        postcode_update()
 
-def test_postcodes_remove_point(postcode_update, postcode_table,
-                                insert_implicit_postcode):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
-    postcode_table.add('xx', 'badname', 10, 12)
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
 
-    postcode_update()
+    def test_postcodes_ignore_empty_country(self, postcode_update, insert_implicit_postcode):
+        insert_implicit_postcode(1, None, 'POINT(10 12)', 'AB 4511')
+        postcode_update()
+        assert not self.row_set
 
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
+    def test_postcodes_remove_all(self, postcode_update, postcode_row, place_postcode_table):
+        postcode_row('ch', '5613', 10, 12)
+        postcode_update()
 
+        assert not self.row_set
 
-def test_postcodes_ignore_empty_country(postcode_update, postcode_table,
-                                        insert_implicit_postcode):
-    insert_implicit_postcode(1, None, 'POINT(10 12)', 'AB 4511')
-    postcode_update()
-    assert not postcode_table.row_set
-
-
-def test_postcodes_remove_all(postcode_update, postcode_table, place_postcode_table):
-    postcode_table.add('ch', '5613', 10, 12)
-    postcode_update()
-
-    assert not postcode_table.row_set
-
-
-def test_postcodes_multi_country(postcode_update, postcode_table,
-                                 insert_implicit_postcode):
-    insert_implicit_postcode(1, 'de', 'POINT(10 12)', '54451')
-    insert_implicit_postcode(2, 'cc', 'POINT(100 56)', 'DD23 T')
-    insert_implicit_postcode(3, 'de', 'POINT(10.3 11.0)', '54452')
-    insert_implicit_postcode(4, 'cc', 'POINT(10.3 11.0)', '54452')
-
-    postcode_update()
-
-    assert postcode_table.row_set == {(None, 'de', '54451', 10, 12),
-                                      (None, 'de', '54452', 10.3, 11.0),
-                                      (None, 'cc', '54452', 10.3, 11.0),
-                                      (None, 'cc', 'DD23 T', 100, 56)}
-
-
-@pytest.mark.parametrize("gzipped", [True, False])
-def test_postcodes_extern(postcode_update, postcode_table, tmp_path,
-                          insert_implicit_postcode, gzipped):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
-
-    extfile = tmp_path / 'xx_postcodes.csv'
-    extfile.write_text("postcode,lat,lon\nAB 4511,-4,-1\nCD 4511,-5, -10", encoding='utf-8')
-
-    if gzipped:
-        subprocess.run(['gzip', str(extfile)])
-        assert not extfile.is_file()
-
-    postcode_update(tmp_path)
-
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 12),
-                                      (None, 'xx', 'CD 4511', -10, -5)}
-
-
-def test_postcodes_extern_bad_column(postcode_update, postcode_table, tmp_path,
+    def test_postcodes_multi_country(self, postcode_update,
                                      insert_implicit_postcode):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+        insert_implicit_postcode(1, 'de', 'POINT(10 12)', '54451')
+        insert_implicit_postcode(2, 'cc', 'POINT(100 56)', 'DD23 T')
+        insert_implicit_postcode(3, 'de', 'POINT(10.3 11.0)', '54452')
+        insert_implicit_postcode(4, 'cc', 'POINT(10.3 11.0)', '54452')
 
-    extfile = tmp_path / 'xx_postcodes.csv'
-    extfile.write_text("postode,lat,lon\nAB 4511,-4,-1\nCD 4511,-5, -10", encoding='utf-8')
+        postcode_update()
 
-    postcode_update(tmp_path)
+        assert self.row_set == {(None, 'de', '54451', 10, 12),
+                                (None, 'de', '54452', 10.3, 11.0),
+                                (None, 'cc', '54452', 10.3, 11.0),
+                                (None, 'cc', 'DD23 T', 100, 56)}
 
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
+    @pytest.mark.parametrize("gzipped", [True, False])
+    def test_postcodes_extern(self, postcode_update, tmp_path,
+                              insert_implicit_postcode, gzipped):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
 
+        extfile = tmp_path / 'xx_postcodes.csv'
+        extfile.write_text("postcode,lat,lon\nAB 4511,-4,-1\nCD 4511,-5, -10", encoding='utf-8')
 
-def test_postcodes_extern_bad_number(postcode_update, insert_implicit_postcode,
-                                     postcode_table, tmp_path):
-    insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+        if gzipped:
+            subprocess.run(['gzip', str(extfile)])
+            assert not extfile.is_file()
 
-    extfile = tmp_path / 'xx_postcodes.csv'
-    extfile.write_text(
-        "postcode,lat,lon\nXX 4511,-4,NaN\nCD 4511,-5, -10\n34,200,0", encoding='utf-8')
+        postcode_update(tmp_path)
 
-    postcode_update(tmp_path)
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 12),
+                                (None, 'xx', 'CD 4511', -10, -5)}
 
-    assert postcode_table.row_set == {(None, 'xx', 'AB 4511', 10, 12),
-                                      (None, 'xx', 'CD 4511', -10, -5)}
+    def test_postcodes_extern_bad_column(self, postcode_update, tmp_path,
+                                         insert_implicit_postcode):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+
+        extfile = tmp_path / 'xx_postcodes.csv'
+        extfile.write_text("postode,lat,lon\nAB 4511,-4,-1\nCD 4511,-5, -10", encoding='utf-8')
+
+        postcode_update(tmp_path)
+
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 12)}
+
+    def test_postcodes_extern_bad_number(self, postcode_update, insert_implicit_postcode,
+                                         tmp_path):
+        insert_implicit_postcode(1, 'xx', 'POINT(10 12)', 'AB 4511')
+
+        extfile = tmp_path / 'xx_postcodes.csv'
+        extfile.write_text(
+            "postcode,lat,lon\nXX 4511,-4,NaN\nCD 4511,-5, -10\n34,200,0", encoding='utf-8')
+
+        postcode_update(tmp_path)
+
+        assert self.row_set == {(None, 'xx', 'AB 4511', 10, 12),
+                                (None, 'xx', 'CD 4511', -10, -5)}
+
+    def test_no_placex_entry(self, postcode_update, temp_db_cursor, place_postcode_row):
+        # Rewrite the get_country_code function to verify its execution.
+        temp_db_cursor.execute("""
+            CREATE OR REPLACE FUNCTION get_country_code(place geometry) RETURNS TEXT AS $$
+              SELECT 'yy' $$ LANGUAGE sql""")
+        place_postcode_row(centroid='POINT(10 12)', postcode='AB 4511')
+        postcode_update()
+
+        assert self.row_set == {(None, 'yy', 'AB 4511', 10, 12)}
+
+    def test_discard_badly_formatted_postcodes(self, postcode_update, place_postcode_row):
+        place_postcode_row(centroid='POINT(10 12)', country='fr', postcode='AB 4511')
+        postcode_update()
+
+        assert not self.row_set
 
 
 def test_can_compute(dsn, table_factory):
     assert not postcodes.can_compute(dsn)
     table_factory('place_postcode')
     assert postcodes.can_compute(dsn)
-
-
-def test_no_placex_entry(postcode_update, temp_db_cursor, place_postcode_row, postcode_table):
-    # Rewrite the get_country_code function to verify its execution.
-    temp_db_cursor.execute("""
-        CREATE OR REPLACE FUNCTION get_country_code(place geometry)
-        RETURNS TEXT AS $$ BEGIN
-        RETURN 'yy';
-        END; $$ LANGUAGE plpgsql;
-    """)
-    place_postcode_row(centroid='POINT(10 12)', postcode='AB 4511')
-    postcode_update()
-
-    assert postcode_table.row_set == {(None, 'yy', 'AB 4511', 10, 12)}
-
-
-def test_discard_badly_formatted_postcodes(postcode_update, place_postcode_row, postcode_table):
-    place_postcode_row(centroid='POINT(10 12)', country='fr', postcode='AB 4511')
-    postcode_update()
-
-    assert not postcode_table.row_set

test/python/tools/test_refresh.py

@@ -42,8 +42,8 @@ def test_refresh_import_wikipedia(dsn, src_dir, table_factory, temp_db_cursor, r
 
 
 @pytest.mark.parametrize('osm_type', ('N', 'W', 'R'))
-def test_invalidate_osm_object_simple(placex_table, osm_type, temp_db_conn, temp_db_cursor):
-    placex_table.add(osm_type=osm_type, osm_id=57283)
+def test_invalidate_osm_object_simple(placex_row, osm_type, temp_db_conn, temp_db_cursor):
+    placex_row(osm_type=osm_type, osm_id=57283)
 
     refresh.invalidate_osm_object(osm_type, 57283, temp_db_conn, recursive=False)
     temp_db_conn.commit()
@@ -53,8 +53,8 @@ def test_invalidate_osm_object_simple(placex_table, osm_type, temp_db_conn, temp
                                       (osm_type, 57283))
 
 
-def test_invalidate_osm_object_nonexisting_simple(placex_table, temp_db_conn, temp_db_cursor):
-    placex_table.add(osm_type='W', osm_id=57283)
+def test_invalidate_osm_object_nonexisting_simple(placex_row, temp_db_conn, temp_db_cursor):
+    placex_row(osm_type='W', osm_id=57283)
 
     refresh.invalidate_osm_object('N', 57283, temp_db_conn, recursive=False)
     temp_db_conn.commit()
@@ -64,8 +64,8 @@ def test_invalidate_osm_object_nonexisting_simple(placex_table, temp_db_conn, te
 
 
 @pytest.mark.parametrize('osm_type', ('N', 'W', 'R'))
-def test_invalidate_osm_object_recursive(placex_table, osm_type, temp_db_conn, temp_db_cursor):
-    placex_table.add(osm_type=osm_type, osm_id=57283)
+def test_invalidate_osm_object_recursive(placex_row, osm_type, temp_db_conn, temp_db_cursor):
+    placex_row(osm_type=osm_type, osm_id=57283)
 
     temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_force_update(placeid BIGINT)
                               RETURNS BOOLEAN AS $$

test/python/tools/test_refresh_wiki_data.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Tests for correctly assigning wikipedia pages to places.
@@ -38,7 +38,7 @@ def wiki_csv(tmp_path, sql_preprocessor):
                                    {'wikipedia': 'en:Test'},
                                    {'wikidata': 'Q123'}])
 def test_wikipedia(dsn, temp_db_conn, temp_db_cursor, table_factory,
-                   def_config, wiki_csv, placex_table, extra):
+                   def_config, wiki_csv, placex_row, extra):
     import_wikipedia_articles(dsn, wiki_csv([('en', 'Test', 0.3, 'Q123')]))
     create_functions(temp_db_conn, def_config)
 
@@ -46,7 +46,7 @@ def test_wikipedia(dsn, temp_db_conn, temp_db_cursor, table_factory,
         'SELECT language, title, importance, wikidata FROM wikimedia_importance')
     assert content == set([('en', 'Test', 0.3, 'Q123')])
 
-    place_id = placex_table.add(osm_id=12, extratags=extra)
+    place_id = placex_row(osm_id=12, extratags=extra)
     table_factory('search_name',
                   'place_id BIGINT, importance FLOAT',
                   [(place_id, 0.2)])
@@ -61,11 +61,11 @@ def test_wikipedia(dsn, temp_db_conn, temp_db_cursor, table_factory,
 
 
 def test_wikipedia_no_match(dsn, temp_db_conn, temp_db_cursor, def_config, wiki_csv,
-                            placex_table, table_factory):
+                            placex_row, table_factory):
     import_wikipedia_articles(dsn, wiki_csv([('de', 'Test', 0.3, 'Q123')]))
     create_functions(temp_db_conn, def_config)
 
-    place_id = placex_table.add(osm_id=12, extratags={'wikipedia': 'en:Test'}, rank_search=10)
+    place_id = placex_row(osm_id=12, extratags={'wikipedia': 'en:Test'}, rank_search=10)
     table_factory('search_name',
                   'place_id BIGINT, importance FLOAT',
                   [(place_id, 0.2)])

test/python/tools/test_sp_importer.py

@@ -1,69 +1,70 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2026 by the Nominatim developer community.
+# For a full list of authors see the git log.
+
 from nominatim_db.tools.special_phrases.sp_importer import SPImporter
 
 
 # Testing Database Class Pair Retrival using Conftest.py and placex
-def test_get_classtype_pair_data(placex_table, def_config, temp_db_conn):
+def test_get_classtype_pair_data(placex_row, def_config, temp_db_conn):
     for _ in range(100):
-        placex_table.add(cls='highway', typ='motorway')  # edge case 100
+        placex_row(cls='highway', typ='motorway')  # edge case 100
 
     for _ in range(99):
-        placex_table.add(cls='amenity', typ='prison')  # edge case 99
+        placex_row(cls='amenity', typ='prison')  # edge case 99
 
     for _ in range(150):
-        placex_table.add(cls='tourism', typ='hotel')
+        placex_row(cls='tourism', typ='hotel')
 
     importer = SPImporter(config=def_config, conn=temp_db_conn, sp_loader=None)
 
     result = importer.get_classtype_pairs(min=100)
 
-    expected = {
+    assert result == {
         ("highway", "motorway"),
         ("tourism", "hotel")
     }
 
-    assert result == expected, f"Expected {expected}, got {result}"
 
-
-def test_get_classtype_pair_data_more(placex_table, def_config, temp_db_conn):
+def test_get_classtype_pair_data_more(placex_row, def_config, temp_db_conn):
     for _ in range(99):
-        placex_table.add(cls='emergency', typ='firehydrant')  # edge case 99, not included
+        placex_row(cls='emergency', typ='firehydrant')  # edge case 99, not included
 
     for _ in range(199):
-        placex_table.add(cls='amenity', typ='prison')
+        placex_row(cls='amenity', typ='prison')
 
     for _ in range(3478):
-        placex_table.add(cls='tourism', typ='hotel')
+        placex_row(cls='tourism', typ='hotel')
 
     importer = SPImporter(config=def_config, conn=temp_db_conn, sp_loader=None)
 
     result = importer.get_classtype_pairs(min=100)
 
-    expected = {
+    assert result == {
         ("amenity", "prison"),
         ("tourism", "hotel")
     }
 
-    assert result == expected, f"Expected {expected}, got {result}"
 
-
-def test_get_classtype_pair_data_default(placex_table, def_config, temp_db_conn):
+def test_get_classtype_pair_data_default(placex_row, def_config, temp_db_conn):
     for _ in range(1):
-        placex_table.add(cls='emergency', typ='firehydrant')
+        placex_row(cls='emergency', typ='firehydrant')
 
     for _ in range(199):
-        placex_table.add(cls='amenity', typ='prison')
+        placex_row(cls='amenity', typ='prison')
 
     for _ in range(3478):
-        placex_table.add(cls='tourism', typ='hotel')
+        placex_row(cls='tourism', typ='hotel')
 
     importer = SPImporter(config=def_config, conn=temp_db_conn, sp_loader=None)
 
     result = importer.get_classtype_pairs()
 
-    expected = {
+    assert result == {
         ("amenity", "prison"),
         ("tourism", "hotel"),
         ("emergency", "firehydrant")
     }
-
-    assert result == expected, f"Expected {expected}, got {result}"

test/python/tools/test_tiger_data.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
-# Copyright (C) 2025 by the Nominatim developer community.
+# Copyright (C) 2026 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 Test for tiger data function
@@ -13,59 +13,10 @@ from textwrap import dedent
 import pytest
 import pytest_asyncio  # noqa: F401
 
-from nominatim_db.db.connection import execute_scalar
-from nominatim_db.tools import tiger_data, freeze
+from nominatim_db.tools import tiger_data
 from nominatim_db.errors import UsageError
 
 
-class MockTigerTable:
-
-    def __init__(self, conn):
-        self.conn = conn
-        with conn.cursor() as cur:
-            cur.execute("""CREATE TABLE tiger (linegeo GEOMETRY,
-                                               start INTEGER,
-                                               stop INTEGER,
-                                               interpol TEXT,
-                                               token_info JSONB,
-                                               postcode TEXT)""")
-
-            # We need this table to determine if the database is frozen or not
-            cur.execute("CREATE TABLE place (number INTEGER)")
-            # We need this table to determine if the database is in reverse-only mode
-            cur.execute("CREATE TABLE search_name (place_id BIGINT)")
-
-    def count(self):
-        return execute_scalar(self.conn, "SELECT count(*) FROM tiger")
-
-    def row(self):
-        with self.conn.cursor() as cur:
-            cur.execute("SELECT * FROM tiger LIMIT 1")
-            return cur.fetchone()
-
-
-@pytest.fixture
-def tiger_table(def_config, temp_db_conn, sql_preprocessor,
-                temp_db_with_extensions, tmp_path):
-    def_config.lib_dir.sql = tmp_path / 'sql'
-    def_config.lib_dir.sql.mkdir()
-
-    (def_config.lib_dir.sql / 'tiger_import_start.sql').write_text(
-        """CREATE OR REPLACE FUNCTION tiger_line_import(linegeo GEOMETRY, start INTEGER,
-                                                        stop INTEGER, interpol TEXT,
-                                                        token_info JSONB, postcode TEXT)
-           RETURNS INTEGER AS $$
-            INSERT INTO tiger VALUES(linegeo, start, stop, interpol, token_info, postcode)
-            RETURNING 1
-           $$ LANGUAGE SQL;""", encoding='utf-8')
-    (def_config.lib_dir.sql / 'tiger_import_finish.sql').write_text(
-        """DROP FUNCTION tiger_line_import (linegeo GEOMETRY, in_startnumber INTEGER,
-                                 in_endnumber INTEGER, interpolationtype TEXT,
-                                 token_info JSONB, in_postcode TEXT);""", encoding='utf-8')
-
-    return MockTigerTable(temp_db_conn)
-
-
 @pytest.fixture
 def csv_factory(tmp_path):
     def _mk_file(fname, hnr_from=1, hnr_to=9, interpol='odd', street='Main St',
@@ -80,107 +31,110 @@ def csv_factory(tmp_path):
     return _mk_file
 
 
-@pytest.mark.parametrize("threads", (1, 5))
-@pytest.mark.asyncio
-async def test_add_tiger_data(def_config, src_dir, tiger_table, tokenizer_mock, threads):
-    await tiger_data.add_tiger_data(str(src_dir / 'test' / 'testdb' / 'tiger'),
-                                    def_config, threads, tokenizer_mock())
+class TestTiger:
 
-    assert tiger_table.count() == 6213
+    @pytest.fixture(autouse=True)
+    def setup(self, temp_db_conn, placex_row, load_sql):
+        load_sql('tables/search_name.sql', create_reverse_only=False)
+        load_sql('tables/tiger.sql')
 
+        # fake parent roads
+        for x in range(-870, -863):
+            for y in range(323, 328):
+                placex_row(rank_search=26, rank_address=26,
+                           geom=f"LINESTRING({x/10 - 0.1} {y/10}, {x/10 + 0.1} {y/10})")
 
-@pytest.mark.parametrize("threads", (1, 5))
-@pytest.mark.asyncio
-async def test_add_tiger_data_database_frozen(def_config, src_dir, temp_db_conn, tiger_table,
-                                              tokenizer_mock, threads):
-    freeze.drop_update_tables(temp_db_conn)
+        temp_db_conn.execute("""
+            CREATE OR REPLACE FUNCTION get_partition(cc VARCHAR(10)) RETURNS INTEGER AS $$
+              SELECT 0;
+            $$ LANGUAGE sql;
+            CREATE OR REPLACE FUNCTION token_matches_street(i JSONB, s INT[]) RETURNS BOOLEAN AS $$
+             SELECT false
+            $$ LANGUAGE SQL IMMUTABLE STRICT PARALLEL SAFE;
+        """)
 
-    await tiger_data.add_tiger_data(str(src_dir / 'test' / 'testdb' / 'tiger'),
-                                    def_config, threads, tokenizer_mock())
-
-    assert tiger_table.count() == 6213
-
-
-@pytest.mark.asyncio
-async def test_add_tiger_data_reverse_only(def_config, src_dir, temp_db_conn, tiger_table,
-                                           tokenizer_mock):
-    with temp_db_conn.cursor() as cur:
-        cur.execute("DROP TABLE search_name")
-    temp_db_conn.commit()
-
-    with pytest.raises(UsageError,
-                       match="Cannot perform tiger import: required tables are missing. "
-                       "See https://github.com/osm-search/Nominatim/issues/2463 for details."):
+    @pytest.mark.parametrize("threads", (1, 5))
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_database_frozen(self, def_config, src_dir, temp_db_cursor,
+                                                  tokenizer_mock, threads):
         await tiger_data.add_tiger_data(str(src_dir / 'test' / 'testdb' / 'tiger'),
-                                        def_config, 1, tokenizer_mock())
+                                        def_config, threads, tokenizer_mock())
 
-    assert tiger_table.count() == 0
+        assert temp_db_cursor.table_rows('location_property_tiger') == 6209
 
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_reverse_only(self, def_config, src_dir, temp_db_cursor,
+                                               tokenizer_mock):
+        temp_db_cursor.execute("DROP TABLE search_name")
 
-@pytest.mark.asyncio
-async def test_add_tiger_data_no_files(def_config, tiger_table, tokenizer_mock,
-                                       tmp_path):
-    await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
+        with pytest.raises(UsageError,
+                           match="Cannot perform tiger import: required tables are missing. "
+                           "See https://github.com/osm-search/Nominatim/issues/2463 for details."):
+            await tiger_data.add_tiger_data(str(src_dir / 'test' / 'testdb' / 'tiger'),
+                                            def_config, 1, tokenizer_mock())
 
-    assert tiger_table.count() == 0
+        assert temp_db_cursor.table_rows('location_property_tiger') == 0
 
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_no_files(self, def_config, temp_db_cursor, tokenizer_mock,
+                                           tmp_path):
+        await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
 
-@pytest.mark.asyncio
-async def test_add_tiger_data_bad_file(def_config, tiger_table, tokenizer_mock,
-                                       tmp_path):
-    sqlfile = tmp_path / '1010.csv'
-    sqlfile.write_text("""Random text""", encoding='utf-8')
+        assert temp_db_cursor.table_rows('location_property_tiger') == 0
 
-    await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_bad_file(self, def_config, temp_db_cursor, tokenizer_mock,
+                                           tmp_path):
+        sqlfile = tmp_path / '1010.csv'
+        sqlfile.write_text('Random text', encoding='utf-8')
 
-    assert tiger_table.count() == 0
+        await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
 
+        assert temp_db_cursor.table_rows('location_property_tiger') == 0
 
-@pytest.mark.asyncio
-async def test_add_tiger_data_hnr_nan(def_config, tiger_table, tokenizer_mock,
-                                      csv_factory, tmp_path):
-    csv_factory('file1', hnr_from=99)
-    csv_factory('file2', hnr_from='L12')
-    csv_factory('file3', hnr_to='12.4')
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_hnr_nan(self, def_config, temp_db_cursor, tokenizer_mock,
+                                          csv_factory, tmp_path):
+        csv_factory('file1', hnr_to=99)
+        csv_factory('file2', hnr_from='L12')
+        csv_factory('file3', hnr_to='12.4')
 
-    await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
+        await tiger_data.add_tiger_data(str(tmp_path), def_config, 1, tokenizer_mock())
 
-    assert tiger_table.count() == 1
-    assert tiger_table.row().start == 99
+        rows = temp_db_cursor.row_set("""
+            SELECT startnumber, endnumber FROM location_property_tiger""")
 
+        assert rows == {(1, 99)}
 
-@pytest.mark.parametrize("threads", (1, 5))
-@pytest.mark.asyncio
-async def test_add_tiger_data_tarfile(def_config, tiger_table, tokenizer_mock,
-                                      tmp_path, src_dir, threads):
-    tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
-    tar.add(str(src_dir / 'test' / 'testdb' / 'tiger' / '01001.csv'))
-    tar.close()
+    @pytest.mark.parametrize("threads", (1, 5))
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_tarfile(self, def_config, temp_db_cursor, tokenizer_mock,
+                                          tmp_path, src_dir, threads):
+        tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
+        tar.add(str(src_dir / 'test' / 'testdb' / 'tiger' / '01001.csv'))
+        tar.close()
 
-    await tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, threads,
-                                    tokenizer_mock())
+        await tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, threads,
+                                        tokenizer_mock())
 
-    assert tiger_table.count() == 6213
+        assert temp_db_cursor.table_rows('location_property_tiger') == 6209
 
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_bad_tarfile(self, def_config, tokenizer_mock, tmp_path):
+        tarfile = tmp_path / 'sample.tar.gz'
+        tarfile.write_text("""Random text""", encoding='utf-8')
 
-@pytest.mark.asyncio
-async def test_add_tiger_data_bad_tarfile(def_config, tiger_table, tokenizer_mock,
-                                          tmp_path):
-    tarfile = tmp_path / 'sample.tar.gz'
-    tarfile.write_text("""Random text""", encoding='utf-8')
+        with pytest.raises(UsageError):
+            await tiger_data.add_tiger_data(str(tarfile), def_config, 1, tokenizer_mock())
 
-    with pytest.raises(UsageError):
-        await tiger_data.add_tiger_data(str(tarfile), def_config, 1, tokenizer_mock())
+    @pytest.mark.asyncio
+    async def test_add_tiger_data_empty_tarfile(self, def_config, temp_db_cursor, tokenizer_mock,
+                                                tmp_path):
+        tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
+        tar.add(__file__)
+        tar.close()
 
+        await tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, 1,
+                                        tokenizer_mock())
 
-@pytest.mark.asyncio
-async def test_add_tiger_data_empty_tarfile(def_config, tiger_table, tokenizer_mock,
-                                            tmp_path):
-    tar = tarfile.open(str(tmp_path / 'sample.tar.gz'), "w:gz")
-    tar.add(__file__)
-    tar.close()
-
-    await tiger_data.add_tiger_data(str(tmp_path / 'sample.tar.gz'), def_config, 1,
-                                    tokenizer_mock())
-
-    assert tiger_table.count() == 0
+        assert temp_db_cursor.table_rows('location_property_tiger') == 0