Skip to content

Commit

Permalink
Update Geo6.php
Browse files Browse the repository at this point in the history
Streetname is the only required field
  • Loading branch information
jbelien committed Jun 5, 2018
1 parent 137057b commit b5ec74b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Geo6.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function geocodeQuery(GeocodeQuery $query): Collection
$address = $query->getText();

$streetName = $query->getData('streetName');
$streetNumber = $query->getData('streetNumber');
$streetNumber = $query->getData('streetNumber') ?? '';
$postalCode = $query->getData('postalCode') ?? null;
$locality = $query->getData('locality') ?? null;

Expand All @@ -72,8 +72,8 @@ public function geocodeQuery(GeocodeQuery $query): Collection
}

// Save a request if no valid address entered
if (empty($address) || empty($streetName) || (empty($postalCode) && empty($locality))) {
throw new InvalidArgument('Address, Street Name, and Locality (or Postal Code) cannot be empty.');
if (empty($address) || empty($streetName)) {
throw new InvalidArgument('Address and streetname cannot be empty.');
}

$language = '';
Expand All @@ -84,8 +84,10 @@ public function geocodeQuery(GeocodeQuery $query): Collection
$url = rtrim(self::GEOCODE_ENDPOINT_URL, '/');
if (!is_null($postalCode) && !is_null($locality)) {
$url = sprintf($url.'/geocode/getAddressList/%s/%s/%s/%s', urlencode($locality), urlencode($postalCode), urlencode($streetName), urlencode($streetNumber));
} else {
} elseif (!is_null($postalcode) || !is_null($locality)) {
$url = sprintf($url.'/geocode/getAddressList/%s/%s/%s', urlencode($postalCode ?? $locality), urlencode($streetName), urlencode($streetNumber));
} else {
$url = sprintf($url.'/geocode/getAddressList/%s/%s', urlencode($streetName), urlencode($streetNumber));
}
$json = $this->executeQuery($url);

Expand Down

0 comments on commit b5ec74b

Please sign in to comment.