Skip to content

Commit 8fa1beb

Browse files
toin0utoin0u
committed
Generate cached responses to Geonames and TomTom providers
1 parent bb04934 commit 8fa1beb

File tree

2 files changed

+56
-56
lines changed

2 files changed

+56
-56
lines changed

‎tests/Geocoder/Tests/Provider/GeonamesProviderTest.php

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,22 @@ public function testGetGeocodedDataWithRealPlace()
111111
$this->assertEquals('Europe/London', $results[0]['timezone']);
112112

113113
$this->assertInternalType('array', $results[1]);
114-
$this->assertEquals(42.983389283, $results[1]['latitude'], '', 0.01);
115-
$this->assertEquals(-81.233042387, $results[1]['longitude'], '', 0.01);
114+
$this->assertEquals(-33.015285093464, $results[1]['latitude'], '', 0.01);
115+
$this->assertEquals(27.911624908447, $results[1]['longitude'], '', 0.01);
116116
$this->assertArrayHasKey('south', $results[1]['bounds']);
117117
$this->assertArrayHasKey('west', $results[1]['bounds']);
118118
$this->assertArrayHasKey('north', $results[1]['bounds']);
119119
$this->assertArrayHasKey('east', $results[1]['bounds']);
120-
$this->assertEquals(42.907075642763, $results[1]['bounds']['south'], '', 0.01);
121-
$this->assertEquals(-81.337489676463, $results[1]['bounds']['west'], '', 0.01);
122-
$this->assertEquals(43.059702923237, $results[1]['bounds']['north'], '', 0.01);
123-
$this->assertEquals(-81.128595097537, $results[1]['bounds']['east'], '', 0.01);
124-
$this->assertEquals('London', $results[1]['city']);
125-
$this->assertEquals('', $results[1]['county']);
126-
$this->assertEquals('Ontario', $results[1]['region']);
127-
$this->assertEquals('Canada', $results[1]['country']);
128-
$this->assertEquals('CA', $results[1]['countryCode']);
129-
$this->assertEquals('America/Toronto', $results[1]['timezone']);
120+
$this->assertEquals(-33.104996458003, $results[1]['bounds']['south'], '', 0.01);
121+
$this->assertEquals(27.804746435655, $results[1]['bounds']['west'], '', 0.01);
122+
$this->assertEquals(-32.925573728925, $results[1]['bounds']['north'], '', 0.01);
123+
$this->assertEquals(28.018503381239, $results[1]['bounds']['east'], '', 0.01);
124+
$this->assertEquals('East London', $results[1]['city']);
125+
$this->assertEquals('Buffalo City Metropolitan Municipality', $results[1]['county']);
126+
$this->assertEquals('Eastern Cape', $results[1]['region']);
127+
$this->assertEquals('South Africa', $results[1]['country']);
128+
$this->assertEquals('ZA', $results[1]['countryCode']);
129+
$this->assertEquals('Africa/Johannesburg', $results[1]['timezone']);
130130

131131
$this->assertInternalType('array', $results[2]);
132132
$this->assertEquals(51.512788890295, $results[2]['latitude'], '', 0.01);
@@ -147,22 +147,22 @@ public function testGetGeocodedDataWithRealPlace()
147147
$this->assertEquals('Europe/London', $results[2]['timezone']);
148148

149149
$this->assertInternalType('array', $results[3]);
150-
$this->assertEquals(-33.015285093464, $results[3]['latitude'], '', 0.01);
151-
$this->assertEquals(27.911624908447, $results[3]['longitude'], '', 0.01);
150+
$this->assertEquals(42.983389283, $results[3]['latitude'], '', 0.01);
151+
$this->assertEquals(-81.233042387, $results[3]['longitude'], '', 0.01);
152152
$this->assertArrayHasKey('south', $results[3]['bounds']);
153153
$this->assertArrayHasKey('west', $results[3]['bounds']);
154154
$this->assertArrayHasKey('north', $results[3]['bounds']);
155155
$this->assertArrayHasKey('east', $results[3]['bounds']);
156-
$this->assertEquals(-33.104996458003, $results[3]['bounds']['south'], '', 0.01);
157-
$this->assertEquals(27.804746435655, $results[3]['bounds']['west'], '', 0.01);
158-
$this->assertEquals(-32.925573728925, $results[3]['bounds']['north'], '', 0.01);
159-
$this->assertEquals(28.018503381239, $results[3]['bounds']['east'], '', 0.01);
160-
$this->assertEquals('East London', $results[3]['city']);
161-
$this->assertEquals('Buffalo City Metropolitan Municipality', $results[3]['county']);
162-
$this->assertEquals('Eastern Cape', $results[3]['region']);
163-
$this->assertEquals('South Africa', $results[3]['country']);
164-
$this->assertEquals('ZA', $results[3]['countryCode']);
165-
$this->assertEquals('Africa/Johannesburg', $results[3]['timezone']);
156+
$this->assertEquals(42.907075642763, $results[3]['bounds']['south'], '', 0.01);
157+
$this->assertEquals(-81.337489676463, $results[3]['bounds']['west'], '', 0.01);
158+
$this->assertEquals(43.059702923237, $results[3]['bounds']['north'], '', 0.01);
159+
$this->assertEquals(-81.128595097537, $results[3]['bounds']['east'], '', 0.01);
160+
$this->assertEquals('London', $results[3]['city']);
161+
$this->assertEquals('', $results[3]['county']);
162+
$this->assertEquals('Ontario', $results[3]['region']);
163+
$this->assertEquals('Canada', $results[3]['country']);
164+
$this->assertEquals('CA', $results[3]['countryCode']);
165+
$this->assertEquals('America/Toronto', $results[3]['timezone']);
166166

167167
$this->assertInternalType('array', $results[4]);
168168
$this->assertEquals(41.3556539, $results[4]['latitude'], '', 0.01);
@@ -213,6 +213,24 @@ public function testGetGeocodedDataWithRealPlaceWithLocale()
213213
$this->assertEquals('GB', $results[0]['countryCode']);
214214
$this->assertEquals('Europe/London', $results[0]['timezone']);
215215

216+
$this->assertInternalType('array', $results[1]);
217+
$this->assertEquals(-33.015285093464, $results[1]['latitude'], '', 0.01);
218+
$this->assertEquals(27.911624908447, $results[1]['longitude'], '', 0.01);
219+
$this->assertArrayHasKey('south', $results[1]['bounds']);
220+
$this->assertArrayHasKey('west', $results[1]['bounds']);
221+
$this->assertArrayHasKey('north', $results[1]['bounds']);
222+
$this->assertArrayHasKey('east', $results[1]['bounds']);
223+
$this->assertEquals(-33.104996458003, $results[1]['bounds']['south'], '', 0.01);
224+
$this->assertEquals(27.804746435655, $results[1]['bounds']['west'], '', 0.01);
225+
$this->assertEquals(-32.925573728925, $results[1]['bounds']['north'], '', 0.01);
226+
$this->assertEquals(28.018503381239, $results[1]['bounds']['east'], '', 0.01);
227+
$this->assertEquals('East London', $results[1]['city']);
228+
$this->assertEquals('Buffalo City Metropolitan Municipality', $results[1]['county']);
229+
$this->assertEquals('Eastern Cape', $results[1]['region']);
230+
$this->assertEquals('Sudafrica', $results[1]['country']);
231+
$this->assertEquals('ZA', $results[1]['countryCode']);
232+
$this->assertEquals('Africa/Johannesburg', $results[1]['timezone']);
233+
216234
$this->assertInternalType('array', $results[2]);
217235
$this->assertEquals(51.512788890295, $results[2]['latitude'], '', 0.01);
218236
$this->assertEquals(-0.091838836669922, $results[2]['longitude'], '', 0.01);
@@ -231,41 +249,23 @@ public function testGetGeocodedDataWithRealPlaceWithLocale()
231249
$this->assertEquals('GB', $results[2]['countryCode']);
232250
$this->assertEquals('Europe/London', $results[2]['timezone']);
233251

234-
$this->assertInternalType('array', $results[1]);
235-
$this->assertEquals(42.983389283, $results[1]['latitude'], '', 0.01);
236-
$this->assertEquals(-81.233042387, $results[1]['longitude'], '', 0.01);
237-
$this->assertArrayHasKey('south', $results[1]['bounds']);
238-
$this->assertArrayHasKey('west', $results[1]['bounds']);
239-
$this->assertArrayHasKey('north', $results[1]['bounds']);
240-
$this->assertArrayHasKey('east', $results[1]['bounds']);
241-
$this->assertEquals(42.907075642763, $results[1]['bounds']['south'], '', 0.01);
242-
$this->assertEquals(-81.337489676463, $results[1]['bounds']['west'], '', 0.01);
243-
$this->assertEquals(43.059702923237, $results[1]['bounds']['north'], '', 0.01);
244-
$this->assertEquals(-81.128595097537, $results[1]['bounds']['east'], '', 0.01);
245-
$this->assertEquals('London', $results[1]['city']);
246-
$this->assertEquals('', $results[1]['county']);
247-
$this->assertEquals('Ontario', $results[1]['region']);
248-
$this->assertEquals('Canada', $results[1]['country']);
249-
$this->assertEquals('CA', $results[1]['countryCode']);
250-
$this->assertEquals('America/Toronto', $results[1]['timezone']);
251-
252252
$this->assertInternalType('array', $results[3]);
253-
$this->assertEquals(-33.015285093464, $results[3]['latitude'], '', 0.01);
254-
$this->assertEquals(27.911624908447, $results[3]['longitude'], '', 0.01);
253+
$this->assertEquals(42.983389283, $results[3]['latitude'], '', 0.01);
254+
$this->assertEquals(-81.233042387, $results[3]['longitude'], '', 0.01);
255255
$this->assertArrayHasKey('south', $results[3]['bounds']);
256256
$this->assertArrayHasKey('west', $results[3]['bounds']);
257257
$this->assertArrayHasKey('north', $results[3]['bounds']);
258258
$this->assertArrayHasKey('east', $results[3]['bounds']);
259-
$this->assertEquals(-33.104996458003, $results[3]['bounds']['south'], '', 0.01);
260-
$this->assertEquals(27.804746435655, $results[3]['bounds']['west'], '', 0.01);
261-
$this->assertEquals(-32.925573728925, $results[3]['bounds']['north'], '', 0.01);
262-
$this->assertEquals(28.018503381239, $results[3]['bounds']['east'], '', 0.01);
263-
$this->assertEquals('East London', $results[3]['city']);
264-
$this->assertEquals('Buffalo City Metropolitan Municipality', $results[3]['county']);
265-
$this->assertEquals('Eastern Cape', $results[3]['region']);
266-
$this->assertEquals('Sudafrica', $results[3]['country']);
267-
$this->assertEquals('ZA', $results[3]['countryCode']);
268-
$this->assertEquals('Africa/Johannesburg', $results[3]['timezone']);
259+
$this->assertEquals(42.907075642763, $results[3]['bounds']['south'], '', 0.01);
260+
$this->assertEquals(-81.337489676463, $results[3]['bounds']['west'], '', 0.01);
261+
$this->assertEquals(43.059702923237, $results[3]['bounds']['north'], '', 0.01);
262+
$this->assertEquals(-81.128595097537, $results[3]['bounds']['east'], '', 0.01);
263+
$this->assertEquals('London', $results[3]['city']);
264+
$this->assertEquals('', $results[3]['county']);
265+
$this->assertEquals('Ontario', $results[3]['region']);
266+
$this->assertEquals('Canada', $results[3]['country']);
267+
$this->assertEquals('CA', $results[3]['countryCode']);
268+
$this->assertEquals('America/Toronto', $results[3]['timezone']);
269269

270270
$this->assertInternalType('array', $results[4]);
271271
$this->assertEquals(41.3556539, $results[4]['latitude'], '', 0.01);
@@ -279,7 +279,7 @@ public function testGetGeocodedDataWithRealPlaceWithLocale()
279279
$this->assertEquals(41.377219912096, $results[4]['bounds']['north'], '', 0.01);
280280
$this->assertEquals(-72.070780545154, $results[4]['bounds']['east'], '', 0.01);
281281
$this->assertEquals('New London', $results[4]['city']);
282-
$this->assertEquals('New London County', $results[4]['county']);
282+
$this->assertEquals('Contea di New London', $results[4]['county']);
283283
$this->assertEquals('Connecticut', $results[4]['region']);
284284
$this->assertEquals('Stati Uniti', $results[4]['country']);
285285
$this->assertEquals('US', $results[4]['countryCode']);

‎tests/Geocoder/Tests/Provider/TomTomProviderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public function testGetReversedDataWithRealCoordinates()
353353
$this->assertNull($result['streetNumber']);
354354
$this->assertEquals('Avenue Gambetta', $result['streetName']);
355355
$this->assertNull($result['zipcode']);
356-
$this->assertEquals('20ème Arrondissement Paris', $result['city']);
356+
$this->assertEquals('20e Arrondissement Paris', $result['city']);
357357
$this->assertNull($result['cityDistrict']);
358358
$this->assertNull($result['region']);
359359
$this->assertNull($result['regionCode']);

0 commit comments

Comments
 (0)