Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/import/interpolation.feature b/test/bdd/db/import/interpolation.feature
index d7ac9a4f2d6fd5c563442116f2fa2ada091eec02..52971295c5ced00253e7f39b6151f3640fe51fb2 100644 (file)
--- a/test/bdd/db/import/interpolation.feature
+++ b/test/bdd/db/import/interpolation.feature
@@ -248,10 +248,6 @@ Feature: Import of address interpolations
         Then results contain
          | ID | osm_type | osm_id |
          | 0  | W        | 11 |
         Then results contain
          | ID | osm_type | osm_id |
          | 0  | W        | 11 |

-        When searching for "18 Cloud Street"
-        Then results contain
-         | ID | osm_type | osm_id |
-         | 0  | W        | 3 |

 
     Scenario: addr:street on housenumber way
         Given the scene parallel-road
 
     Scenario: addr:street on housenumber way
         Given the scene parallel-road


@@ -348,3 +344,23 @@ Feature: Import of address interpolations
         When importing
         Then W1 expands to no interpolation
 
         When importing
         Then W1 expands to no interpolation
 

+    Scenario: Two point interpolation starting at 0
+        Given the places
+          | osm | class | type   | housenr | geometry |
+          | N1  | place | house  | 0       | 1 1 |
+          | N2  | place | house  | 2       | 1 1.001 |
+        And the places
+          | osm | class | type   | addr+interpolation | geometry |
+          | W1  | place | houses | even     | 1 1, 1 1.001 |
+        And the ways
+          | id | nodes |
+          | 1  | 1,2 |
+        When importing
+        Then W1 expands to interpolation
+          | start | end | geometry |
+          | 0     | 2   | 1 1, 1 1.001 |
+        When sending jsonv2 reverse coordinates 1,1
+        Then results contain
+          | ID | osm_type | osm_id | type  | display_name |
+          | 0  | way      | 1      | house | 0 |
+