Merge remote-tracking branch 'upstream/pull/5419'

[rails.git] / test / http / nominatim.yml

diff --git a/test/http/nominatim.yml b/test/http/nominatim.yml
index 41467721f414d17b0d231445b0b7a87c816ddcc5..6e7f3c03b3379fb4888667671fcbfa97ac77cff6 100644 (file)
--- a/test/http/nominatim.yml
+++ b/test/http/nominatim.yml
@@ -1,12 +1,12 @@
-/search?accept-language=&format=xml&q=Hoddesdon&viewbox=-0.559%2C51.766%2C0.836%2C51.217:
+/search?accept-language=&extratags=1&format=xml&q=Hoddesdon&viewbox=-0.559,51.766,0.836,51.217:
   code: 200
   body: |
     <?xml version="1.0" encoding="UTF-8" ?>
     <searchresults timestamp='Sun, 01 Mar 15 20:02:29 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='Hoddesdon' viewbox='-0.559,51.766,0.836,51.217' polygon='false' exclude_place_ids='110741' more_url='http://nominatim.openstreetmap.org/search?format=xml&amp;exclude_place_ids=110741&amp;viewbox=-0.559%2C51.766%2C0.836%2C51.217&amp;q=Hoddesdon'>
       <place place_id='110741' osm_type='node' osm_id='18007599' place_rank='18' boundingbox="51.7216709,51.8016709,-0.0512898,0.0287102" lat='51.7616709' lon='-0.0112898' display_name='Hoddesdon, Hertfordshire, East of England, England, United Kingdom' class='place' type='town' importance='0.50547792382382' icon='http://nominatim.openstreetmap.org/images/mapicons/poi_place_town.p.20.png'/>
     </searchresults>
-  
-/search?accept-language=&format=xml&extratags=1&q=Broxbourne&viewbox=-0.559%2C51.766%2C0.836%2C51.217:
+
+/search?accept-language=&extratags=1&format=xml&q=Broxbourne&viewbox=-0.559,51.766,0.836,51.217:
   code: 200
   body: |
     <?xml version="1.0" encoding="UTF-8" ?>
@@ -15,8 +15,8 @@
       <place place_id='127984131' osm_type='relation' osm_id='2677978' place_rank='16' boundingbox="51.6808751,51.7806237,-0.114204,0.0145267" lat='51.73083995' lon='-0.0579457295222991' display_name='Broxbourne, Hertfordshire, East of England, England, United Kingdom' class='boundary' type='administrative' importance='0.46' icon='http://nominatim.openstreetmap.org/images/mapicons/poi_boundary_administrative.p.20.png'><extratags><tag key="place" value="village"/></extratags></place>
       <place place_id='109724' osm_type='node' osm_id='17044599' place_rank='30' boundingbox="51.7418469,51.7518469,-0.0156773,-0.0056773" lat='51.7468469' lon='-0.0106773' display_name='Broxbourne, Stafford Drive, Broxbourne, Hertfordshire, East of England, England, United Kingdom' class='railway' type='station' importance='0.111' icon='http://nominatim.openstreetmap.org/images/mapicons/transport_train_station2.p.20.png'><extratags></extratags></place>
     </searchresults>
-  
-/reverse?accept-language=&lat=51.7632&lon=-0.0076&zoom=15:
+
+/reverse?accept-language=&format=xml&lat=51.7632&lon=-0.0076&zoom=15:
   code: 200
   body: |
     <?xml version="1.0" encoding="UTF-8"?>
@@ -32,8 +32,8 @@
         <country_code>gb</country_code>
       </addressparts>
     </reversegeocode>
-  
-/reverse?accept-language=&lat=51.7632&lon=-0.0076&zoom=17:
+
+/reverse?accept-language=&format=xml&lat=51.7632&lon=-0.0076&zoom=17:
   code: 200
   body: |
     <?xml version="1.0" encoding="UTF-8"?>
@@ -51,3 +51,22 @@
         <country_code>gb</country_code>
       </addressparts>
     </reversegeocode>
+
+/reverse?accept-language=&format=xml&lat=13.7709&lon=100.50507&zoom=19:
+  code: 200
+  body: |
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <reversegeocode timestamp='Wed, 29 Nov 17 22:48:30 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='accept-language=&amp;lat=13.7709&amp;lon=100.50507&amp;zoom=19'>
+      <result place_id="220797400" osm_type="way" osm_id="542901374" ref="MM Steak&amp;Grill" lat="13.7708691" lon="100.505073233221" boundingbox="13.7708162,13.7709465,100.5049978,100.5051344">MM Steak&amp;Grill, ถนนศรีอยุธยา, บางขุนพรหม, กรุงเทพมหานคร, เขตดุสิต, กรุงเทพมหานคร, 10300, ประเทศไทย</result>
+      <addressparts>
+        <restaurant>MM Steak&amp;Grill</restaurant>
+        <road>ถนนศรีอยุธยา</road>
+        <neighbourhood>บางขุนพรหม</neighbourhood>
+        <city>กรุงเทพมหานคร</city>
+        <suburb>เขตดุสิต</suburb>
+        <state>กรุงเทพมหานคร</state>
+        <postcode>10300</postcode>
+        <country>ประเทศไทย</country>
+        <country_code>th</country_code>
+      </addressparts>
+    </reversegeocode>