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 fcd2b603cf0b054c607795720456c94f989548bc..ec8454b08a9757a0e584ee9d03aa4afde84af35c 100644 (file)
--- a/test/bdd/api/search/params.feature
+++ b/test/bdd/api/search/params.feature
@@ -7,13 +7,13 @@ Feature: Search queries
         Then result 0 has attributes place_id,osm_type,osm_id
         And result 0 has attributes place_rank,boundingbox
         And result 0 has attributes lat,lon,display_name
         Then result 0 has attributes place_id,osm_type,osm_id
         And result 0 has attributes place_rank,boundingbox
         And result 0 has attributes lat,lon,display_name

-        And result 0 has attributes class,type,importance,icon
+        And result 0 has attributes class,type,importance

         And result 0 has not attributes address
         And result 0 has bounding box in 46.5,47.5,9,10
 
     Scenario: Simple JSON search
         When sending json search query "Vaduz"
         And result 0 has not attributes address
         And result 0 has bounding box in 46.5,47.5,9,10
 
     Scenario: Simple JSON search
         When sending json search query "Vaduz"

-        Then result 0 has attributes place_id,licence,icon,class,type
+        Then result 0 has attributes place_id,licence,class,type

         And result 0 has attributes osm_type,osm_id,boundingbox
         And result 0 has attributes lat,lon,display_name,importance
         And result 0 has not attributes address
         And result 0 has attributes osm_type,osm_id,boundingbox
         And result 0 has attributes lat,lon,display_name,importance
         And result 0 has not attributes address


@@ -51,7 +51,7 @@ Feature: Search queries
           | en |
         Then results contain
           | display_name |
           | en |
         Then results contain
           | display_name |

-          | Plei Ya Rê, Kon Tum province, Vietnam |
+          | Plei Ya Rê, Vietnam |

 
     Scenario: Address details with unknown class types
         When sending json search query "Hundeauslauf, Hamburg" with address
 
     Scenario: Address details with unknown class types
         When sending json search query "Hundeauslauf, Hamburg" with address


@@ -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"


@@ -111,7 +110,7 @@ Feature: Search queries
         When sending json search query "restaurant"
          | bounded | viewbox |
          | 1       | 9.93027,53.61634,10.10073,53.54500 |
         When sending json search query "restaurant"
          | bounded | viewbox |
          | 1       | 9.93027,53.61634,10.10073,53.54500 |

-        Then result has bounding box in 53.54500,53.61634,9.93027,10.10073
+        Then result has centroid in 53.54500,53.61634,9.93027,10.10073

 
     Scenario: Prefer results within viewbox
         When sending json search query "25 de Mayo" with address
 
     Scenario: Prefer results within viewbox
         When sending json search query "25 de Mayo" with address


@@ -119,13 +118,13 @@ Feature: Search queries
           | en |
         Then result addresses contain
           | ID | state |
           | en |
         Then result addresses contain
           | ID | state |

-          | 0  | Salto |
+          | 0  | Florida |

         When sending json search query "25 de Mayo" with address
           | accept-language | viewbox |
         When sending json search query "25 de Mayo" with address
           | accept-language | viewbox |

-          | en              | -56.35879,-34.18330,-56.31618,-34.20815 |
+          | en              | -57.95468,-31.39261,-57.94741,-31.39490 |

         Then result addresses contain
           | ID | state |
         Then result addresses contain
           | ID | state |

-          | 0  | Florida |
+          | 0  | Salto |

 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"
 
     Scenario: viewboxes cannot be points
         When sending json search query "foo"


@@ -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: