Skip to content

AddressService: Use the structured query when possible #1465

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
tintou merged 1 commit into from
Nov 24, 2025
+18 −6
Merged

AddressService: Use the structured query when possible #1465

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
24 changes: 18 additions & 6 deletions lib/Service/AddressService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,28 @@ private function lookupAddressExternal($adr): array {

// we get rid of "post office box" field
$splitted_adr = explode(';', $adr);
if (count($splitted_adr) > 2) {
array_shift($splitted_adr);
}

// remove blank lines (#706)
$splitted_adr = array_filter(array_map('trim', $splitted_adr));
$query_adr = implode(', ', $splitted_adr);
// ADR in VCard is mandated to 7 fields
if (sizeof($splitted_adr) == 7) {
$query_adr_parts = [];
// This matches the nominatim query with the fields of 'ADR' in VCard
$query_key_part = ['','','street', 'city','state', 'postalcode', 'country'];
foreach ($query_key_part as $index => $query_key) {
if ($query_key !== '' && $splitted_adr[$index] !== '') {
$query_adr_parts += $query_key . '=' . urlencode($splitted_adr[$index]);
}
}

$query_adr = implode(';', $query_adr_parts);
} else {
// Try to do our best with a naive query
$query_adr = 'q=' . urlencode(implode(', ', $splitted_adr));
}


$result_json = @file_get_contents(
'https://nominatim.openstreetmap.org/search.php?q=' . urlencode($query_adr) . '&format=jsonv2',
'https://nominatim.openstreetmap.org/search?format=jsonv2&' . $query_adr,
false,
$context
);
Expand Down
Loading