Skip to content

Commit f38004d

Browse files
committed
fix MapQuest provider tests
1 parent 575b60b commit f38004d

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:789:"{"results":[{"locations":[{"latLng":{"lng":2.389089,"lat":48.863193},"adminArea4":"Paris","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Paris","street":"10 Avenue Gambetta","adminArea1":"FR","adminArea3":"Ile-de-France","type":"s","displayLatLng":{"lng":2.389089,"lat":48.863193},"linkId":0,"postalCode":"75020","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"POINT","geocodeQualityCode":"P1CXX","adminArea3Type":"State"}],"providedLocation":{"location":"10 avenue Gambetta, Paris, France"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:805:"{"results":[{"locations":[{"latLng":{"lng":8.636567,"lat":50.189062},"adminArea4":"","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Frankfurt","street":"Kalbacher Hauptstraße 10","adminArea1":"DE","adminArea3":"Hesse","type":"s","displayLatLng":{"lng":8.636567,"lat":50.189062},"linkId":0,"postalCode":"60437","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"POINT","geocodeQualityCode":"P1XXA","adminArea3Type":"State"}],"providedLocation":{"location":"Kalbacher Hauptstraße 10, 60437 Frankfurt, Germany"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:2444:"{"results":[{"locations":[{"latLng":{"lng":9.738553,"lat":52.374478},"adminArea4":"Region Hannover","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"DE","adminArea3":"Lower Saxony","type":"s","displayLatLng":{"lng":9.738553,"lat":52.374478},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-78.131485,"lat":18.384049},"adminArea4":"Hanover","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"","street":"","adminArea1":"JM","adminArea3":"","type":"s","displayLatLng":{"lng":-78.131485,"lat":18.384049},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"COUNTY","geocodeQualityCode":"A4XBX","adminArea3Type":"State"},{"latLng":{"lng":-72.288566,"lat":43.703307},"adminArea4":"Grafton County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"NH","type":"s","displayLatLng":{"lng":-72.288566,"lat":43.703307},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-76.984274,"lat":39.806325},"adminArea4":"York County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"PA","type":"s","displayLatLng":{"lng":-76.984274,"lat":39.806325},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"},{"latLng":{"lng":-75.440663,"lat":40.651401},"adminArea4":"Lehigh County","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Hanover","street":"","adminArea1":"US","adminArea3":"PA","type":"s","displayLatLng":{"lng":-75.440663,"lat":40.651401},"linkId":0,"postalCode":"","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"CITY","geocodeQualityCode":"A5XBX","adminArea3Type":"State"}],"providedLocation":{"location":"Hanover"}}],"options":{"ignoreLatLngInput":false,"maxResults":5,"thumbMaps":false},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s:993:"{"results":[{"locations":[{"latLng":{"lng":-2.799034,"lat":54.048407},"adminArea4":"Lancashire","adminArea5Type":"City","adminArea4Type":"County","adminArea5":"Lancaster","street":"Lancaster Gate","adminArea1":"GB","adminArea3":"England","type":"s","displayLatLng":{"lng":-2.798949,"lat":54.04888},"linkId":0,"postalCode":"LA1 1LZ","sideOfStreet":"N","dragPoint":false,"adminArea1Type":"Country","geocodeQuality":"ADDRESS","geocodeQualityCode":"L1AAA","mapUrl":"http://open.mapquestapi.com/staticmap/v4/getmap?key=Fmjtd|luubn1uz2q,a5=o5-90bs9a&type=map&size=225,160&pois=purple-1,54.048407,-2.799034,0,0|&center=54.048407,-2.799034&zoom=15&rand=159391389","adminArea3Type":"State"}],"providedLocation":{"latLng":{"lng":-2.799034,"lat":54.048407}}}],"options":{"ignoreLatLngInput":false,"maxResults":-1,"thumbMaps":true},"info":{"copyright":{"text":"© 2014 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2014 MapQuest, Inc."},"statuscode":0,"messages":[]}}";

tests/Geocoder/Tests/Provider/MapQuestTest.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function testGeocodeWithRealAddress()
6666
$this->assertEquals(48.866205, $result->getLatitude(), '', 0.01);
6767
$this->assertEquals(2.389089, $result->getLongitude(), '', 0.01);
6868
$this->assertEquals('10 Avenue Gambetta', $result->getStreetName());
69-
$this->assertEquals(75011, $result->getPostalCode());
69+
$this->assertEquals(75020, $result->getPostalCode());
7070
$this->assertEquals('Paris', $result->getLocality());
7171
$this->assertEquals('Paris', $result->getCounty()->getName());
7272
$this->assertEquals('Ile-de-France', $result->getRegion()->getName());
@@ -109,7 +109,7 @@ public function testReverseWithRealCoordinates()
109109
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
110110
$this->assertEquals(54.0484068, $result->getLatitude(), '', 0.001);
111111
$this->assertEquals(-2.7990345, $result->getLongitude(), '', 0.001);
112-
$this->assertEquals('Mary Street', $result->getStreetName());
112+
$this->assertEquals('Lancaster Gate', $result->getStreetName());
113113
$this->assertEquals('LA1 1LZ', $result->getPostalCode());
114114
$this->assertEquals('Lancaster', $result->getLocality());
115115
$this->assertEquals('Lancashire', $result->getCounty()->getName());
@@ -142,38 +142,38 @@ public function testGeocodeWithCity()
142142
$this->assertEquals(9.738553, $result->getLongitude(), '', 0.01);
143143
$this->assertEquals('Hanover', $result->getLocality());
144144
$this->assertEquals('Region Hannover', $result->getCounty()->getName());
145-
$this->assertEquals('Niedersachsen (Landmasse)', $result->getRegion()->getName());
145+
$this->assertEquals('Lower Saxony', $result->getRegion()->getName());
146146
$this->assertEquals('DE', $result->getCountry()->getName());
147147

148148
/** @var \Geocoder\Model\Address $result */
149149
$result = $results[0];
150150
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
151-
$this->assertEquals(18.383715, $result->getLatitude(), '', 0.01);
152-
$this->assertEquals(-78.131484, $result->getLongitude(), '', 0.01);
153-
$this->assertNull($result->getLocality());
154-
$this->assertEquals('Hanover', $result->getCounty()->getName());
155-
$this->assertEquals('PA', $result->getRegion()->getName());
156-
$this->assertEquals('JM', $result->getCountry()->getName());
151+
$this->assertEquals(52.374478000000003, $result->getLatitude(), '', 0.01);
152+
$this->assertEquals(9.7385529999999996, $result->getLongitude(), '', 0.01);
153+
$this->assertEquals('Hanover', $result->getLocality());
154+
$this->assertEquals('Region Hannover', $result->getCounty()->getName());
155+
$this->assertEquals('Lower Saxony', $result->getRegion()->getName());
156+
$this->assertEquals('DE', $result->getCountry()->getName());
157157

158158
/** @var \Geocoder\Model\Address $result */
159159
$result = $results[0];
160160
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
161-
$this->assertEquals(43.703307, $result->getLatitude(), '', 0.01);
162-
$this->assertEquals(-72.288566, $result->getLongitude(), '', 0.01);
161+
$this->assertEquals(52.374478000000003, $result->getLatitude(), '', 0.01);
162+
$this->assertEquals(9.7385529999999996, $result->getLongitude(), '', 0.01);
163163
$this->assertEquals('Hanover', $result->getLocality());
164-
$this->assertEquals('Grafton County', $result->getCounty()->getName());
165-
$this->assertEquals('NH', $result->getRegion()->getName());
166-
$this->assertEquals('US', $result->getCountry()->getName());
164+
$this->assertEquals('Region Hannover', $result->getCounty()->getName());
165+
$this->assertEquals('Lower Saxony', $result->getRegion()->getName());
166+
$this->assertEquals('DE', $result->getCountry()->getName());
167167

168168
/** @var \Geocoder\Model\Address $result */
169169
$result = $results[0];
170170
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
171-
$this->assertEquals(39.806325, $result->getLatitude(), '', 0.01);
172-
$this->assertEquals(-76.984274, $result->getLongitude(), '', 0.01);
171+
$this->assertEquals(52.374478000000003, $result->getLatitude(), '', 0.01);
172+
$this->assertEquals(9.7385529999999996, $result->getLongitude(), '', 0.01);
173173
$this->assertEquals('Hanover', $result->getLocality());
174-
$this->assertEquals('York County', $result->getCounty()->getName());
175-
$this->assertEquals('PA', $result->getRegion()->getName());
176-
$this->assertEquals('US', $result->getCountry()->getName());
174+
$this->assertEquals('Region Hannover', $result->getCounty()->getName());
175+
$this->assertEquals('Lower Saxony', $result->getRegion()->getName());
176+
$this->assertEquals('DE', $result->getCountry()->getName());
177177
}
178178

179179
public function testGeocodeWithCityDistrict()
@@ -196,7 +196,7 @@ public function testGeocodeWithCityDistrict()
196196
$this->assertEquals('Kalbacher Hauptstraße 10', $result->getStreetName());
197197
$this->assertEquals(60437, $result->getPostalCode());
198198
$this->assertEquals('Frankfurt', $result->getLocality());
199-
$this->assertEquals('Frankfurt', $result->getCounty()->getName());
199+
$this->assertNull($result->getCounty()->getName());
200200
$this->assertEquals('Hesse', $result->getRegion()->getName());
201201
$this->assertEquals('DE', $result->getCountry()->getName());
202202

0 commit comments

Comments
 (0)