Skip to content

Issue #56: Fix optional value handling in geofieldProximityManual #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
indigoxela merged 1 commit into from
Mar 11, 2026
Merged

Issue #56: Fix optional value handling in geofieldProximityManual #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions views/proximity_plugins/geofieldProximityManual.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,26 @@ class geofieldProximityManual extends geofieldProximityBase implements geofieldP
$form['value']['#origin_element'] = 'geofield_latlon';
}

/**
* {@inheritdoc}
*/
public function getSourceValue($views_plugin) {
return array(
'latitude' => (isset($views_plugin->value)) ? $views_plugin->value['origin']['lat'] : $views_plugin->options['geofield_proximity_manual']['lat'],
'longitude' => (isset($views_plugin->value)) ? $views_plugin->value['origin']['lon'] : $views_plugin->options['geofield_proximity_manual']['lon'],
);
if (empty($views_plugin->value) || empty($views_plugin->value['origin'])) {
return;
}
// Provided value or default value set by admin, both can be empty.
// If the field were required, we wouldn't even get here.
$lat = ($views_plugin->value['origin']['lat']) ?? $views_plugin->options['geofield_proximity_manual']['lat'];
$lon = ($views_plugin->value['origin']['lon']) ?? $views_plugin->options['geofield_proximity_manual']['lon'];
$lat = trim($lat);
$lon = trim($lon);
// We can not use empty(), as "0" is valid, too.
if (strlen($lat) && strlen($lon)) {
return array(
'latitude' => $lat,
'longitude' => $lon,
);
}
return;
}
}
}
Loading