Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / search / params.feature

diff --git a/test/bdd/api/search/params.feature b/test/bdd/api/search/params.feature
index cdea3f69e92ce51385fdcc47277ef2fd31e4c581..e27442793d78902e7ed202ca572219e05e41180f 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -59,9 +59,8 @@ Feature: Search queries
           | ID | class   | type |
           | 0  | leisure | dog_park |
         And result addresses contain
           | ID | class   | type |
           | 0  | leisure | dog_park |
         And result addresses contain

-          | ID | address29 |
+          | ID | leisure |

           | 0  | Hundeauslauf |
           | 0  | Hundeauslauf |

-        And address of result 0 has no types leisure,dog_park

 
     Scenario: Disabling deduplication
         When sending json search query "Sievekingsallee, Hamburg"
 
     Scenario: Disabling deduplication
         When sending json search query "Sievekingsallee, Hamburg"


@@ -303,18 +302,6 @@ Feature: Search queries
         | json     | geotext |
         | jsonv2   | geotext |
 
         | json     | geotext |
         | jsonv2   | geotext |
 

-    Scenario Outline: Search result contains polygon-as-points geometry
-        When sending <format> search query "Highmore"
-          | polygon |
-          | 1 |
-        Then result has attributes <response_attribute>
-
-    Examples:
-        | format   | response_attribute |
-        | xml      | polygonpoints |
-        | json     | polygonpoints |
-        | jsonv2   | polygonpoints |
-

     Scenario Outline: Search result contains SVG geometry
         When sending <format> search query "Highmore"
           | polygon_svg |
     Scenario Outline: Search result contains SVG geometry
         When sending <format> search query "Highmore"
           | polygon_svg |


@@ -354,8 +341,8 @@ Feature: Search queries
 
     Scenario Outline: Search result in geojson format contains no non-geojson geometry
         When sending geojson search query "Highmore"
 
     Scenario Outline: Search result in geojson format contains no non-geojson geometry
         When sending geojson search query "Highmore"

-          | polygon_text | polygon | polygon_svg | polygon_geokml |
-          | 1            | 1       | 1           | 1              |
+          | polygon_text | polygon_svg | polygon_geokml |
+          | 1            | 1           | 1              |

         Then result 0 has not attributes <response_attribute>
 
     Examples:
         Then result 0 has not attributes <response_attribute>
 
     Examples: