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

fix DB bd tests for address hstore

Browse Source
This commit is contained in:
Sarah Hoffmann
2017-03-26 21:19:52 +02:00
parent 49b5e4dbad
commit 8c7fa0213f
5 changed files with 268 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/bdd/db/import/interpolation.feature
View File

@@ -7,6 +7,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 6 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001 |
And the ways
| id | nodes |
@@ -21,6 +23,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 6 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1.001, 1 1 |
And the ways
| id | nodes |
@@ -35,6 +39,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 1 | 1 1 |
| N2 | place | house | 11 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | odd | 1 1, 1 1.001 |
And the ways
| id | nodes |
@@ -49,6 +55,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 1 | 1 1 |
| N2 | place | house | 3 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | all | 1 1, 1 1.001 |
And the ways
| id | nodes |
@@ -63,6 +71,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 10 | 1.001 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 |
And the ways
| id | nodes |
@@ -77,6 +87,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 10 | 1.001 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 |
And the ways
| id | nodes |
@@ -92,6 +104,8 @@ Feature: Import of address interpolations
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 14 | 1.001 1.001 |
| N3 | place | house | 10 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 |
And the ways
| id | nodes |
@@ -109,6 +123,8 @@ Feature: Import of address interpolations
| N2 | place | house | 14 | 1.001 1.001 |
| N3 | place | house | 10 | 1 1.001 |
| N4 | place | house | 18 | 1.001 1.002 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001, 1.001 1.002 |
And the ways
| id | nodes |
@@ -126,6 +142,8 @@ Feature: Import of address interpolations
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 14 | 1.001 1.001 |
| N3 | place | house | 10 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1.001 1.001, 1 1.001, 1 1 |
And the ways
| id | nodes |
@@ -142,6 +160,8 @@ Feature: Import of address interpolations
| N1 | place | house | 2 | 1 1 |
| N2 | place | house | 8 | 1.001 1.001 |
| N3 | place | house | 7 | 1 1.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 1 1, 1 1.001, 1.001 1.001 |
And the ways
| id | nodes |
@@ -158,6 +178,8 @@ Feature: Import of address interpolations
| N1 | place | house | 2 | 0 0 |
| N2 | place | house | 6 | 0 0.001 |
| N3 | place | house | 10 | 0 0.002 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 0 0, 0 0.001, 0 0.002, 0 0.001 |
And the ways
| id | nodes |
@@ -174,6 +196,8 @@ Feature: Import of address interpolations
| osm | class | type | housenr | geometry |
| N1 | place | house | 2 | 0 0 |
| N2 | place | house | 6 | 0 0.001 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 0 0, 0 0.001, 0 0.002, 0 0.001 |
And the ways
| id | nodes |
@@ -192,7 +216,7 @@ Feature: Import of address interpolations
| N3 | place | house | 12 | :n-middle-w |
| N4 | place | house | 16 | :n-middle-e |
And the places
| osm | class | type | housenr | street | geometry |
| osm | class | type | addr+interpolation | street | geometry |
| W10 | place | houses | even | | :w-middle |
| W11 | place | houses | even | Cloud Street | :w-middle |
And the places
@@ -238,9 +262,9 @@ Feature: Import of address interpolations
| N3 | place | house | 12 | Cloud Street | :n-middle-w |
| N4 | place | house | 16 | Cloud Street | :n-middle-e |
And the places
| osm | class | type | housenr | geometry |
| W10 | place | houses | even | :w-middle |
| W11 | place | houses | even | :w-middle |
| osm | class | type | addr+interpolation | geometry |
| W10 | place | houses | even | :w-middle |
| W11 | place | houses | even | :w-middle |
And the places
| osm | class | type | name | geometry |
| W2 | highway | tertiary | Sun Way | :w-north |
@@ -277,7 +301,9 @@ Feature: Import of address interpolations
| N1 | place | house | 10 | 144.9632341 -37.76163 |
| N2 | place | house | 6 | 144.9630541 -37.7628174 |
| N3 | shop | supermarket | 2 | 144.9629794 -37.7630755 |
| W1 | place | houses | even | 144.9632341 -37.76163,144.9630541 -37.7628172,144.9629794 -37.7630755 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | even | 144.9632341 -37.76163,144.9630541 -37.7628172,144.9629794 -37.7630755 |
And the ways
| id | nodes |
| 1 | 1,2,3 |
@@ -288,19 +314,23 @@ Feature: Import of address interpolations
| 6 | 10 | 144.9630541 -37.7628174, 144.9632341 -37.76163 |
Scenario: Place with missing address information
Given the places
| osm | class | type | housenr | geometry |
| N1 | place | house | 23 | 0.0001 0.0001 |
| N2 | amenity | school | | 0.0001 0.0002 |
| N3 | place | house | 29 | 0.0001 0.0004 |
| W1 | place | houses | odd | 0.0001 0.0001,0.0001 0.0002,0.0001 0.0004 |
Given the grid
| 1 | | 2 | | | 3 |
And the places
| osm | class | type | housenr |
| N1 | place | house | 23 |
| N2 | amenity | school | |
| N3 | place | house | 29 |
And the places
| osm | class | type | addr+interpolation | geometry |
| W1 | place | houses | odd | 1,2,3 |
And the ways
| id | nodes |
| 1 | 1,2,3 |
When importing
Then W1 expands to interpolation
| start | end | geometry |
| 23 | 29 | 0.0001 0.0001, 0.0001 0.0002, 0.0001 0.0004 |
| 23 | 29 | 1,2,3 |
Scenario: Ways without node entries are ignored
Given the places

16
test/bdd/db/import/naming.feature
View File

@@ -8,8 +8,8 @@ Feature: Import and search of names
| N1 | place | locality | german | country:de |
When importing
Then placex contains
| object | calculated_country_code | name+name |
| N1 | de | german |
| object | country_code | name+name |
| N1 | de | german |
Scenario: Copying name tag to default language if it does not exist
Given the places
@@ -17,8 +17,8 @@ Feature: Import and search of names
| N1 | place | locality | german | finnish | country:de |
When importing
Then placex contains
| object | calculated_country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | german |
| object | country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | german |
Scenario: Copying default language name tag to name if it does not exist
Given the places
@@ -26,8 +26,8 @@ Feature: Import and search of names
| N1 | place | locality | german | finnish | country:de |
When importing
Then placex contains
| object | calculated_country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | german |
| object | country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | german |
Scenario: Do not overwrite default language with name tag
Given the places
@@ -35,5 +35,5 @@ Feature: Import and search of names
| N1 | place | locality | german | finnish | local | country:de |
When importing
Then placex contains
| object | calculated_country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | local |
| object | country_code | name | name+name:fi | name+name:de |
| N1 | de | german | finnish | local |

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

@@ -8,8 +8,8 @@ Feature: Import into placex
| N1 | highway | primary | country:us |
When importing
Then placex contains
| object | country_code | calculated_country_code |
| N1 | None | us |
| object | addr+country | country_code |
| N1 | - | us |
Scenario: Location overwrites country code tag
Given the named places
@@ -17,8 +17,8 @@ Feature: Import into placex
| N1 | highway | primary | de | country:us |
When importing
Then placex contains
| object | country_code | calculated_country_code |
| N1 | de | us |
| object | addr+country | country_code |
| N1 | de | us |
Scenario: Country code tag overwrites location for countries
Given the named places
@@ -26,8 +26,8 @@ Feature: Import into placex
| R1 | boundary | administrative | 2 | de | (-100 40, -101 40, -101 41, -100 41, -100 40) |
When importing
Then placex contains
| object | country_code | calculated_country_code |
| R1 | de | de |
| object | addr+country | country_code |
| R1 | de | de |
Scenario: Illegal country code tag for countries is ignored
Given the named places
@@ -35,8 +35,8 @@ Feature: Import into placex
| R1 | boundary | administrative | 2 | xx | (-100 40, -101 40, -101 41, -100 41, -100 40) |
When importing
Then placex contains
| object | country_code | calculated_country_code |
| R1 | xx | us |
| object | addr+country | country_code |
| R1 | xx | us |
Scenario: admin level is copied over
Given the named places
@@ -47,24 +47,6 @@ Feature: Import into placex
| object | admin_level |
| N1 | 3 |
Scenario: admin level is default 15
Given the named places
| osm | class | type |
| N1 | amenity | prison |
When importing
Then placex contains
| object | admin_level |
| N1 | 15 |
Scenario: admin level is never larger than 15
Given the named places
| osm | class | type | admin |
| N1 | amenity | prison | 16 |
When importing
Then placex contains
| object | admin_level |
| N1 | 15 |
Scenario: postcode node without postcode is dropped
Given the places
| osm | class | type | name+ref |
@@ -87,10 +69,10 @@ Feature: Import into placex
| N3 | place | postcode | Y45 | country:gb |
When importing
Then placex contains
| object | postcode | calculated_country_code | rank_search | rank_address |
| N1 | E45 2CD | gb | 25 | 5 |
| N2 | E45 2 | gb | 23 | 5 |
| N3 | Y45 | gb | 21 | 5 |
| object | postcode | country_code | rank_search | rank_address |
| N1 | E45 2CD | gb | 25 | 5 |
| N2 | E45 2 | gb | 23 | 5 |
| N3 | Y45 | gb | 21 | 5 |
Scenario: wrongly formatted GB postcodes are down-ranked
Given the places
@@ -100,10 +82,10 @@ Feature: Import into placex
| N3 | place | postcode | y45 | country:gb |
When importing
Then placex contains
| object | calculated_country_code | rank_search | rank_address |
| N1 | gb | 30 | 30 |
| N2 | gb | 30 | 30 |
| N3 | gb | 30 | 30 |
| object | country_code | rank_search | rank_address |
| N1 | gb | 30 | 30 |
| N2 | gb | 30 | 30 |
| N3 | gb | 30 | 30 |
Scenario: search and address rank for DE postcodes correctly assigned
Given the places
@@ -114,11 +96,11 @@ Feature: Import into placex
| N4 | place | postcode | 564276 | country:de |
When importing
Then placex contains
| object | calculated_country_code | rank_search | rank_address |
| N1 | de | 21 | 11 |
| N2 | de | 30 | 30 |
| N3 | de | 30 | 30 |
| N4 | de | 30 | 30 |
| object | country_code | rank_search | rank_address |
| N1 | de | 21 | 11 |
| N2 | de | 30 | 30 |
| N3 | de | 30 | 30 |
| N4 | de | 30 | 30 |
Scenario: search and address rank for other postcodes are correctly assigned
Given the places
@@ -134,16 +116,16 @@ Feature: Import into placex
| N9 | place | postcode | A1:bc10 | country:ca |
When importing
Then placex contains
| object | calculated_country_code | rank_search | rank_address |
| N1 | ca | 21 | 11 |
| N2 | ca | 21 | 11 |
| N3 | ca | 21 | 11 |
| N4 | ca | 21 | 11 |
| N5 | ca | 21 | 11 |
| N6 | ca | 21 | 11 |
| N7 | ca | 25 | 11 |
| N8 | ca | 25 | 11 |
| N9 | ca | 25 | 11 |
| object | country_code | rank_search | rank_address |
| N1 | ca | 21 | 11 |
| N2 | ca | 21 | 11 |
| N3 | ca | 21 | 11 |
| N4 | ca | 21 | 11 |
| N5 | ca | 21 | 11 |
| N6 | ca | 21 | 11 |
| N7 | ca | 25 | 11 |
| N8 | ca | 25 | 11 |
| N9 | ca | 25 | 11 |
Scenario: search and address ranks for places are correctly assigned
Given the named places