Remove country and state nodes from address computation

[nominatim.git] / test / bdd / db / import / placex.feature

diff --git a/test/bdd/db/import/placex.feature b/test/bdd/db/import/placex.feature
index f124e482b1b3a83d7b60652431b49db08735ec05..08ba9cbd8e46283106b0abcdac7cf793dab3dfe4 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -70,22 +70,20 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | postcode | country_code | rank_search | rank_address |
         When importing
         Then placex contains
          | 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 |
+         | N1     | E45 2CD  | gb           | 25          | 0 |
+         | N2     | E45 2    | gb           | 23          | 0 |
+         | N3     | Y45      | gb           | 21          | 0 |

 
     Scenario: wrongly formatted GB postcodes are down-ranked
         Given the places
          | osm  | class | type     | postcode | geometry |
          | N1   | place | postcode | EA452CD  | country:gb |
          | N2   | place | postcode | E45 23   | country:gb |
 
     Scenario: wrongly formatted GB postcodes are down-ranked
         Given the places
          | osm  | class | type     | postcode | geometry |
          | N1   | place | postcode | EA452CD  | country:gb |
          | N2   | place | postcode | E45 23   | country:gb |

-         | N3   | place | postcode | y45      | country:gb |

         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |

-         | N1     | gb           | 30          | 30 |
-         | N2     | gb           | 30          | 30 |
-         | N3     | gb           | 30          | 30 |
+         | N1     | gb           | 30          | 0 |
+         | N2     | gb           | 30          | 0 |

 
     Scenario: search and address rank for DE postcodes correctly assigned
         Given the places
 
     Scenario: search and address rank for DE postcodes correctly assigned
         Given the places


@@ -97,10 +95,10 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |

-         | N1     | de           | 21          | 11 |
-         | N2     | de           | 30          | 30 |
-         | N3     | de           | 30          | 30 |
-         | N4     | de           | 30          | 30 |
+         | N1     | de           | 21          | 0 |
+         | N2     | de           | 30          | 0 |
+         | N3     | de           | 30          | 0 |
+         | N4     | de           | 30          | 0 |

 
     Scenario: search and address rank for other postcodes are correctly assigned
         Given the places
 
     Scenario: search and address rank for other postcodes are correctly assigned
         Given the places


@@ -117,15 +115,15 @@ Feature: Import into placex
         When importing
         Then placex contains
          | object | country_code | rank_search | rank_address |
         When importing
         Then placex contains
          | 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 |
+         | N1     | ca           | 21          | 0 |
+         | N2     | ca           | 21          | 0 |
+         | N3     | ca           | 21          | 0 |
+         | N4     | ca           | 21          | 0 |
+         | N5     | ca           | 21          | 0 |
+         | N6     | ca           | 21          | 0 |
+         | N7     | ca           | 25          | 0 |
+         | N8     | ca           | 25          | 0 |
+         | N9     | ca           | 25          | 0 |

 
     Scenario: search and address ranks for places are correctly assigned
         Given the named places
 
     Scenario: search and address ranks for places are correctly assigned
         Given the named places


@@ -170,10 +168,10 @@ Feature: Import into placex
           | object | rank_search | rank_address |
           | N1     | 30          | 30 |
           | N11    | 30          | 30 |
           | object | rank_search | rank_address |
           | N1     | 30          | 30 |
           | N11    | 30          | 30 |

-          | N12    | 2           | 2 |
+          | N12    | 2           | 0 |

           | N13    | 2           | 0 |
           | N13    | 2           | 0 |

-          | N14    | 4           | 4 |
-          | N15    | 8           | 8 |
+          | N14    | 4           | 0 |
+          | N15    | 8           | 0 |

           | N16    | 18          | 0 |
           | N17    | 12          | 12 |
           | N18    | 16          | 16 |
           | N16    | 18          | 0 |
           | N17    | 12          | 12 |
           | N18    | 16          | 16 |


@@ -213,6 +211,10 @@ Feature: Import into placex
           | R21 | boundary | administrative | 32    | (3 3, 4 4, 3 4, 3 3) |
           | R22 | boundary | nature_park    | 6     | (0 0, 1 0, 0 1, 0 0) |
           | R23 | boundary | natural_reserve| 10    | (0 0, 1 1, 1 0, 0 0) |
           | R21 | boundary | administrative | 32    | (3 3, 4 4, 3 4, 3 3) |
           | R22 | boundary | nature_park    | 6     | (0 0, 1 0, 0 1, 0 0) |
           | R23 | boundary | natural_reserve| 10    | (0 0, 1 1, 1 0, 0 0) |

+        And the named places
+          | osm | class | type    | geometry |
+          | R40 | place | country | (1 1, 2 2, 1 2, 1 1) |
+          | R41 | place | state   | (3 3, 4 4, 3 4, 3 3) |

         When importing
         Then placex has no entry for N1
         And placex has no entry for W10
         When importing
         Then placex has no entry for N1
         And placex has no entry for W10


@@ -222,6 +224,8 @@ Feature: Import into placex
           | R21    | 30          | 30 |
           | R22    | 12          | 0 |
           | R23    | 20          | 0 |
           | R21    | 30          | 30 |
           | R22    | 12          | 0 |
           | R23    | 20          | 0 |

+          | R40    | 4           | 4 |
+          | R41    | 8           | 8 |

 
     Scenario: search and address ranks for highways correctly assigned
         Given the scene roads-with-pois
 
     Scenario: search and address ranks for highways correctly assigned
         Given the scene roads-with-pois