diff --git a/CHANGELOG.md b/CHANGELOG.md index 94dde8f..aa2f3e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # TDE - Geo Address Changelog +## 1.0.15 - 2021-10-19 +### Fixed +- Fixed a bug where still an array was expected instead of the GeoAddress-model. + ## 1.0.14 - 2021-10-13 ### Fixed - Fixed an issue where existing GeoAddress-models would not be properly normalized/serialized into the element. diff --git a/src/models/GeoAddressModel.php b/src/models/GeoAddressModel.php index 17babd8..e055daa 100644 --- a/src/models/GeoAddressModel.php +++ b/src/models/GeoAddressModel.php @@ -68,6 +68,11 @@ class GeoAddressModel extends Model */ public $formattedAddress; + /** + * @var float|null + */ + public $filterDistance; + /** * Returns the validation rules for attributes. * diff --git a/src/services/GeoAddressService.php b/src/services/GeoAddressService.php index 8aeae9f..8176ae0 100644 --- a/src/services/GeoAddressService.php +++ b/src/services/GeoAddressService.php @@ -5,6 +5,7 @@ use Craft; use craft\base\Component; use TDE\GeoAddress\GeoAddress; +use TDE\GeoAddress\models\GeoAddressModel; /** * Class GeoAddressService @@ -116,13 +117,10 @@ public function filterEntries(array $entries, $lat, $lng, $radius) } // add the distance, might be useful for the user - $entry->setFieldValue( - 'address', - array_merge( - $entry->getFieldValue('address'), - ['filterDistance' => $filterDistance] - ) - ); + /** @var GeoAddressModel $model */ + $model = $entry->getFieldValue('address'); + $model->filterDistance = $filterDistance; + $entry->setFieldValue('address', $model); $filterResults[] = $entry; }