Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / reverse / simple.feature

diff --git a/test/bdd/api/reverse/simple.feature b/test/bdd/api/reverse/simple.feature
index 2b4847364592e35d845b064854b08ab67bdcc446..b07989eccf09ca6e66cbd0976f75cc3a4e7a2d72 100644 (file)
--- a/test/bdd/api/reverse/simple.feature
+++ b/test/bdd/api/reverse/simple.feature
@@ -11,6 +11,8 @@ Feature: Simple Reverse Tests
         Then the result is valid json
         When sending jsonv2 reverse coordinates <lat>,<lon>
         Then the result is valid json
         Then the result is valid json
         When sending jsonv2 reverse coordinates <lat>,<lon>
         Then the result is valid json

+        When sending geojson reverse coordinates <lat>,<lon>
+        Then the result is valid geojson

         When sending html reverse coordinates <lat>,<lon>
         Then the result is valid html
 
         When sending html reverse coordinates <lat>,<lon>
         Then the result is valid html
 


@@ -42,11 +44,17 @@ Feature: Simple Reverse Tests
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid json
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid json

+        When sending geojson reverse coordinates 53.603,10.041
+          | param       | value   |
+          | <parameter> | <value> |
+        Then the result is valid geojson
+        When sending geocodejson reverse coordinates 53.603,10.041
+          | param       | value   |
+          | <parameter> | <value> |
+        Then the result is valid geocodejson

 
     Examples:
      | parameter        | value |
 
     Examples:
      | parameter        | value |

-     | polygon          | 1 |
-     | polygon          | 0 |

      | polygon_text     | 1 |
      | polygon_text     | 0 |
      | polygon_kml      | 1 |
      | polygon_text     | 1 |
      | polygon_text     | 0 |
      | polygon_kml      | 1 |


@@ -60,24 +68,25 @@ Feature: Simple Reverse Tests
         When sending <format> reverse coordinates 67.3245,0.456
         | json_callback |
         | foo |
         When sending <format> reverse coordinates 67.3245,0.456
         | json_callback |
         | foo |

-        Then the result is valid json
+        Then the result is valid <outformat>

 
     Examples:
 
     Examples:

-      | format |
-      | json |
-      | jsonv2 |
+      | format | outformat |
+      | json | json |
+      | jsonv2 | json |
+      | geojson | geojson |

 
 

-    @wip

     Scenario Outline: Boundingbox is returned
         When sending <format> reverse coordinates 14.62,108.1
           | zoom |
     Scenario Outline: Boundingbox is returned
         When sending <format> reverse coordinates 14.62,108.1
           | zoom |

-          | 4 |
+          | 8 |

         Then result has bounding box in 9,20,102,113
 
     Examples:
       | format |
       | json |
       | jsonv2 |
         Then result has bounding box in 9,20,102,113
 
     Examples:
       | format |
       | json |
       | jsonv2 |

+      | geojson |

       | xml |
 
     Scenario Outline: Reverse-geocoding with zoom
       | xml |
 
     Scenario Outline: Reverse-geocoding with zoom


@@ -90,6 +99,7 @@ Feature: Simple Reverse Tests
       | format |
       | json |
       | jsonv2 |
       | format |
       | json |
       | jsonv2 |

+      | geojson |

       | html |
       | xml |
 
       | html |
       | xml |