hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

adapt tests to ranking changes

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-09-01 18:03:17 +02:00
parent 07430b0194
commit b6078de6f8
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/bdd/db/import/placex.feature
View File

@@ -148,9 +148,9 @@ Feature: Import into placex
And placex contains And placex contains
| object | rank_search | rank_address | | object | rank_search | rank_address |
| R20 | 4 | 4 | | R20 | 4 | 4 |
| R21 | 30 | 30 | | R21 | 25 | 0 |
| R22 | 30 | 30 | | R22 | 25 | 0 |
| R23 | 30 | 30 | | R23 | 25 | 0 |
| R40 | 4 | 0 | | R40 | 4 | 0 |
| R41 | 8 | 0 | | R41 | 8 | 0 |

8
test/bdd/db/import/rank_computation.feature
View File

@@ -24,7 +24,7 @@ Feature: Rank assignment
Then placex contains Then placex contains
| object | rank_search | rank_address | | object | rank_search | rank_address |
| N1 | 30 | 30 | | N1 | 30 | 30 |
| N11 | 30 | 30 | | N11 | 22 | 0 |
| N12 | 2 | 0 | | N12 | 2 | 0 |
| N13 | 2 | 0 | | N13 | 2 | 0 |
| N14 | 4 | 0 | | N14 | 4 | 0 |
@@ -48,11 +48,11 @@ Feature: Rank assignment
Then placex contains Then placex contains
| object | rank_search | rank_address | | object | rank_search | rank_address |
| R20 | 4 | 4 | | R20 | 4 | 4 |
| R21 | 30 | 30 | | R21 | 25 | 0 |
| R22 | 12 | 12 | | R22 | 12 | 12 |
| R23 | 20 | 20 | | R23 | 20 | 20 |
Scenario: Ranks for boundaries with place assignment go with place address ranks if available Scenario: Ranks for addressable boundaries with place assignment go with place address ranks if available
Given the named places Given the named places
| osm | class | type | admin | extra+place | geometry | | osm | class | type | admin | extra+place | geometry |
| R20 | boundary | administrative | 3 | state | (1 1, 2 2, 1 2, 1 1) | | R20 | boundary | administrative | 3 | state | (1 1, 2 2, 1 2, 1 1) |
@@ -63,7 +63,7 @@ Feature: Rank assignment
Then placex contains Then placex contains
| object | rank_search | rank_address | | object | rank_search | rank_address |
| R20 | 6 | 6 | | R20 | 6 | 6 |
| R21 | 30 | 20 | | R21 | 25 | 0 |
| R22 | 12 | 16 | | R22 | 12 | 16 |
| R23 | 20 | 16 | | R23 | 20 | 16 |

10
test/bdd/db/update/simple.feature
View File

@@ -28,10 +28,10 @@ Feature: Update of simple objects
Scenario: Do delete large features of low rank Scenario: Do delete large features of low rank
Given the named places Given the named places
| osm | class | type | geometry | | osm | class | type | geometry |
| W1 | place | house | poly-area:5.0 | | W1 | place | house | poly-area:5.0 |
| R1 | boundary | national_park | poly-area:5.0 | | R1 | natural | wood | poly-area:5.0 |
| R2 | highway | residential | poly-area:5.0 | | R2 | highway | residential | poly-area:5.0 |
When importing When importing
Then placex contains Then placex contains
| object | rank_address | | object | rank_address |
@@ -106,4 +106,4 @@ Feature: Update of simple objects
| W1 | boundary | historic | Haha | 5 | (1, 2, 4, 3, 1) | | W1 | boundary | historic | Haha | 5 | (1, 2, 4, 3, 1) |
Then placex contains Then placex contains
| object | rank_address | | object | rank_address |
| W1 | 30 | | W1 | 0 |

3
test/bdd/steps/db_ops.py
View File

@@ -110,6 +110,9 @@ class PlaceObjName(object):
if self.pid is None: if self.pid is None:
return "<null>" return "<null>"
if self.pid == 0:
return "place ID 0"
cur = self.conn.cursor() cur = self.conn.cursor()
cur.execute("""SELECT osm_type, osm_id, class cur.execute("""SELECT osm_type, osm_id, class
FROM placex WHERE place_id = %s""", FROM placex WHERE place_id = %s""",