@@ -127,11 +127,7 @@ |
||
| 127 | 127 | * Get coordinates latitude/longitude |
| 128 | 128 | * |
| 129 | 129 | * @return array The latitude/longitude coordinates |
| 130 | - * @param string $street[optional] |
|
| 131 | 130 | * @param string $streetNumber[optional] |
| 132 | - * @param string $city[optional] |
|
| 133 | - * @param string $zip[optional] |
|
| 134 | - * @param string $country[optional] |
|
| 135 | 131 | */ |
| 136 | 132 | public function getCoordinates( |
| 137 | 133 | $street = null, |
@@ -45,7 +45,9 @@ discard block |
||
| 45 | 45 | $url = ($this->https ? 'https://' : 'http://') . self::API_URL . '?'; |
| 46 | 46 | |
| 47 | 47 | // add every parameter to the url |
| 48 | - foreach ($parameters as $key => $value) $url .= $key . '=' . urlencode($value) . '&'; |
|
| 48 | + foreach ($parameters as $key => $value) { |
|
| 49 | + $url .= $key . '=' . urlencode($value) . '&'; |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | // trim last & |
| 51 | 53 | $url = trim($url, '&'); |
@@ -61,7 +63,9 @@ discard block |
||
| 61 | 63 | curl_setopt($curl, CURLOPT_URL, $url); |
| 62 | 64 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 63 | 65 | curl_setopt($curl, CURLOPT_TIMEOUT, 10); |
| 64 | - if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); |
|
| 66 | + if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) { |
|
| 67 | + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); |
|
| 68 | + } |
|
| 65 | 69 | |
| 66 | 70 | // execute |
| 67 | 71 | $response = curl_exec($curl); |
@@ -74,7 +78,9 @@ discard block |
||
| 74 | 78 | curl_close($curl); |
| 75 | 79 | |
| 76 | 80 | // we have errors |
| 77 | - if ($errorNumber != '') throw new GeolocationException($errorMessage); |
|
| 81 | + if ($errorNumber != '') { |
|
| 82 | + throw new GeolocationException($errorMessage); |
|
| 83 | + } |
|
| 78 | 84 | |
| 79 | 85 | // redefine response as json decoded |
| 80 | 86 | $response = json_decode($response); |
@@ -161,19 +167,29 @@ discard block |
||
| 161 | 167 | $item = array(); |
| 162 | 168 | |
| 163 | 169 | // add street |
| 164 | - if (!empty($street)) $item[] = $street; |
|
| 170 | + if (!empty($street)) { |
|
| 171 | + $item[] = $street; |
|
| 172 | + } |
|
| 165 | 173 | |
| 166 | 174 | // add street number |
| 167 | - if (!empty($streetNumber)) $item[] = $streetNumber; |
|
| 175 | + if (!empty($streetNumber)) { |
|
| 176 | + $item[] = $streetNumber; |
|
| 177 | + } |
|
| 168 | 178 | |
| 169 | 179 | // add city |
| 170 | - if (!empty($city)) $item[] = $city; |
|
| 180 | + if (!empty($city)) { |
|
| 181 | + $item[] = $city; |
|
| 182 | + } |
|
| 171 | 183 | |
| 172 | 184 | // add zip |
| 173 | - if (!empty($zip)) $item[] = $zip; |
|
| 185 | + if (!empty($zip)) { |
|
| 186 | + $item[] = $zip; |
|
| 187 | + } |
|
| 174 | 188 | |
| 175 | 189 | // add country |
| 176 | - if (!empty($country)) $item[] = $country; |
|
| 190 | + if (!empty($country)) { |
|
| 191 | + $item[] = $country; |
|
| 192 | + } |
|
| 177 | 193 | |
| 178 | 194 | // define value |
| 179 | 195 | $address = implode(' ', $item); |