Skip to content

Commit 6fe7a2b

Browse files
committed
Update Addok.php
Get correct properties when `type=street` instead of `type=housenumber`
1 parent 9b03a25 commit 6fe7a2b

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

Addok.php

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,28 @@ public function geocodeQuery(GeocodeQuery $query): Collection
9393
$results = [];
9494
foreach ($json->features as $feature) {
9595
$coordinates = $feature->geometry->coordinates;
96-
$streetName = !empty($feature->properties->street) ? $feature->properties->street : null;
97-
$number = !empty($feature->properties->housenumber) ? $feature->properties->housenumber : null;
98-
$municipality = !empty($feature->properties->city) ? $feature->properties->city : null;
99-
$postCode = !empty($feature->properties->postCode) ? $feature->properties->postCode : null;
96+
97+
switch ($feature->properties->type) {
98+
case 'housenumber':
99+
$streetName = !empty($feature->properties->street) ? $feature->properties->street : null;
100+
$number = !empty($feature->properties->housenumber) ? $feature->properties->housenumber : null;
101+
break;
102+
case 'street':
103+
$streetName = !empty($feature->properties->name) ? $feature->properties->name : null;
104+
$number = null;
105+
break;
106+
}
107+
$locality = !empty($feature->properties->city) ? $feature->properties->city : null;
108+
$postalCode = !empty($feature->properties->postcode) ? $feature->properties->postcode : null;
100109

101110
$results[] = Address::createFromArray([
102111
'providedBy' => $this->getName(),
103112
'latitude' => $coordinates[1],
104113
'longitude' => $coordinates[0],
105114
'streetNumber' => $number,
106115
'streetName' => $streetName,
107-
'locality' => $municipality,
108-
'postalCode' => $postCode,
116+
'locality' => $locality,
117+
'postalCode' => $postalCode,
109118
]);
110119
}
111120

0 commit comments

Comments
 (0)