add support for place=square

Squares are now addressable (on address level 25) and thus can
be attached to a house number via addr:place. Needed to increase
the rank range for matching up addr:place to 25.
This commit is contained in:
Sarah Hoffmann 2020-08-26 12:12:52 +02:00
parent 13dba94307
commit be6ecc388c
3 changed files with 22 additions and 1 deletions

View File

@ -26,6 +26,7 @@
"isolated_dwelling" : [22, 20],
"city_block" : 22,
"mountain_pass" : [20, 0],
"square" : 25,
"houses" : [28, 0],
"farm" : [20, 0],
"locality" : [20, 0]

View File

@ -160,7 +160,7 @@ BEGIN
FROM search_name_-partition-
WHERE name_vector && isin_token
AND centroid && ST_Expand(point, 0.04)
AND search_rank between 16 and 22
AND search_rank between 16 and 25
ORDER BY ST_Distance(centroid, point) ASC limit 1;
RETURN parent;
END IF;

View File

@ -460,3 +460,23 @@ Feature: Parenting of objects
Then placex contains
| object | parent_place_id |
| N10 | W1 |
Scenario: place=square may be parented via addr:place
Given the grid
| | | 9 | | |
| | 5 | | 6 | |
| | 8 | | 7 | |
And the places
| osm | class | type | name+name | geometry |
| W2 | place | square | Foo pl | (5, 6, 7, 8, 5) |
And the places
| osm | class | type | name+name | housenr | addr_place | geometry |
| N10 | shop | grocery | le shop | 5 | Foo pl | 9 |
When importing
Then placex contains
| object | rank_address |
| W2 | 25 |
Then placex contains
| object | parent_place_id |
| N10 | W2 |