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 fe184dfea2d8c1e910b5fdf7e6ff41104efb070b..0449dbb94f20916c26b1f68562e0ea185d7d3807 100644 (file)
--- a/lib/template/details-json.php
+++ b/lib/template/details-json.php
@@ -26,8 +26,9 @@ $aPlaceDetails['calculated_importance'] = (float) $aPointDetails['calculated_imp
 
 $aPlaceDetails['extratags'] = $aPointDetails['aExtraTags'];
 $aPlaceDetails['calculated_wikipedia'] = $aPointDetails['wikipedia'];
 
 $aPlaceDetails['extratags'] = $aPointDetails['aExtraTags'];
 $aPlaceDetails['calculated_wikipedia'] = $aPointDetails['wikipedia'];

-if ($aPointDetails['icon']) {
-    $aPlaceDetails['icon'] = CONST_Website_BaseURL.'images/mapicons/'.$aPointDetails['icon'].'.n.32.png';
+$sIcon = Nominatim\ClassTypes\getIconFile($aPointDetails);
+if (isset($sIcon)) {
+    $aPlaceDetails['icon'] = $sIcon;

 }
 
 $aPlaceDetails['rank_address'] = (int) $aPointDetails['rank_address'];
 }
 
 $aPlaceDetails['rank_address'] = (int) $aPointDetails['rank_address'];


@@ -53,7 +54,7 @@ $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'],

-                'isaddress' => (bool) $aFull['isaddress']
+                'isaddress' => isset($aFull['isaddress']) ? (bool) $aFull['isaddress'] : null

                );
 
     return $aMapped;
                );
 
     return $aMapped;