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 08ba9cbd8e46283106b0abcdac7cf793dab3dfe4..531483b316bfce5d29dfa9d4e169175fa0f4c82d 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -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
           | R1  | boundary | administrative  | 2     | de      | (-100 40, -101 40, -101 41, -100 41, -100 40) |
         When importing
         Then placex contains

-          | object | addr+country | country_code |
-          | R1     | de           | de           |
+          | object | rank_search| addr+country | country_code |
+          | R1     | 4          | de           | de           |

 
     Scenario: Illegal country code tag for countries is ignored
         Given the named places
 
     Scenario: Illegal country code tag for countries is ignored
         Given the named places


@@ -143,7 +143,6 @@ Feature: Import into placex
           | N22  | place     | hamlet    |
           | N23  | place     | municipality |
           | N24  | place     | district     |
           | N22  | place     | hamlet    |
           | N23  | place     | municipality |
           | N24  | place     | district     |

-          | N25  | place     | unincorporated_area |

           | N26  | place     | borough             |
           | N27  | place     | suburb              |
           | N28  | place     | croft               |
           | N26  | place     | borough             |
           | N27  | place     | suburb              |
           | N28  | place     | croft               |


@@ -157,9 +156,6 @@ Feature: Import into placex
           | N36  | place     | house               |
           | N37  | place     | building            |
           | N38  | place     | houses              |
           | N36  | place     | house               |
           | N37  | place     | building            |
           | N38  | place     | houses              |

-        And the named places
-          | osm  | class     | type      | extra+locality |
-          | N100 | place     | locality  | townland |

         And the named places
           | osm  | class     | type      | extra+capital |
           | N101 | place     | city      | yes |
         And the named places
           | osm  | class     | type      | extra+capital |
           | N101 | place     | city      | yes |


@@ -178,22 +174,20 @@ Feature: Import into placex
           | N19    | 17          | 0 |
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |
           | N19    | 17          | 0 |
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |

-          | N22    | 19          | 16 |
-          | N23    | 19          | 16 |
+          | N22    | 20          | 20 |
+          | N23    | 14          | 14 |

           | N24    | 19          | 16 |
           | N24    | 19          | 16 |

-          | N25    | 19          | 16 |
-          | N26    | 19          | 16 |
-          | N27    | 20          | 20 |
+          | N26    | 18          | 18 |
+          | N27    | 19          | 20 |

           | N28    | 20          | 20 |
           | N29    | 20          | 20 |
           | N28    | 20          | 20 |
           | N29    | 20          | 20 |

-          | N30    | 20          | 20 |
+          | N30    | 22          | 20 |

           | N31    | 20          | 0 |
           | N32    | 20          | 0 |
           | N33    | 20          | 0 |
           | N34    | 20          | 0 |
           | N31    | 20          | 0 |
           | N32    | 20          | 0 |
           | N33    | 20          | 0 |
           | N34    | 20          | 0 |

-          | N100   | 20          | 20 |

           | N101   | 15          | 16 |
           | N101   | 15          | 16 |

-          | N35    | 22          | 22 |
+          | N35    | 20          | 22 |

           | N36    | 30          | 30 |
           | N37    | 30          | 30 |
           | N38    | 28          | 0 |
           | N36    | 30          | 30 |
           | N37    | 30          | 30 |
           | N38    | 28          | 0 |


@@ -222,10 +216,10 @@ Feature: Import into placex
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |
           | R21    | 30          | 30 |
           | object | rank_search | rank_address |
           | R20    | 4           | 4 |
           | R21    | 30          | 30 |

-          | R22    | 12          | 0 |
-          | R23    | 20          | 0 |
-          | R40    | 4           | 4 |
-          | R41    | 8           | 8 |
+          | R22    | 30          | 30 |
+          | R23    | 30          | 30 |
+          | R40    | 4           | 0 |
+          | R41    | 8           | 0 |

 
     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


@@ -243,7 +237,7 @@ Feature: Import into placex
         When importing
         Then placex contains
           | object | rank_search | rank_address |
         When importing
         Then placex contains
           | object | rank_search | rank_address |

-          | N1     | 30          | 30 |
+          | N1     | 30          |  0 |

           | W1     | 26          | 26 |
           | W2     | 26          | 26 |
           | W3     | 26          | 26 |
           | W1     | 26          | 26 |
           | W2     | 26          | 26 |
           | W3     | 26          | 26 |


@@ -264,11 +258,11 @@ Feature: Import into placex
         When importing
         Then placex contains
           | object | rank_search | rank_address |
         When importing
         Then placex contains
           | object | rank_search | rank_address |

-          | N2     | 30          | 30 |
-          | W2     | 30          | 30 |
+          | N2     | 30          |  0 |
+          | W2     | 30          |  0 |

           | W4     | 22          | 22 |
           | R2     | 22          | 22 |
           | W4     | 22          | 22 |
           | R2     | 22          | 22 |

-          | R3     | 22          | 0 |
+          | R3     | 22          |  0 |

 
     Scenario: rank and inclusion of naturals
        Given the named places
 
     Scenario: rank and inclusion of naturals
        Given the named places


@@ -292,8 +286,27 @@ Feature: Import into placex
           | N5     | 30          | 30 |
           | W2     | 18          | 0 |
           | R3     | 18          | 0 |
           | N5     | 30          | 30 |
           | W2     | 18          | 0 |
           | R3     | 18          | 0 |

-          | R4     | 22          | 0 |
-          | R5     | 4           | 4 |
-          | R6     | 4           | 4 |
+          | R4     | 30          | 30 |
+          | R5     | 4           | 0 |
+          | R6     | 4           | 0 |

           | W3     | 30          | 30 |
 
           | W3     | 30          | 30 |
 

+    Scenario: boundary ways for countries and states are ignored
+        Given the named places
+          | osm | class    | type           | admin | geometry |
+          | W4  | boundary | administrative | 2     | poly-area:0.1 |
+          | R4  | boundary | administrative | 2     | poly-area:0.1 |
+          | W5  | boundary | administrative | 3     | poly-area:0.1 |
+          | R5  | boundary | administrative | 3     | poly-area:0.1 |
+          | W6  | boundary | administrative | 4     | poly-area:0.1 |
+          | R6  | boundary | administrative | 4     | poly-area:0.1 |
+          | W7  | boundary | administrative | 5     | poly-area:0.1 |
+          | R7  | boundary | administrative | 5     | poly-area:0.1 |
+       When importing
+       Then placex contains exactly
+           | object |
+           | R4     |
+           | R5     |
+           | R6     |
+           | W7     |
+           | R7     |