Added API key to MapQuestProvider

Author: HurricaneHarry

src/Geocoder/Provider/MapQuestProvider.php

@@ -10,6 +10,7 @@
 
 namespace Geocoder\Provider;
 
+use Geocoder\HttpAdapter\HttpAdapterInterface;
 use Geocoder\Exception\NoResultException;
 use Geocoder\Exception\UnsupportedException;
 
@@ -21,13 +22,25 @@ class MapQuestProvider extends AbstractProvider implements ProviderInterface
     /**
      * @var string
      */
-    const GEOCODE_ENDPOINT_URL = 'http://open.mapquestapi.com/geocoding/v1/address?location=%s&outFormat=json&maxResults=1&thumbMaps=false';
+    const GEOCODE_ENDPOINT_NOKEY_URL = 'http://open.mapquestapi.com/geocoding/v1/address?location=%s&outFormat=json&maxResults=1&thumbMaps=false';
+
+    /**
+     * @var string
+     */
+    const GEOCODE_ENDPOINT_URL = 'http://www.mapquestapi.com/geocoding/v1/address?location=%s&outFormat=json&maxResults=1&key=%s';
 
     /**
      * @var string
      */
     const REVERSE_ENDPOINT_URL = 'http://open.mapquestapi.com/geocoding/v1/reverse?lat=%F&lng=%F';
 
+    public function __construct(HttpAdapterInterface $adapter, $locale = null, $apiKey = null)
+    {
+        parent::__construct($adapter, $locale);
+
+        $this->apiKey = $apiKey;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -38,7 +51,11 @@ public function getGeocodedData($address)
             throw new UnsupportedException('The MapQuestProvider does not support IP addresses.');
         }
 
-        $query = sprintf(self::GEOCODE_ENDPOINT_URL, urlencode($address));
+        if (null === $this->apiKey) {
+            $query = sprintf(self::GEOCODE_ENDPOINT_NOKEY_URL, urlencode($address));
+        } else {
+            $query = sprintf(self::GEOCODE_ENDPOINT_URL, urlencode($address), $this->apiKey);
+        }
 
         return $this->executeQuery($query);
     }

tests/Geocoder/Tests/Provider/MapQuestProviderTest.php

@@ -26,6 +26,16 @@ public function testGetGeocodedData()
         $provider->getGeocodedData('foobar');
     }
 
+    /**
+     * @expectedException Geocoder\Exception\NoResultException
+     * @expectedExceptionMessage Could not find results for given query: http://www.mapquestapi.com/geocoding/v1/address?location=foobar&outFormat=json&maxResults=1&key=my-api-key
+     */
+    public function testGetGeocodedDataWithApiKey()
+    {
+        $provider = new MapQuestProvider($this->getMockAdapter(), null, $apiKey = 'my-api-key');
+        $provider->getGeocodedData('foobar');
+    }
+
     /**
      * @expectedException \Geocoder\Exception\NoResultException
      * @expectedExceptionMessage Could not execute query http://open.mapquestapi.com/geocoding/v1/address?location=10+avenue+Gambetta%2C+Paris%2C+France&outFormat=json&maxResults=1&thumbMaps=false