hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

only return polygon if &polygon_geojson=1 is set

Browse Source
This commit is contained in:
Marc Tobias Metten
2018-03-19 01:34:48 +01:00
committed by Sarah Hoffmann
parent 45bc511955
commit 0eb71cdce8
4 changed files with 87 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ $aPlaceDetails['lon'] = (float) $aPointDetails['lon'];
$aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']);
$funcMapAddressLines = function($aFull) {
$funcMapAddressLines = function ($aFull) {
$aMapped = [
'localname' => $aFull['localname'],
'place_id' => (int) $aFull['place_id'],
@@ -53,7 +53,7 @@ $funcMapAddressLines = function($aFull) {
return $aMapped;
};
$funcMapKeywords = function($aFull) {
$funcMapKeywords = function ($aFull) {
$aMapped = [
'id' => (int) $aFull['word_id'],
'token' => $aFull['word_token']
@@ -62,29 +62,29 @@ $funcMapKeywords = function($aFull) {
};
if ($aAddressLines) {
$aPlaceDetails['address'] = array_map($funcLines, $aAddressLines);
$aPlaceDetails['address'] = array_map($funcMapAddressLines, $aAddressLines);
}
if ($aLinkedLines) {
$aPlaceDetails['linked_places'] = array_map($funcLines, $aLinkedLines);
$aPlaceDetails['linked_places'] = array_map($funcMapAddressLines, $aLinkedLines);
}
if ($bIncludeKeywords) {
$aPlaceDetails['keywords'] = array();
if ($aPlaceSearchNameKeywords) {
$aPlaceDetails['keywords']['name'] = array_map($funcKeywords, $aPlaceSearchNameKeywords);
$aPlaceDetails['keywords']['name'] = array_map($funcMapKeywords, $aPlaceSearchNameKeywords);
}
if ($aPlaceSearchAddressKeywords) {
$aPlaceDetails['keywords']['address'] = array_map($funcKeywords, $aPlaceSearchAddressKeywords);
$aPlaceDetails['keywords']['address'] = array_map($funcMapKeywords, $aPlaceSearchAddressKeywords);
}
}
if ($bIncludeChildPlaces) {
$aPlaceDetails['parentof'] = array_map($funcLines, $aParentOfLines);
$aPlaceDetails['parentof'] = array_map($funcMapAddressLines, $aParentOfLines);
if ($bGroupParents) {
if ($bGroupChildPlaces) {
$aGroupedAddressLines = [];
foreach ($aParentOfLines as $aAddressLine) {
if ($aAddressLine['type'] == 'yes') $sType = $aAddressLine['class'];