Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / details-json.php

diff --git a/lib/template/details-json.php b/lib/template/details-json.php
index f58d38b24eeb544449cecdfe329a550df2f74734..288c914c10294c9bc0c2d7817f97ba8c879e7b08 100644 (file)
--- a/lib/template/details-json.php
+++ b/lib/template/details-json.php
@@ -20,7 +20,7 @@ $aPlaceDetails['housenumber'] = $aPointDetails['housenumber'];
 $aPlaceDetails['calculated_postcode'] = $aPointDetails['postcode'];
 $aPlaceDetails['country_code'] = $aPointDetails['country_code'];
 
 $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['importance'] = (float) $aPointDetails['importance'];
 $aPlaceDetails['calculated_importance'] = (float) $aPointDetails['calculated_importance'];
 


@@ -30,17 +30,17 @@ $aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails
 
 $aPlaceDetails['rank_address'] = (int) $aPointDetails['rank_address'];
 $aPlaceDetails['rank_search'] = (int) $aPointDetails['rank_search'];
 
 $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['isarea'] = ($aPointDetails['isarea'] == 't');

-$aPlaceDetails['lat'] = (float) $aPointDetails['lat'];
-$aPlaceDetails['lon'] = (float) $aPointDetails['lon'];
-
+$aPlaceDetails['centroid'] = array(
+    'type' => 'Point',
+    'coordinates' => array( (float) $aPointDetails['lon'], (float) $aPointDetails['lat'] )
+);

 
 $aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']);
 
 $funcMapAddressLine = function ($aFull) {
 
 $aPlaceDetails['geometry'] = json_decode($aPointDetails['asgeojson']);
 
 $funcMapAddressLine = function ($aFull) {

-    $aMapped = [
+    $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,
         '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,


@@ -50,16 +50,16 @@ $funcMapAddressLine = function ($aFull) {
         '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']
         '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']

-    ];
+    );

 
     return $aMapped;
 };
 
 $funcMapKeyword = function ($aFull) {
 
     return $aMapped;
 };
 
 $funcMapKeyword = function ($aFull) {

-    $aMapped = [
+    $aMapped = array(

         'id' => (int) $aFull['word_id'],
         'token' => $aFull['word_token']
         'id' => (int) $aFull['word_id'],
         'token' => $aFull['word_token']

-    ];
+    );

     return $aMapped;
 };
 
     return $aMapped;
 };