simplify sql and website creation functions

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

diff --git a/test/bdd/api/reverse/queries.feature b/test/bdd/api/reverse/queries.feature
index 8fbe552c6255a928758691d6ec8f0ca577394485..303af2c35734120872587911f1d7282a15f24c39 100644 (file)
--- a/test/bdd/api/reverse/queries.feature
+++ b/test/bdd/api/reverse/queries.feature
@@ -4,69 +4,55 @@ Feature: Reverse geocoding
 
     @Tiger
     Scenario: TIGER house number
 
     @Tiger
     Scenario: TIGER house number

-        When sending jsonv2 reverse coordinates 45.3345,-97.5214
+        When sending jsonv2 reverse coordinates 32.4752389363,-86.4810198619

         Then results contain
           | osm_type | category | type |
           | way      | place    | house |
         And result addresses contain
         Then results contain
           | osm_type | category | type |
           | way      | place    | house |
         And result addresses contain

-          | house_number | road            | postcode | country_code |
-          | 909          | West 1st Street | 57274    | us |
+          | house_number | road                | postcode | country_code |
+          | 697          | Upper Kingston Road | 36067    | us |

 
     @Tiger
     Scenario: No TIGER house number for zoom < 18
 
     @Tiger
     Scenario: No TIGER house number for zoom < 18

-        When sending jsonv2 reverse coordinates 45.3345,-97.5214
+        When sending jsonv2 reverse coordinates 32.4752389363,-86.4810198619

           | zoom |
           | 17 |
         Then results contain
           | osm_type | category |
           | way      | highway  |
         And result addresses contain
           | zoom |
           | 17 |
         Then results contain
           | osm_type | category |
           | way      | highway  |
         And result addresses contain

-          | road            | postcode | country_code |
-          | West 1st Street | 57274    | us |
+          | road                | postcode | country_code |
+          | Upper Kingston Road | 30607    | us |

 
     Scenario: Interpolated house number
 
     Scenario: Interpolated house number

-        When sending jsonv2 reverse coordinates -33.231795578514635,-54.38682173844428
+        When sending jsonv2 reverse coordinates 47.118533,9.57056562

         Then results contain
           | osm_type | category | type |
           | way      | place    | house |
         And result addresses contain
           | house_number | road |
         Then results contain
           | osm_type | category | type |
           | way      | place    | house |
         And result addresses contain
           | house_number | road |

-          | 1416         | Juan Antonio Lavalleja |
+          | 1019         | Grosssteg |

 
     Scenario: Address with non-numerical house number
 
     Scenario: Address with non-numerical house number

-        When sending jsonv2 reverse coordinates 53.579805460944,9.9475670458196
+        When sending jsonv2 reverse coordinates 47.107465,9.52838521614

         Then result addresses contain
           | house_number | road |
         Then result addresses contain
           | house_number | road |

-          | 43 Haus 4    | Stellinger Weg |
+          | 39A/B        | Dorfstrasse |

 
 
     Scenario: Address with numerical house number
 
 
     Scenario: Address with numerical house number

-        When sending jsonv2 reverse coordinates 53.580206752486,9.9502944945198
+        When sending jsonv2 reverse coordinates 47.168440329479594,9.511551699184338

         Then result addresses contain
           | house_number | road |
         Then result addresses contain
           | house_number | road |

-          | 5            | Clasingstraße |
-
-    Scenario: Location off the coast
-        When sending jsonv2 reverse coordinates 54.046489113,8.5546870529
-        Then results contain
-         | display_name |
-         | Hamburg, Deutschland |
-
-    Scenario: When slightly outside town, the town is not shown
-        When sending jsonv2 reverse coordinates -32.122,-56.114
-         | zoom |
-         | 15 |
-        Then results contain
-         | display_name |
-         | Tacuarembó, Uruguay |
+          | 6            | Schmedgässle |

 
     Scenario Outline: Zoom levels below 5 result in country
 
     Scenario Outline: Zoom levels below 5 result in country

-        When sending jsonv2 reverse coordinates -33.28,-56.29
+        When sending jsonv2 reverse coordinates 47.16,9.51

          | zoom |
          | <zoom> |
         Then results contain
          | display_name |
          | zoom |
          | <zoom> |
         Then results contain
          | display_name |

-         | Uruguay |
+         | Liechtenstein |

 
     Examples:
          | zoom |
 
     Examples:
          | zoom |


@@ -77,17 +63,34 @@ Feature: Reverse geocoding
          | 4    |
 
     Scenario: When on a street, the closest interpolation is shown
          | 4    |
 
     Scenario: When on a street, the closest interpolation is shown

-        When sending jsonv2 reverse coordinates -33.2309430210215,-54.38126470020989
+        When sending jsonv2 reverse coordinates 47.118457166193245,9.570678289621355
+         | zoom |
+         | 18 |
+        Then results contain
+         | display_name |
+         | 1021, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |
+
+    # github 2214
+    Scenario: Interpolations do not override house numbers when they are closer
+        When sending jsonv2 reverse coordinates 47.11778,9.57255
+         | zoom |
+         | 18 |
+        Then results contain
+         | display_name |
+         | 5, Grosssteg, Steg, Triesenberg, Oberland, 9497, Liechtenstein |
+
+    Scenario: Interpolations do not override house numbers when they are closer (2)
+        When sending jsonv2 reverse coordinates 47.11834,9.57167

          | zoom |
          | 18 |
         Then results contain
          | display_name |
          | zoom |
          | 18 |
         Then results contain
          | display_name |

-         | 1429, Andrés Areguati, Treinta y Tres, 33000, Uruguay |
+         | 3, Grosssteg, Sücka, Triesenberg, Oberland, 9497, Liechtenstein |

 
     Scenario: When on a street with zoom 18, the closest housenumber is returned
 
     Scenario: When on a street with zoom 18, the closest housenumber is returned

-        When sending jsonv2 reverse coordinates 53.551826690895226,9.885258475318201
+        When sending jsonv2 reverse coordinates 47.11755503977281,9.572722250405036

          | zoom |
          | 18 |
         Then result addresses contain
          | house_number |
          | zoom |
          | 18 |
         Then result addresses contain
          | house_number |

-         | 33 |
+         | 7 |