Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / template / search-geocodejson.php

diff --git a/lib/template/search-geocodejson.php b/lib/template/search-geocodejson.php
index c046b4affdde1db98be548913c2521bda6947f16..3e3a31c443c7948b58e6f8c5500fc366b7f34ad0 100644 (file)
--- a/lib/template/search-geocodejson.php
+++ b/lib/template/search-geocodejson.php
@@ -20,11 +20,13 @@ foreach ($aSearchResults as $iResNum => $aPointDetails) {
 
     $aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
 
 
     $aPlace['properties']['geocoding']['label'] = $aPointDetails['langaddress'];
 

-    $aPlace['properties']['geocoding']['name'] = $aPointDetails['placename'];
+    if ($aPointDetails['placename'] !== null) {
+        $aPlace['properties']['geocoding']['name'] = $aPointDetails['placename'];
+    }

 
     if (isset($aPointDetails['address'])) {
         $aPointDetails['address']->addGeocodeJsonAddressParts(
 
     if (isset($aPointDetails['address'])) {
         $aPointDetails['address']->addGeocodeJsonAddressParts(

-          $aPlace['properties']['geocoding']
+            $aPlace['properties']['geocoding']

         );
 
         $aPlace['properties']['geocoding']['admin']
         );
 
         $aPlace['properties']['geocoding']['admin']