Skip to content

Commit 5c01cb2

Browse files
jbelienjbelien
authored
Update YandexTest.php (#919)
1 parent 21c7315 commit 5c01cb2

File tree

1 file changed

+43
-21
lines changed

1 file changed

+43
-21
lines changed

‎Tests/YandexTest.php‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function testGeocodeWithRealAddress()
8484

8585
/** @var Location $result */
8686
$result = $results->first();
87-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
87+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
8888
$this->assertEquals(48.863277, $result->getCoordinates()->getLatitude(), '', 0.01);
8989
$this->assertEquals(2.389016, $result->getCoordinates()->getLongitude(), '', 0.01);
9090
$this->assertNotNull($result->getBounds());
@@ -101,6 +101,8 @@ public function testGeocodeWithRealAddress()
101101
$this->assertEquals('Иль-Де-Франс', $result->getAdminLevels()->get(1)->getName());
102102
$this->assertEquals('Франция', $result->getCountry()->getName());
103103
$this->assertEquals('FR', $result->getCountry()->getCode());
104+
$this->assertEquals('exact', $result->getPrecision());
105+
$this->assertEquals('house', $result->getKind());
104106

105107
// not provided
106108
$this->assertNull($result->getPostalCode());
@@ -119,7 +121,7 @@ public function testGeocodeWithRealAddressWithUALocale()
119121

120122
/** @var Location $result */
121123
$result = $results->first();
122-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
124+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
123125
$this->assertEquals(55.675676, $result->getCoordinates()->getLatitude(), '', 0.01);
124126
$this->assertEquals(12.567593, $result->getCoordinates()->getLongitude(), '', 0.01);
125127
$this->assertNotNull($result->getBounds());
@@ -134,6 +136,9 @@ public function testGeocodeWithRealAddressWithUALocale()
134136
$this->assertEquals('Столичная область', $result->getAdminLevels()->get(1)->getName());
135137
$this->assertEquals('Данія', $result->getCountry()->getName());
136138
$this->assertEquals('DK', $result->getCountry()->getCode());
139+
$this->assertEquals('other', $result->getPrecision());
140+
$this->assertEquals('Копенгаген', $result->getName());
141+
$this->assertEquals('locality', $result->getKind());
137142

138143
// not provided
139144
$this->assertNull($result->getPostalCode());
@@ -143,25 +148,25 @@ public function testGeocodeWithRealAddressWithUALocale()
143148

144149
/** @var Location $result */
145150
$result = $results->get(1);
146-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
151+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
147152
$this->assertEquals(55.455739, $result->getCoordinates()->getLatitude(), '', 0.01);
148153
$this->assertEquals(9.972854, $result->getCoordinates()->getLongitude(), '', 0.01);
149154

150155
/** @var Location $result */
151156
$result = $results->get(2);
152-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
157+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
153158
$this->assertEquals(55.713258, $result->getCoordinates()->getLatitude(), '', 0.01);
154159
$this->assertEquals(12.534930, $result->getCoordinates()->getLongitude(), '', 0.01);
155160

156161
/** @var Location $result */
157162
$result = $results->get(3);
158-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
163+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
159164
$this->assertEquals(55.698878, $result->getCoordinates()->getLatitude(), '', 0.01);
160165
$this->assertEquals(12.578211, $result->getCoordinates()->getLongitude(), '', 0.01);
161166

162167
/** @var Location $result */
163168
$result = $results->get(4);
164-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
169+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
165170
$this->assertEquals(55.690380, $result->getCoordinates()->getLatitude(), '', 0.01);
166171
$this->assertEquals(12.554827, $result->getCoordinates()->getLongitude(), '', 0.01);
167172
}
@@ -176,7 +181,7 @@ public function testGeocodeWithRealAddressWithUSLocale()
176181

177182
/** @var Location $result */
178183
$result = $results->first();
179-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
184+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
180185
$this->assertEquals(38.897695, $result->getCoordinates()->getLatitude(), '', 0.01);
181186
$this->assertEquals(-77.038692, $result->getCoordinates()->getLongitude(), '', 0.01);
182187
$this->assertNotNull($result->getBounds());
@@ -192,6 +197,8 @@ public function testGeocodeWithRealAddressWithUSLocale()
192197
$this->assertEquals('District of Columbia', $result->getAdminLevels()->get(1)->getName());
193198
$this->assertEquals('United States', $result->getCountry()->getName());
194199
$this->assertEquals('US', $result->getCountry()->getCode());
200+
$this->assertEquals('exact', $result->getPrecision());
201+
$this->assertEquals('house', $result->getKind());
195202

196203
// not provided
197204
$this->assertNull($result->getPostalCode());
@@ -210,7 +217,7 @@ public function testGeocodeWithRealAddressWithBYLocale()
210217

211218
/** @var Location $result */
212219
$result = $results->first();
213-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
220+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
214221
$this->assertEquals(53.898077, $result->getCoordinates()->getLatitude(), '', 0.01);
215222
$this->assertEquals(27.563673, $result->getCoordinates()->getLongitude(), '', 0.01);
216223
$this->assertNotNull($result->getBounds());
@@ -225,6 +232,8 @@ public function testGeocodeWithRealAddressWithBYLocale()
225232
$this->assertEquals('Минск', $result->getAdminLevels()->get(1)->getName());
226233
$this->assertEquals('Беларусь', $result->getCountry()->getName());
227234
$this->assertEquals('BY', $result->getCountry()->getCode());
235+
$this->assertEquals('exact', $result->getPrecision());
236+
$this->assertEquals('house', $result->getKind());
228237

229238
// not provided
230239
$this->assertNull($result->getPostalCode());
@@ -242,7 +251,7 @@ public function testReverseWithRealCoordinates()
242251

243252
/** @var Location $result */
244253
$result = $results->first();
245-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
254+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
246255
$this->assertEquals(48.863212, $result->getCoordinates()->getLatitude(), '', 0.01);
247256
$this->assertEquals(2.388773, $result->getCoordinates()->getLongitude(), '', 0.01);
248257
$this->assertNotNull($result->getBounds());
@@ -259,6 +268,9 @@ public function testReverseWithRealCoordinates()
259268
$this->assertEquals('Иль-Де-Франс', $result->getAdminLevels()->get(1)->getName());
260269
$this->assertEquals('Франция', $result->getCountry()->getName());
261270
$this->assertEquals('FR', $result->getCountry()->getCode());
271+
$this->assertEquals('street', $result->getPrecision());
272+
$this->assertEquals('Avenue Gambetta', $result->getName());
273+
$this->assertEquals('street', $result->getKind());
262274

263275
// not provided
264276
$this->assertNull($result->getPostalCode());
@@ -268,13 +280,13 @@ public function testReverseWithRealCoordinates()
268280

269281
/** @var Location $result */
270282
$result = $results->get(1);
271-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
283+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
272284
$this->assertEquals(48.864848, $result->getCoordinates()->getLatitude(), '', 0.01);
273285
$this->assertEquals(2.3993549, $result->getCoordinates()->getLongitude(), '', 0.01);
274286

275287
/** @var Location $result */
276288
$result = $results->get(2);
277-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
289+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
278290
$this->assertEquals(48.856929, $result->getCoordinates()->getLatitude(), '', 0.01);
279291
$this->assertEquals(2.341197, $result->getCoordinates()->getLongitude(), '', 0.01);
280292
}
@@ -289,7 +301,7 @@ public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym()
289301

290302
/** @var Location $result */
291303
$result = $results->first();
292-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
304+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
293305
$this->assertEquals(48.87132, $result->getCoordinates()->getLatitude(), '', 0.01);
294306
$this->assertEquals(2.404017, $result->getCoordinates()->getLongitude(), '', 0.01);
295307
$this->assertNotNull($result->getBounds());
@@ -306,6 +318,9 @@ public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym()
306318
$this->assertEquals('Ile-de-France', $result->getAdminLevels()->get(1)->getName());
307319
$this->assertEquals('France', $result->getCountry()->getName());
308320
$this->assertEquals('FR', $result->getCountry()->getCode());
321+
$this->assertEquals('street', $result->getPrecision());
322+
$this->assertEquals('Avenue Gambetta', $result->getName());
323+
$this->assertEquals('street', $result->getKind());
309324

310325
// not provided
311326
$this->assertNull($result->getPostalCode());
@@ -315,25 +330,25 @@ public function testReverseWithRealCoordinatesWithUSLocaleAndStreeToponym()
315330

316331
/** @var Location $result */
317332
$result = $results->get(1);
318-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
333+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
319334
$this->assertEquals(48.863230, $result->getCoordinates()->getLatitude(), '', 0.01);
320335
$this->assertEquals(2.388261, $result->getCoordinates()->getLongitude(), '', 0.01);
321336

322337
/** @var Location $result */
323338
$result = $results->get(2);
324-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
339+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
325340
$this->assertEquals(48.866022, $result->getCoordinates()->getLatitude(), '', 0.01);
326341
$this->assertEquals(2.389662, $result->getCoordinates()->getLongitude(), '', 0.01);
327342

328343
/** @var Location $result */
329344
$result = $results->get(3);
330-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
345+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
331346
$this->assertEquals(48.863918, $result->getCoordinates()->getLatitude(), '', 0.01);
332347
$this->assertEquals(2.387767, $result->getCoordinates()->getLongitude(), '', 0.01);
333348

334349
/** @var Location $result */
335350
$result = $results->get(4);
336-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
351+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
337352
$this->assertEquals(48.863787, $result->getCoordinates()->getLatitude(), '', 0.01);
338353
$this->assertEquals(2.389600, $result->getCoordinates()->getLongitude(), '', 0.01);
339354
}
@@ -348,7 +363,7 @@ public function testReverseWithRealCoordinatesWithUALocaleAndHouseToponym()
348363

349364
/** @var Location $result */
350365
$result = $results->first();
351-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
366+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
352367
$this->assertEquals(60.454462, $result->getCoordinates()->getLatitude(), '', 0.01);
353368
$this->assertEquals(22.256561, $result->getCoordinates()->getLongitude(), '', 0.01);
354369
$this->assertNotNull($result->getBounds());
@@ -365,6 +380,8 @@ public function testReverseWithRealCoordinatesWithUALocaleAndHouseToponym()
365380
$this->assertEquals('Юго-Западная Финляндия', $result->getAdminLevels()->get(1)->getName());
366381
$this->assertEquals('Фінляндія', $result->getCountry()->getName());
367382
$this->assertEquals('FI', $result->getCountry()->getCode());
383+
$this->assertEquals('exact', $result->getPrecision());
384+
$this->assertEquals('house', $result->getKind());
368385

369386
// not provided
370387
$this->assertNull($result->getPostalCode());
@@ -383,7 +400,7 @@ public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym()
383400

384401
/** @var Location $result */
385402
$result = $results->first();
386-
$this->assertInstanceOf('Geocoder\Model\Address', $result);
403+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
387404
$this->assertEquals(40.874651, $result->getCoordinates()->getLatitude(), '', 0.01);
388405
$this->assertEquals(29.129562, $result->getCoordinates()->getLongitude(), '', 0.01);
389406
$this->assertNotNull($result->getBounds());
@@ -399,6 +416,9 @@ public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym()
399416
$this->assertEquals('İstanbul', $result->getAdminLevels()->get(1)->getName());
400417
$this->assertEquals('Türkiye', $result->getCountry()->getName());
401418
$this->assertEquals('TR', $result->getCountry()->getCode());
419+
$this->assertEquals('other', $result->getPrecision());
420+
$this->assertEquals('Büyükada', $result->getName());
421+
$this->assertEquals('locality', $result->getKind());
402422

403423
// not provided
404424
$this->assertNull($result->getPostalCode());
@@ -414,8 +434,10 @@ public function testReverseMetroStationToGetName()
414434
$results = $provider->reverseQuery(ReverseQuery::fromCoordinates(60.036843, 30.324285));
415435

416436
/** @var YandexAddress $first */
417-
$first = $results->first();
418-
$this->assertEquals('метро Озерки', $first->getName());
419-
$this->assertEquals('metro', $first->getKind());
437+
$result = $results->first();
438+
$this->assertInstanceOf('Geocoder\Provider\Yandex\Model\YandexAddress', $result);
439+
$this->assertEquals('other', $result->getPrecision());
440+
$this->assertEquals('метро Озерки', $result->getName());
441+
$this->assertEquals('metro', $result->getKind());
420442
}
421443
}

0 commit comments

Comments
 (0)