Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Geolocation.php

Author: jeroendesloovere

src/Exception.php

@@ -26,13 +26,4 @@ public static function noCoordinatesFoundforAddress(array $addressData): Excepti
              With address: "' . implode(', ', $addressData) . '".'
         );
     }
-
-    public static function overQueryLimit(): Exception
-    {
-        return new self(
-            'You have exceeded your daily request quota for this API.
-             We recommend registering for a key at the Google Developers Console:
-             https://console.developers.google.com/apis/credentials?project=_'
-        );
-    }
 }

src/Geolocation.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace JeroenDesloovere\Geolocation;
+
 use JeroenDesloovere\Geolocation\Result\Address;
 use JeroenDesloovere\Geolocation\Result\Coordinates;
 
@@ -14,13 +15,26 @@
 class Geolocation
 {
     // API URL
-    const API_URL = 'http://maps.googleapis.com/maps/api/geocode/json';
+    const API_URL = 'maps.googleapis.com/maps/api/geocode/json';
+
+    private $api_key;
+    private $https;
+
+    public function __construct($api_key = null, $https = false)
+    {
+        $this->https = $https;
+
+        if ($api_key) {
+            $this->api_key = $api_key;
+            $this->https = true;
+        }
+    }
 
     /**
      * Do call
      *
      * @param  array $parameters
-     * @return object
+     * @return mixed
      * @throws Exception
      */
     protected function doCall($parameters = array())
@@ -31,14 +45,18 @@ protected function doCall($parameters = array())
         }
 
         // define url
-        $url = self::API_URL . '?';
+        $url = ($this->https ? 'https://' : 'http://') . self::API_URL . '?';
 
         // add every parameter to the url
         foreach ($parameters as $key => $value) $url .= $key . '=' . urlencode($value) . '&';
 
         // trim last &
         $url = trim($url, '&');
 
+        if ($this->api_key) {
+            $url .= '&key=' . $this->api_key;
+        }
+
         // init curl
         $curl = curl_init();
 
@@ -64,8 +82,9 @@ protected function doCall($parameters = array())
         // redefine response as json decoded
         $response = json_decode($response);
 
-        if ($response->status === 'OVER_QUERY_LIMIT') {
-            throw Exception::overQueryLimit();
+        // API returns with an error
+        if (isset($response->error_message)) {
+            throw new Exception($response->error_message);
         }
 
         // return the content