Merge remote-tracking branch 'upstream/master' into collect_os_info.sh

[nominatim.git] / test / bdd / db / query / linking.feature

diff --git a/test/bdd/db/query/linking.feature b/test/bdd/db/query/linking.feature
index bd8e1da0329c58dfc19a03c8b7bfd69e5314f60b..351f88710bd0c14de08b99a6e67e0e14b5c444d4 100644 (file)
--- a/test/bdd/db/query/linking.feature
+++ b/test/bdd/db/query/linking.feature
@@ -3,12 +3,16 @@ Feature: Searching linked places
     Tests that information from linked places can be searched correctly
 
     Scenario: Additional names from linked places are searchable
     Tests that information from linked places can be searched correctly
 
     Scenario: Additional names from linked places are searchable

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 2 |    |
+         | 13 |   | 12 |

         Given the places
          | osm  | class    | type           | admin | name  | geometry |
         Given the places
          | osm  | class    | type           | admin | name  | geometry |

-         | R13  | boundary | administrative | 6     | Garbo | poly-area:0.1 |
+         | R13  | boundary | administrative | 6     | Garbo | (10,11,12,13,10) |

         Given the places
         Given the places

-         | osm  | class    | type           | admin | name+name:it | geometry |
-         | N2   | place    | hamlet         | 15    | Vario        | 0.006 0.00001 |
+         | osm  | class    | type           | admin | name+name:it |
+         | N2   | place    | hamlet         | 15    | Vario        |

         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |
         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |


@@ -31,12 +35,16 @@ Feature: Searching linked places
 
 
     Scenario: Differing names from linked places are searchable
 
 
     Scenario: Differing names from linked places are searchable

+        Given the 0.1 grid
+         | 10 |   | 11 |
+         |    | 2 |    |
+         | 13 |   | 12 |

         Given the places
          | osm  | class    | type           | admin | name  | geometry |
         Given the places
          | osm  | class    | type           | admin | name  | geometry |

-         | R13  | boundary | administrative | 6     | Garbo | poly-area:0.1 |
+         | R13  | boundary | administrative | 6     | Garbo | (10,11,12,13,10) |

         Given the places
         Given the places

-         | osm  | class    | type           | admin | name  | geometry |
-         | N2   | place    | hamlet         | 15    | Vario | 0.006 0.00001 |
+         | osm  | class    | type           | admin | name  |
+         | N2   | place    | hamlet         | 15    | Vario |

         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |
         And the relations
          | id | members       | tags+type |
          | 13 | N2:label      | boundary |