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

Merge pull request #4012 from lonvia/interpolation-separation

Browse Source 
Move interpolations into a separate table
This commit is contained in:
Sarah Hoffmann
2026-03-04 17:27:02 +01:00
committed by GitHub
parent e22dda2a86 639f05fecc
commit d43e95f177
34 changed files with 799 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
docs/develop/Database-Layout.md
View File

@@ -11,10 +11,38 @@ The import process creates the following tables:
The `planet_osm_*` tables are the usual backing tables for OSM data. Note 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 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 The **place_postcode** table collects postcode information that is not
columns: 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_type` - kind of OSM object (**N** - node, **W** - way, **R** - relation)
* `osm_id` - original OSM ID * `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_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 * `indexed_date` - timestamp when the place was processed last
* `centroid` - a point feature for the place * `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 The **location_property_osmline** table is a special table for
[address interpolations](https://wiki.openstreetmap.org/wiki/Addresses#Using_interpolation). [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 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 * `startnumber`, `endnumber` and `step` - beginning and end of the number range
for the interpolation for the interpolation and the increment steps
* `interpolationtype` - a string `odd`, `even` or `all` to indicate * `type` - a string to indicate the interval between the numbers as imported
the interval between the numbers 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 Address interpolations are always ways in OSM, which is why there is no column
`osm_type`. `osm_type`.
The **location_postcodes** table holds computed centroids of all postcodes that The **location_postcodes** table holds computed postcode assembled from the
can be found in the OSM data. The meaning of the columns is again the same postcode information available in OSM. When a postcode has a postcode area
as that of the placex table. 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 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 location of the place. The set of address places is made up of OSM places

21
docs/develop/osm2pgsql-tables.plantuml
View File

@@ -35,10 +35,31 @@ map place {
geometry => GEOMETRY 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_nodes -[hidden]> planet_osm_ways
planet_osm_ways -[hidden]> planet_osm_rels planet_osm_ways -[hidden]> planet_osm_rels
planet_osm_ways -[hidden]-> place 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 <- planet_osm_ways::nodes
planet_osm_nodes::id <- place_interpolation::nodes
@enduml @enduml

30
docs/develop/osm2pgsql-tables.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 19 KiB

7
docs/develop/search-tables.plantuml
View File

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

30
docs/develop/search-tables.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

37
lib-lua/themes/nominatim/init.lua
View File

@@ -77,7 +77,19 @@ local table_definitions = {
indexes = { indexes = {
{ column = 'postcode', method = 'btree' } { 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 = {} local insert_row = {}
@@ -703,9 +715,24 @@ function module.process_tags(o)
o.address['country'] = nil o.address['country'] = nil
end end
if o.address.interpolation ~= nil then if o.address.interpolation ~= nil and o.address.housenumber == nil
o:write_place('place', 'houses', PlaceTransform.always) and o.object.type == 'way' and o.object.nodes ~= nil then
return 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 end
-- collect main keys -- collect main keys
@@ -728,7 +755,7 @@ function module.process_tags(o)
} }
end end
elseif ktype == 'fallback' and o.has_name then elseif ktype == 'fallback' and o.has_name then
fallback = {k, v, PlaceTransform.named} fallback = {k, v, PlaceTransform.always}
end end
end end
end end

207
lib-sql/functions/interpolation.sql
View File

@@ -2,11 +2,99 @@
-- --
-- This file is part of Nominatim. (https://nominatim.org) -- 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. -- For a full list of authors see the git log.
-- Functions for address interpolation objects in location_property_osmline. -- 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) CREATE OR REPLACE FUNCTION get_interpolation_address(in_address HSTORE, wayid BIGINT)
RETURNS HSTORE RETURNS HSTORE
@@ -19,17 +107,20 @@ BEGIN
RETURN in_address; RETURN in_address;
END IF; END IF;
SELECT nodes INTO waynodes FROM planet_osm_ways WHERE id = wayid; SELECT nodes INTO waynodes FROM place_interpolation WHERE osm_id = wayid;
FOR location IN
SELECT placex.address, placex.osm_id FROM placex IF array_upper(waynodes, 1) IS NOT NULL THEN
WHERE osm_type = 'N' and osm_id = ANY(waynodes) FOR location IN
and placex.address is not null SELECT placex.address, placex.osm_id FROM placex
and (placex.address ? 'street' or placex.address ? 'place') WHERE osm_type = 'N' and osm_id = ANY(waynodes)
and indexed_status < 100 and placex.address is not null
LOOP and (placex.address ? 'street' or placex.address ? 'place')
-- mark it as a derived address and indexed_status < 100
RETURN location.address || in_address || hstore('_inherited', ''); LOOP
END LOOP; -- mark it as a derived address
RETURN location.address || coalesce(in_address, ''::hstore) || hstore('_inherited', '');
END LOOP;
END IF;
RETURN in_address; RETURN in_address;
END; END;
@@ -73,51 +164,6 @@ $$
LANGUAGE plpgsql STABLE PARALLEL SAFE; 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() CREATE OR REPLACE FUNCTION osmline_insert()
RETURNS TRIGGER RETURNS TRIGGER
AS $$ AS $$
@@ -128,20 +174,17 @@ BEGIN
NEW.indexed_date := now(); NEW.indexed_date := now();
IF NEW.indexed_status IS NULL THEN IF NEW.indexed_status IS NULL THEN
IF NEW.address is NULL OR NOT NEW.address ? 'interpolation' IF NOT(NEW.type in ('odd', 'even', 'all') OR NEW.type similar to '[1-9]') THEN
OR NOT (NEW.address->'interpolation' in ('odd', 'even', 'all') -- alphabetic interpolation is not supported
or NEW.address->'interpolation' similar to '[1-9]') RETURN NULL;
THEN END IF;
-- alphabetic interpolation is not supported
RETURN NULL;
END IF;
NEW.indexed_status := 1; --STATUS_NEW centroid := get_center_point(NEW.linegeo);
centroid := get_center_point(NEW.linegeo); NEW.indexed_status := 1; --STATUS_NEW
NEW.country_code := lower(get_country_code(centroid)); NEW.country_code := lower(get_country_code(centroid));
NEW.partition := get_partition(NEW.country_code); NEW.partition := get_partition(NEW.country_code);
NEW.geometry_sector := geometry_sector(NEW.partition, centroid); NEW.geometry_sector := geometry_sector(NEW.partition, centroid);
END IF; END IF;
RETURN NEW; RETURN NEW;
@@ -182,32 +225,22 @@ BEGIN
get_center_point(NEW.linegeo), get_center_point(NEW.linegeo),
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); NEW.token_info := token_strip_info(NEW.token_info);
IF NEW.address ? '_inherited' THEN IF NEW.address ? '_inherited' THEN
NEW.address := hstore('interpolation', NEW.address->'interpolation'); NEW.address := NULL;
END IF; END IF;
-- If the line was newly inserted, split the line as necessary. -- If the line was newly inserted, split the line as necessary.
IF OLD.indexed_status = 1 THEN IF NEW.parent_place_id is not NULL AND NEW.startnumber is NULL THEN
IF NEW.address->'interpolation' in ('odd', 'even') THEN IF NEW.type in ('odd', 'even') THEN
NEW.step := 2; 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 ELSE
NEW.step := CASE WHEN NEW.address->'interpolation' = 'all' NEW.step := CASE WHEN NEW.type = 'all' THEN 1 ELSE (NEW.type)::SMALLINT END;
THEN 1
ELSE (NEW.address->'interpolation')::SMALLINT END;
stepmod := NULL; stepmod := NULL;
END IF; END IF;
SELECT nodes INTO waynodes SELECT nodes INTO waynodes FROM place_interpolation WHERE osm_id = NEW.osm_id;
FROM planet_osm_ways WHERE id = NEW.osm_id;
IF array_upper(waynodes, 1) IS NULL THEN IF array_upper(waynodes, 1) IS NULL THEN
RETURN NEW; RETURN NEW;
@@ -314,12 +347,12 @@ BEGIN
ELSE ELSE
INSERT INTO location_property_osmline INSERT INTO location_property_osmline
(linegeo, partition, osm_id, parent_place_id, (linegeo, partition, osm_id, parent_place_id,
startnumber, endnumber, step, startnumber, endnumber, step, type,
address, postcode, country_code, address, postcode, country_code,
geometry_sector, indexed_status) geometry_sector, indexed_status)
VALUES (ST_ReducePrecision(sectiongeo, 0.0000001), VALUES (ST_ReducePrecision(sectiongeo, 0.0000001),
NEW.partition, NEW.osm_id, NEW.parent_place_id, NEW.partition, NEW.osm_id, NEW.parent_place_id,
startnumber, endnumber, NEW.step, startnumber, endnumber, NEW.step, NEW.type,
NEW.address, postcode, NEW.address, postcode,
NEW.country_code, NEW.geometry_sector, 0); NEW.country_code, NEW.geometry_sector, 0);
END IF; END IF;

59
lib-sql/functions/place_triggers.sql
View File

@@ -14,7 +14,6 @@ DECLARE
existing RECORD; existing RECORD;
existingplacex RECORD; existingplacex RECORD;
existingline BIGINT[]; existingline BIGINT[];
interpol RECORD;
BEGIN BEGIN
{% if debug %} {% if debug %}
RAISE WARNING 'place_insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,st_area(NEW.geometry); 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_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; 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. -- ---- All other place types.
-- When an area is changed from large to small: log and discard change -- When an area is changed from large to small: log and discard change
@@ -109,29 +73,6 @@ BEGIN
RETURN null; RETURN null;
END IF; 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. -- Get the existing placex entry.
SELECT * INTO existingplacex SELECT * INTO existingplacex
FROM placex FROM placex

8
lib-sql/functions/placex_triggers.sql
View File

@@ -53,12 +53,8 @@ BEGIN
-- See if we can inherit additional address tags from an interpolation. -- See if we can inherit additional address tags from an interpolation.
-- These will become permanent. -- These will become permanent.
FOR location IN FOR location IN
SELECT (address - 'interpolation'::text - 'housenumber'::text) as address SELECT address FROM place_interpolation
FROM place, planet_osm_ways w WHERE ARRAY[p.osm_id] && place_interpolation.nodes AND address is not NULL
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)
LOOP LOOP
result.address := location.address || result.address; result.address := location.address || result.address;
END LOOP; END LOOP;

24
lib-sql/functions/utils.sql
View File

@@ -624,18 +624,22 @@ BEGIN
and placex.type = place_to_be_deleted.type and placex.type = place_to_be_deleted.type
and not deferred; and not deferred;
-- Mark for delete in interpolations -- Clear todo list.
UPDATE location_property_osmline SET indexed_status = 100 FROM place_to_be_deleted TRUNCATE TABLE 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. -- delete from place_interpolation table
TRUNCATE TABLE place_to_be_deleted; 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; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;

16
lib-sql/indices.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This file is part of Nominatim. (https://nominatim.org) -- 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. -- For a full list of authors see the git log.
-- Indices used only during search and update. -- 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. -- Table needed for running updates with osm2pgsql on place.
CREATE TABLE IF NOT EXISTS place_to_be_deleted ( CREATE TABLE IF NOT EXISTS place_to_be_deleted (
osm_type CHAR(1), osm_type CHAR(1) NOT NULL,
osm_id BIGINT, osm_id BIGINT NOT NULL,
class TEXT, class TEXT NOT NULL,
type TEXT, type TEXT NOT NULL,
deferred BOOLEAN 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 CREATE INDEX IF NOT EXISTS idx_location_postcodes_parent_place_id

7
lib-sql/table-triggers.sql
View File

@@ -2,7 +2,7 @@
-- --
-- This file is part of Nominatim. (https://nominatim.org) -- 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. -- For a full list of authors see the git log.
-- insert creates the location tables, creates location indexes if indexed == true -- 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(); FOR EACH ROW EXECUTE PROCEDURE postcodes_delete();
CREATE TRIGGER location_postcodes_before_insert BEFORE INSERT ON location_postcodes CREATE TRIGGER location_postcodes_before_insert BEFORE INSERT ON location_postcodes
FOR EACH ROW EXECUTE PROCEDURE postcodes_insert(); 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();

5
lib-sql/tables.sql
View File

@@ -32,8 +32,3 @@ CREATE INDEX planet_osm_rels_relation_members_idx ON planet_osm_rels USING gin(p
WITH (fastupdate=off) WITH (fastupdate=off)
{{db.tablespace.address_index}}; {{db.tablespace.address_index}};
{% endif %} {% 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';

3
lib-sql/tables/interpolation.sql
View File

@@ -12,12 +12,13 @@ CREATE TABLE location_property_osmline (
parent_place_id BIGINT, parent_place_id BIGINT,
geometry_sector INTEGER NOT NULL, geometry_sector INTEGER NOT NULL,
indexed_date TIMESTAMP, indexed_date TIMESTAMP,
type TEXT,
startnumber INTEGER, startnumber INTEGER,
endnumber INTEGER, endnumber INTEGER,
step SMALLINT, step SMALLINT,
partition SMALLINT NOT NULL, partition SMALLINT NOT NULL,
indexed_status SMALLINT NOT NULL, indexed_status SMALLINT NOT NULL,
linegeo GEOMETRY NOT NULL, linegeo GEOMETRY(Geometry, 4326) NOT NULL,
address HSTORE, address HSTORE,
token_info JSONB, -- custom column for tokenizer use only token_info JSONB, -- custom column for tokenizer use only
postcode TEXT, postcode TEXT,

13
src/nominatim_db/tools/database_import.py
View File

@@ -2,7 +2,7 @@
# #
# This file is part of Nominatim. (https://nominatim.org) # 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. # For a full list of authors see the git log.
""" """
Functions for setting up and importing a new Nominatim database. Functions for setting up and importing a new Nominatim database.
@@ -219,19 +219,16 @@ async def load_data(dsn: str, threads: int) -> None:
pysql.SQL("""INSERT INTO placex ({columns}) pysql.SQL("""INSERT INTO placex ({columns})
SELECT {columns} FROM place SELECT {columns} FROM place
WHERE osm_id % {total} = {mod} WHERE osm_id % {total} = {mod}
AND NOT (class='place'
and (type='houses' or type='postcode'))
AND ST_IsValid(geometry)
""").format(columns=_COPY_COLUMNS, """).format(columns=_COPY_COLUMNS,
total=pysql.Literal(placex_threads), total=pysql.Literal(placex_threads),
mod=pysql.Literal(imod)), None) mod=pysql.Literal(imod)), None)
# Interpolations need to be copied separately # Interpolations need to be copied separately
await pool.put_query(""" await pool.put_query("""
INSERT INTO location_property_osmline (osm_id, address, linegeo) INSERT INTO location_property_osmline (osm_id, type, address, linegeo)
SELECT osm_id, address, geometry FROM place SELECT osm_id, type, address, geometry
WHERE class='place' and type='houses' and osm_type='W' FROM place_interpolation
and ST_GeometryType(geometry) = 'ST_LineString' """, None) """, None)
progress.cancel() progress.cancel()

72
src/nominatim_db/tools/migration.py
View File

@@ -2,7 +2,7 @@
# #
# This file is part of Nominatim. (https://nominatim.org) # 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. # For a full list of authors see the git log.
""" """
Functions for database migration to newer software versions. Functions for database migration to newer software versions.
@@ -350,3 +350,73 @@ def create_place_postcode_table(conn: Connection, config: Configuration, **_: An
WHERE osm_type = 'N' and rank_search < 26 and class = 'place'; WHERE osm_type = 'N' and rank_search < 26 and class = 'place';
ANALYSE; 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;
""")

4
src/nominatim_db/version.py
View File

@@ -2,7 +2,7 @@
# #
# This file is part of Nominatim. (https://nominatim.org) # 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. # For a full list of authors see the git log.
""" """
Version information for Nominatim. 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('-')]) 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-3')
POSTGRESQL_REQUIRED_VERSION = (12, 0) POSTGRESQL_REQUIRED_VERSION = (12, 0)
POSTGIS_REQUIRED_VERSION = (3, 0) POSTGIS_REQUIRED_VERSION = (3, 0)

10
test/bdd/features/db/import/addressing.feature
View File

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

225
test/bdd/features/db/import/interpolation.feature
View File

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

22
test/bdd/features/db/import/linking.feature
View File

@@ -297,25 +297,21 @@ Feature: Linking of places
| R1 | LabelPlace | | R1 | LabelPlace |
@skip
Scenario: Linked places expand default language names Scenario: Linked places expand default language names
Given the grid with origin CO Given the grid
| 1 | | 2 | | 5 | | 6 | | 1 | | 2 |
| | 9 | | | | 10 | | | | 9 | |
| 4 | | 3 | | 8 | | 7 | | 4 | | 3 |
And the places Given the places
| osm | class | type | name+name | geometry | | osm | class | type | name+name | geometry |
| N9 | place | city | Popayán | 9 | | N9 | place | city | Popayán | 9 |
And the places Given the places
| osm | class | type | name+name:en | geometry |
| N10 | place | city | Open | 10 |
And the places
| osm | class | type | name+name | geometry | admin | | osm | class | type | name+name | geometry | admin |
| R1 | boundary | administrative | Perímetro Urbano Popayán | (1,2,3,4,1) | 8 | | R1 | boundary | administrative | Perímetro Urbano Popayán | (1,2,3,4,1) | 8 |
| R2 | boundary | administrative | Abre | (5,6,7,8,5) | 8 |
And the relations And the relations
| id | members | | id | members |
| 1 | N9:label | | 1 | N9:label |
| 2 | N10:label |
When importing When importing
Then placex contains Then placex contains
| object | linked_place_id | | object | linked_place_id |

33
test/bdd/features/db/query/housenumbers.feature
View File

@@ -287,38 +287,6 @@ Feature: Searching of house numbers
| N1 | | N1 |
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 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 |
When importing
When geocoding "Ringstr 12"
Then the result set contains
| object |
| W10 |
When geocoding "Ringstr 13"
Then the result set contains
| object |
| W20 |
Scenario: A housenumber with interpolation is found Scenario: A housenumber with interpolation is found
Given the places Given the places
| osm | class | type | housenr | addr+interpolation | geometry | | osm | class | type | housenr | addr+interpolation | geometry |
@@ -378,4 +346,3 @@ Feature: Searching of house numbers
Then the result set contains Then the result set contains
| object | | object |
| W10 | | W10 |

47
test/bdd/features/db/query/interpolation.feature
View File

@@ -11,16 +11,13 @@ Feature: Query of address interpolations
Given the places Given the places
| osm | class | type | name | geometry | | osm | class | type | name | geometry |
| W10 | highway | primary | Nickway | 10,12,13 | | W10 | highway | primary | Nickway | 10,12,13 |
And the places And the interpolations
| osm | class | type | addr+interpolation | geometry | | osm | type | geometry | nodes |
| W1 | place | houses | odd | 1,3 | | W1 | odd | 1,3 | 1,3 |
And the places And the places
| osm | class | type | housenr | geometry | | osm | class | type | housenr | geometry |
| N1 | place | house | 1 | 1 | | N1 | place | house | 1 | 1 |
| N3 | place | house | 5 | 3 | | N3 | place | house | 5 | 3 |
And the ways
| id | nodes |
| 1 | 1,3 |
When importing When importing
When reverse geocoding at node 2 When reverse geocoding at node 2
Then the result contains Then the result contains
@@ -36,16 +33,13 @@ Feature: Query of address interpolations
Given the places Given the places
| osm | class | type | name | geometry | | osm | class | type | name | geometry |
| W10 | highway | primary | Nickway | 10,12,13 | | W10 | highway | primary | Nickway | 10,12,13 |
And the places And the interpolations
| osm | class | type | addr+interpolation | geometry | | osm | type | geometry | nodes |
| W1 | place | houses | even | 1,3 | | W1 | even | 1,3 | 1,3 |
And the places And the places
| osm | class | type | housenr | geometry | | osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 | | N1 | place | house | 2 | 1 |
| N3 | place | house | 18 | 3 | | N3 | place | house | 18 | 3 |
And the ways
| id | nodes |
| 1 | 1,3 |
When importing When importing
When reverse geocoding at node 2 When reverse geocoding at node 2
Then the result contains Then the result contains
@@ -55,3 +49,32 @@ Feature: Query of address interpolations
Then all results contain Then all results contain
| object | display_name | centroid!wkt | | object | display_name | centroid!wkt |
| W1 | 10, Nickway | 2 | | 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 |

197
test/bdd/features/db/update/interpolation.feature
View File

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

13
test/bdd/features/db/update/simple.feature
View File

@@ -68,19 +68,6 @@ Feature: Update of simple objects
| object | class | type | centroid!wkt | | object | class | type | centroid!wkt |
| N3 | shop | grocery | 1 -1 | | 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 Scenario: remove boundary when changing from polygon to way
Given the grid Given the grid
| 1 | 2 | | 1 | 2 |

42
test/bdd/features/osm2pgsql/import/interpolation.feature Normal file
View File

@@ -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" |

12
test/bdd/features/osm2pgsql/import/tags.feature
View File

@@ -205,18 +205,6 @@ Feature: Tag evaluation
| N12005 | 12345 | - | | 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 Scenario: Footways
When loading osm data When loading osm data
""" """

38
test/bdd/features/osm2pgsql/update/interpolations.feature
View File

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

12
test/bdd/features/osm2pgsql/update/postcodes.feature
View File

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

147
test/bdd/test_db.py
View File

@@ -2,7 +2,7 @@
# #
# This file is part of Nominatim. (https://nominatim.org) # 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. # For a full list of authors see the git log.
""" """
Collector for BDD import acceptance tests. Collector for BDD import acceptance tests.
@@ -14,6 +14,7 @@ import re
from collections import defaultdict from collections import defaultdict
import psycopg import psycopg
import psycopg.sql as pysql
import pytest import pytest
from pytest_bdd import when, then, given from pytest_bdd import when, then, given
@@ -50,6 +51,34 @@ def _collect_place_ids(conn):
return pids 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 @pytest.fixture
def test_config_env(pytestconfig): def test_config_env(pytestconfig):
dbname = pytestconfig.getini('nominatim_test_db') 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) @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. """ Insert todo rows into the place_entrance table.
""" """
with db_conn.cursor() as cur: for row in datatable[1:]:
for row in datatable[1:]: data = PlaceColumn(node_grid).add_row(datatable[0], row, False)
data = PlaceColumn(node_grid).add_row(datatable[0], row, False) assert data.columns['osm_type'] == 'N'
assert data.columns['osm_type'] == 'N'
cur.execute("""INSERT INTO place_entrance (osm_id, type, extratags, geometry) params = {'osm_id': data.columns['osm_id'],
VALUES (%s, %s, %s, {})""".format(data.get_wkt()), 'type': data.columns['type'],
(data.columns['osm_id'], data.columns['type'], 'extratags': data.columns.get('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) @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) @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. """ Import raw ways into the osm2pgsql way middle table.
""" """
with db_conn.cursor() as cur: id_idx = datatable[0].index('id')
id_idx = datatable[0].index('id') node_idx = datatable[0].index('nodes')
node_idx = datatable[0].index('nodes') for line in datatable[1:]:
for line in datatable[1:]: row_factory('planet_osm_ways',
tags = psycopg.types.json.Json( id=line[id_idx],
{k[5:]: v for k, v in zip(datatable[0], line) nodes=[int(x) for x in line[node_idx].split(',')],
if k.startswith("tags+")}) tags=psycopg.types.json.Json(
nodes = [int(x) for x in line[node_idx].split(',')] {k[5:]: v for k, v in zip(datatable[0], line)
if k.startswith("tags+")}))
cur.execute("INSERT INTO planet_osm_ways (id, nodes, tags) VALUES (%s, %s, %s)",
(line[id_idx], nodes, tags))
@given('the relations', target_fixture=None) @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. """ Import raw relations into the osm2pgsql relation middle table.
""" """
with db_conn.cursor() as cur: id_idx = datatable[0].index('id')
id_idx = datatable[0].index('id') memb_idx = datatable[0].index('members')
memb_idx = datatable[0].index('members') for line in datatable[1:]:
for line in datatable[1:]: tags = psycopg.types.json.Json(
tags = psycopg.types.json.Json( {k[5:]: v for k, v in zip(datatable[0], line)
{k[5:]: v for k, v in zip(datatable[0], line) if k.startswith("tags+")})
if k.startswith("tags+")}) members = []
members = [] if line[memb_idx]:
if line[memb_idx]: for member in line[memb_idx].split(','):
for member in line[memb_idx].split(','): m = re.fullmatch(r'\s*([RWN])(\d+)(?::(\S+))?\s*', member)
m = re.fullmatch(r'\s*([RWN])(\d+)(?::(\S+))?\s*', member) if not m:
if not m: raise ValueError(f'Illegal member {member}.')
raise ValueError(f'Illegal member {member}.') members.append({'ref': int(m[2]), 'role': m[3] or '', 'type': m[1]})
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)', row_factory('planet_osm_rels',
(int(line[id_idx]), tags, psycopg.types.json.Json(members))) id=int(line[id_idx]), tags=tags,
members=psycopg.types.json.Json(members))
@when('importing', target_fixture='place_ids') @when('importing', target_fixture='place_ids')
@@ -221,6 +266,28 @@ def update_place_entrances(db_conn, datatable, node_grid):
db_conn.commit() 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') @when('refreshing postcodes')
def do_postcode_update(update_config): def do_postcode_update(update_config):
""" Recompute the postcode centroids. """ 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('TRUNCATE place_to_be_deleted')
cur.execute('DELETE FROM place WHERE osm_type = %s and osm_id = %s', cur.execute('DELETE FROM place WHERE osm_type = %s and osm_id = %s',
(otype, oid)) (otype, oid))
cur.execute('DELETE FROM place_interpolation WHERE osm_id = %s',
(oid, ))
cur.execute('SELECT flush_deleted_places()') cur.execute('SELECT flush_deleted_places()')
if otype == 'N': if otype == 'N':
cur.execute('DELETE FROM place_entrance WHERE osm_id = %s', cur.execute('DELETE FROM place_entrance WHERE osm_id = %s',

6
test/bdd/utils/checks.py
View File

@@ -2,7 +2,7 @@
# #
# This file is part of Nominatim. (https://nominatim.org) # 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. # For a full list of authors see the git log.
""" """
Helper functions to compare expected values. Helper functions to compare expected values.
@@ -61,6 +61,8 @@ COMPARISON_FUNCS = {
'fm': lambda val, exp: re.fullmatch(exp, val) is not None, 'fm': lambda val, exp: re.fullmatch(exp, val) is not None,
'dict': lambda val, exp: (val is None if exp == '-' 'dict': lambda val, exp: (val is None if exp == '-'
else (val == ast.literal_eval('{' + 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 'in_box': within_box
} }
@@ -84,6 +86,8 @@ class ResultAttr:
!fm - consider comparison string a regular expression and match full value !fm - consider comparison string a regular expression and match full value
!wkt - convert the expected value to a WKT string before comparing !wkt - convert the expected value to a WKT string before comparing
!in_box - the expected value is a comma-separated bbox description !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): def __init__(self, obj, key, grid=None):

1
test/bdd/utils/place_inserter.py
View File

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

41
test/python/conftest.py
View File

@@ -192,9 +192,9 @@ def place_table(temp_db_with_extensions, table_factory):
type text NOT NULL, type text NOT NULL,
name hstore, name hstore,
admin_level smallint, admin_level smallint,
address hstore, address HSTORE,
extratags hstore, extratags HSTORE,
geometry Geometry(Geometry,4326) NOT NULL""") geometry GEOMETRY(Geometry,4326) NOT NULL""")
@pytest.fixture @pytest.fixture
@@ -223,9 +223,9 @@ def place_postcode_table(temp_db_with_extensions, table_factory):
"""osm_type char(1) NOT NULL, """osm_type char(1) NOT NULL,
osm_id bigint NOT NULL, osm_id bigint NOT NULL,
postcode text NOT NULL, postcode text NOT NULL,
country_code text, country_code TEXT,
centroid Geometry(Point, 4326) NOT NULL, centroid GEOMETRY(Point, 4326) NOT NULL,
geometry Geometry(Geometry, 4326)""") geometry GEOMETRY(Geometry, 4326)""")
@pytest.fixture @pytest.fixture
@@ -246,6 +246,35 @@ def place_postcode_row(place_postcode_table, temp_db_cursor):
return _insert return _insert
@pytest.fixture
def place_interpolation_table(temp_db_with_extensions, table_factory):
""" Create an empty version of the place_interpolation table.
"""
table_factory('place_interpolation',
"""osm_id bigint NOT NULL,
type TEXT,
address HSTORE,
nodes BIGINT[],
geometry GEOMETRY(Geometry, 4326)""")
@pytest.fixture
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 @pytest.fixture
def placex_table(temp_db_with_extensions, temp_db_conn, load_sql, place_table): def placex_table(temp_db_with_extensions, temp_db_conn, load_sql, place_table):
""" Create an empty version of the placex table. """ Create an empty version of the placex table.

24
test/python/tools/test_admin.py
View File

@@ -76,8 +76,8 @@ def test_analyse_indexing_with_osm_id(project_env, placex_row):
class TestAdminCleanDeleted: class TestAdminCleanDeleted:
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def setup_polygon_delete(self, project_env, table_factory, place_table, placex_row, def setup_polygon_delete(self, project_env, table_factory, place_interpolation_table,
osmline_table, temp_db_cursor, load_sql): placex_row, osmline_table, temp_db_cursor, load_sql):
""" Set up place_force_delete function and related tables """ Set up place_force_delete function and related tables
""" """
self.project_env = project_env self.project_env = project_env
@@ -106,16 +106,24 @@ class TestAdminCleanDeleted:
class TEXT NOT NULL, class TEXT NOT NULL,
type TEXT NOT NULL, type TEXT NOT NULL,
deferred BOOLEAN""") deferred BOOLEAN""")
table_factory('place_interpolation_to_be_deleted',
"""osm_id BIGINT,
osm_type CHAR(1)""")
table_factory('import_polygon_error', """osm_id BIGINT, table_factory('import_polygon_error', """osm_id BIGINT,
osm_type CHAR(1), osm_type CHAR(1),
class TEXT NOT NULL, class TEXT NOT NULL,
type TEXT NOT NULL""") type TEXT NOT NULL""")
temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_delete() temp_db_cursor.execute("""
RETURNS TRIGGER AS $$ CREATE OR REPLACE FUNCTION place_delete() RETURNS TRIGGER AS $$
BEGIN RETURN NULL; END; BEGIN RETURN NULL; END;
$$ LANGUAGE plpgsql;""") $$ LANGUAGE plpgsql;
temp_db_cursor.execute("""CREATE TRIGGER place_before_delete BEFORE DELETE ON place
FOR EACH ROW EXECUTE PROCEDURE place_delete();""") 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') load_sql('functions/utils.sql')
def test_admin_clean_deleted_no_records(self): def test_admin_clean_deleted_no_records(self):

7
test/python/tools/test_database_import.py
View File

@@ -165,12 +165,11 @@ def test_truncate_database_tables(temp_db_conn, temp_db_cursor, table_factory, w
@pytest.mark.parametrize("threads", (1, 5)) @pytest.mark.parametrize("threads", (1, 5))
@pytest.mark.asyncio @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): temp_db_cursor, threads):
for oid in range(100, 130): for oid in range(100, 130):
place_row(osm_id=oid) place_row(osm_id=oid)
place_row(osm_type='W', osm_id=342, cls='place', typ='houses', place_interpolation_row(osm_id=342, typ='odd', geom='LINESTRING(0 0, 10 10)')
geom='LINESTRING(0 0, 10 10)')
temp_db_cursor.execute(""" temp_db_cursor.execute("""
CREATE OR REPLACE FUNCTION placex_insert() RETURNS TRIGGER AS $$ CREATE OR REPLACE FUNCTION placex_insert() RETURNS TRIGGER AS $$
@@ -238,7 +237,7 @@ class TestSetupSQL:
assert not reverse == temp_db_cursor.table_exists('search_name') assert not reverse == temp_db_cursor.table_exists('search_name')
def test_create_table_triggers(self, temp_db_conn, placex_table, osmline_table, def test_create_table_triggers(self, temp_db_conn, placex_table, osmline_table,
postcode_table, load_sql): place_interpolation_table, postcode_table, load_sql):
load_sql('functions.sql') load_sql('functions.sql')
database_import.create_table_triggers(temp_db_conn, self.config) database_import.create_table_triggers(temp_db_conn, self.config)