X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/31c7f255414134ff63d78306763bd3937ccc325c..859347523fb2c7340b2df9980e52d5ea4543c82d:/lib/template/details-json.php?ds=inline diff --git a/lib/template/details-json.php b/lib/template/details-json.php index f58d38b2..4dc65a5b 100644 --- a/lib/template/details-json.php +++ b/lib/template/details-json.php @@ -20,46 +20,50 @@ $aPlaceDetails['housenumber'] = $aPointDetails['housenumber']; $aPlaceDetails['calculated_postcode'] = $aPointDetails['postcode']; $aPlaceDetails['country_code'] = $aPointDetails['country_code']; -$aPlaceDetails['indexed_date'] = (new DateTime('@'.$aPointDetails['indexed_epoch']))->format(DateTime::RFC822); +$aPlaceDetails['indexed_date'] = (new DateTime('@'.$aPointDetails['indexed_epoch']))->format(DateTime::RFC3339); $aPlaceDetails['importance'] = (float) $aPointDetails['importance']; $aPlaceDetails['calculated_importance'] = (float) $aPointDetails['calculated_importance']; $aPlaceDetails['extratags'] = $aPointDetails['aExtraTags']; $aPlaceDetails['calculated_wikipedia'] = $aPointDetails['wikipedia']; -$aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'; +if (isset($aPointDetails['icon'])) { + $aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png'; +} $aPlaceDetails['rank_address'] = (int) $aPointDetails['rank_address']; $aPlaceDetails['rank_search'] = (int) $aPointDetails['rank_search']; -$aPlaceDetails['rank_search_label'] = $aPointDetails['rank_search_label']; - -$aPlaceDetails['isarea'] = ($aPointDetails['isarea'] == 't'); -$aPlaceDetails['lat'] = (float) $aPointDetails['lat']; -$aPlaceDetails['lon'] = (float) $aPointDetails['lon']; +$aPlaceDetails['isarea'] = $aPointDetails['isarea']; +$aPlaceDetails['centroid'] = array( + 'type' => 'Point', + 'coordinates' => array( (float) $aPointDetails['lon'], (float) $aPointDetails['lat'] ) + ); $aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']); $funcMapAddressLine = function ($aFull) { - $aMapped = [ - 'localname' => $aFull['localname'], - 'place_id' => isset($aFull['place_id']) ? (int) $aFull['place_id'] : null, - 'osm_id' => isset($aFull['osm_id']) ? (int) $aFull['osm_id'] : null, - 'osm_type' => isset($aFull['osm_type']) ? $aFull['osm_type'] : null, - 'class' => $aFull['class'], - 'type' => $aFull['type'], - 'admin_level' => isset($aFull['admin_level']) ? (int) $aFull['admin_level'] : null, - 'rank_address' => $aFull['rank_address'] ? (int) $aFull['rank_address'] : null, - 'distance' => (float) $aFull['distance'] - ]; + $aMapped = array( + 'localname' => $aFull['localname'], + 'place_id' => isset($aFull['place_id']) ? (int) $aFull['place_id'] : null, + 'osm_id' => isset($aFull['osm_id']) ? (int) $aFull['osm_id'] : null, + 'osm_type' => isset($aFull['osm_type']) ? $aFull['osm_type'] : null, + 'place_type' => isset($aFull['place_type']) ? $aFull['place_type'] : null, + 'class' => $aFull['class'], + 'type' => $aFull['type'], + 'admin_level' => isset($aFull['admin_level']) ? (int) $aFull['admin_level'] : null, + 'rank_address' => $aFull['rank_address'] ? (int) $aFull['rank_address'] : null, + 'distance' => (float) $aFull['distance'], + 'isaddress' => isset($aFull['isaddress']) ? (bool) $aFull['isaddress'] : null + ); return $aMapped; }; $funcMapKeyword = function ($aFull) { - $aMapped = [ - 'id' => (int) $aFull['word_id'], - 'token' => $aFull['word_token'] - ]; + $aMapped = array( + 'id' => (int) $aFull['word_id'], + 'token' => $aFull['word_token'] + ); return $aMapped; };