safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

directly return data in function

Browse Source 
The temporary variable is not necessary.
This commit is contained in:
Sarah Hoffmann
2021-07-11 19:24:04 +02:00
parent d933ead2b5
commit 58b10074ad
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib-php/template/details-json.php
View File

@@ -43,29 +43,26 @@ $aPlaceDetails['centroid'] = array(
$aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']); $aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']);
$funcMapAddressLine = function ($aFull) { $funcMapAddressLine = function ($aFull) {
$aMapped = array( return array(
'localname' => $aFull['localname'], 'localname' => $aFull['localname'],
'place_id' => isset($aFull['place_id']) ? (int) $aFull['place_id'] : null, 'place_id' => isset($aFull['place_id']) ? (int) $aFull['place_id'] : null,
'osm_id' => isset($aFull['osm_id']) ? (int) $aFull['osm_id'] : null, 'osm_id' => isset($aFull['osm_id']) ? (int) $aFull['osm_id'] : null,
'osm_type' => isset($aFull['osm_type']) ? $aFull['osm_type'] : null, 'osm_type' => isset($aFull['osm_type']) ? $aFull['osm_type'] : null,
'place_type' => isset($aFull['place_type']) ? $aFull['place_type'] : null, 'place_type' => isset($aFull['place_type']) ? $aFull['place_type'] : null,
'class' => $aFull['class'], 'class' => $aFull['class'],
'type' => $aFull['type'], 'type' => $aFull['type'],
'admin_level' => isset($aFull['admin_level']) ? (int) $aFull['admin_level'] : null, 'admin_level' => isset($aFull['admin_level']) ? (int) $aFull['admin_level'] : null,
'rank_address' => $aFull['rank_address'] ? (int) $aFull['rank_address'] : null, 'rank_address' => $aFull['rank_address'] ? (int) $aFull['rank_address'] : null,
'distance' => (float) $aFull['distance'], 'distance' => (float) $aFull['distance'],
'isaddress' => isset($aFull['isaddress']) ? (bool) $aFull['isaddress'] : null 'isaddress' => isset($aFull['isaddress']) ? (bool) $aFull['isaddress'] : null
); );
return $aMapped;
}; };
$funcMapKeyword = function ($aFull) { $funcMapKeyword = function ($aFull) {
$aMapped = array( return array(
'id' => (int) $aFull['word_id'], 'id' => (int) $aFull['word_id'],
'token' => $aFull['word_token'] 'token' => $aFull['word_token']
); );
return $aMapped;
}; };
if ($aAddressLines) { if ($aAddressLines) {