Merge remote-tracking branch 'upstream/master'

[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..7c5c73e2657cb8096a0f1380d187eb1aa8383a24 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