safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge branch 'observe-bounded-viewbox-in-postcode-search' of https://github.com/mtmail/Nominatim into mtmail-observe-bounded-viewbox-in-postcode-search

Browse Source
This commit is contained in:
Sarah Hoffmann
2019-04-14 11:29:28 +02:00
parent a7e7823535 c9a6350894
commit e5eb7ecdc1
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/SearchDescription.php
View File

@@ -588,6 +588,9 @@ class SearchDescription
$sSQL .= "p.postcode = '".reset($this->aName)."'"; $sSQL .= "p.postcode = '".reset($this->aName)."'";
$sSQL .= $this->countryCodeSQL(' AND p.country_code'); $sSQL .= $this->countryCodeSQL(' AND p.country_code');
if ($this->oContext->bViewboxBounded) {
$sSQL .= ' AND ST_Intersects('.$this->oContext->sqlViewboxSmall.', geometry)';
}
$sSQL .= $this->oContext->excludeSQL(' AND p.place_id'); $sSQL .= $this->oContext->excludeSQL(' AND p.place_id');
$sSQL .= " LIMIT $iLimit"; $sSQL .= " LIMIT $iLimit";

12
test/bdd/api/search/postcode.feature
View File

@@ -26,6 +26,18 @@ Feature: Searches with postcodes
| country_code | | country_code |
| li | | li |
Scenario: Postcode search with bounded viewbox restriction
When sending json search query "9486" with address
| bounded | viewbox |
| 1 | 9.55,47.20,9.58,47.22 |
Then result addresses contain
| postcode |
| 9486 |
When sending json search query "9486" with address
| bounded | viewbox |
| 1 | 5.00,20.00,6.00,21.00 |
Then exactly 0 results are returned
Scenario: Postcode search with structured query Scenario: Postcode search with structured query
When sending json search query "" with address When sending json search query "" with address
| postalcode | country | | postalcode | country |