Skip to content

Commit 965471a

Browse files
committed
Refactor geocoding result processing
1 parent 923a23c commit 965471a

File tree

1 file changed

+5
-34
lines changed

1 file changed

+5
-34
lines changed

src/ProviderAndDumperAggregator.php

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,7 @@ public function geocodeQuery(GeocodeQuery $query) : self
8282
"geocoder-{$cacheKey}",
8383
config('geocoder.cache-duraction', 0),
8484
function () use ($query) {
85-
$addresses = collect();
86-
$addressCollection = $this->aggregator->geocodeQuery($query);
87-
88-
foreach ($addressCollection as $address) {
89-
$addresses->push($address);
90-
}
91-
92-
return $addresses;
85+
return collect($this->aggregator->geocodeQuery($query));
9386
}
9487
);
9588

@@ -103,14 +96,7 @@ public function reverseQuery(ReverseQuery $query) : self
10396
"geocoder-{$cacheKey}",
10497
config('geocoder.cache-duraction', 0),
10598
function () use ($query) {
106-
$addresses = collect();
107-
$addressCollection = $this->aggregator->reverseQuery($query);
108-
109-
foreach ($addressCollection as $address) {
110-
$addresses->push($address);
111-
}
112-
113-
return $addresses;
99+
return collect($this->aggregator->reverseQuery($query));
114100
}
115101
);
116102

@@ -129,15 +115,7 @@ public function geocode(string $value) : self
129115
"geocoder-{$cacheKey}",
130116
config('geocoder.cache-duraction', 0),
131117
function () use ($value) {
132-
133-
$addresses = collect();
134-
$addressCollection = $this->aggregator->geocode($value);
135-
136-
foreach ($addressCollection as $address) {
137-
$addresses->push($address);
138-
}
139-
140-
return $addresses;
118+
return collect($this->aggregator->geocode($value));
141119
}
142120
);
143121

@@ -151,14 +129,7 @@ public function reverse(float $latitude, float $longitude) : self
151129
"geocoder-{$cacheId}",
152130
config('geocoder.cache-duraction', 0),
153131
function () use ($latitude, $longitude) {
154-
$addresses = collect();
155-
$addressCollection = $this->aggregator->reverse($latitude, $longitude);
156-
157-
foreach ($addressCollection as $address) {
158-
$addresses->push($address);
159-
}
160-
161-
return $addresses;
132+
return collect($this->aggregator->reverse($latitude, $longitude));
162133
}
163134
);
164135

@@ -177,7 +148,7 @@ public function getLimit() : int
177148
return $this->aggregator->getLimit();
178149
}
179150

180-
public function registerProvider(string $provider) : self
151+
public function registerProvider($provider) : self
181152
{
182153
$this->aggregator->registerProvider($provider);
183154

0 commit comments

Comments
 (0)