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 b04a971f17a862910c4a86f2594ab53b6e3487b5..531483b316bfce5d29dfa9d4e169175fa0f4c82d 100644 (file)
--- a/test/bdd/db/import/placex.feature
+++ b/test/bdd/db/import/placex.feature
@@ -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               |


@@ -176,20 +175,19 @@ Feature: Import into placex
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |
           | N22    | 20          | 20 |
           | N20    | 18          | 16 |
           | N21    | 19          | 16 |
           | N22    | 20          | 20 |

-          | N23    | 19          | 16 |
+          | 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 |
           | N101   | 15          | 16 |
           | N31    | 20          | 0 |
           | N32    | 20          | 0 |
           | N33    | 20          | 0 |
           | N34    | 20          | 0 |
           | 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 |