simplify sql and website creation functions

[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 3f4bd6eb30f589c4dff6e1cf371c28844d2a953c..4da311e78a9270b9250ffabe5400b1d68fa2e6df 100644 (file)
--- a/test/bdd/api/reverse/simple.feature
+++ b/test/bdd/api/reverse/simple.feature
@@ -11,8 +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 html reverse coordinates <lat>,<lon>
-        Then the result is valid html
+        When sending geojson reverse coordinates <lat>,<lon>
+        Then the result is valid geojson

 
     Examples:
      | lat      | lon |
 
     Examples:
      | lat      | lon |


@@ -26,10 +26,6 @@ Feature: Simple Reverse Tests
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid xml
           | param       | value   |
           | <parameter> | <value> |
         Then the result is valid xml

-        When sending html reverse coordinates 53.603,10.041
-          | param       | value   |
-          | <parameter> | <value> |
-        Then the result is valid html

         When sending xml reverse coordinates 53.603,10.041
           | param       | value   |
           | <parameter> | <value> |
         When sending xml reverse coordinates 53.603,10.041
           | param       | value   |
           | <parameter> | <value> |


@@ -42,11 +38,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,27 +62,29 @@ 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 |

 
     Scenario Outline: Boundingbox is returned
 
     Scenario Outline: Boundingbox is returned

-        When sending <format> reverse coordinates 14.62,108.1
+        When sending <format> reverse coordinates 47.11,9.57

           | zoom |
           | zoom |

-          | 4 |
-        Then result has bounding box in 9,20,102,113
+          | 8 |
+        Then result has bounding box in 47,48,9,10

 
     Examples:
       | format |
       | json |
       | jsonv2 |
 
     Examples:
       | format |
       | json |
       | jsonv2 |

+      | geojson |

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

-        When sending <format> reverse coordinates 53.603,10.041
+        When sending <format> reverse coordinates 47.11,9.57

           | zoom |
           | 10 |
         Then exactly 1 result is returned
           | zoom |
           | 10 |
         Then exactly 1 result is returned


@@ -89,7 +93,7 @@ Feature: Simple Reverse Tests
       | format |
       | json |
       | jsonv2 |
       | format |
       | json |
       | jsonv2 |

-      | html |
+      | geojson |

       | xml |
 
     Scenario: Missing lon parameter
       | xml |
 
     Scenario: Missing lon parameter


@@ -127,3 +131,7 @@ Feature: Simple Reverse Tests
      | 48.966   | 8.448.2 |
      | Nan      | 8.448 |
      | 48.966   | Nan |
      | 48.966   | 8.448.2 |
      | Nan      | 8.448 |
      | 48.966   | Nan |

+
+     Scenario: Reverse Debug output returns no errors
+        When sending debug reverse coordinates 47.11,9.57
+        Then a HTTP 200 is returned