remove name from geocodejson when not set

diff --git a/lib/template/address-geocodejson.php b/lib/template/address-geocodejson.php
index 98c368b324b0342b7cb3d2db804eec02337cde7c..0066e80e29adb13cce8320360c57eafddf7ba87e 100644 (file)
--- a/lib/template/address-geocodejson.php
+++ b/lib/template/address-geocodejson.php
@@ -30,7 +30,9 @@ if (empty($aPlace)) {
 
     $aFilteredPlaces['properties']['geocoding']['label'] = $aPlace['langaddress'];
 
 
     $aFilteredPlaces['properties']['geocoding']['label'] = $aPlace['langaddress'];
 

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

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

diff --git a/lib/template/search-geocodejson.php b/lib/template/search-geocodejson.php
index dfb402bdb2f485a83a37bc99ad6cc674613c4ea6..3e3a31c443c7948b58e6f8c5500fc366b7f34ad0 100644 (file)
--- a/lib/template/search-geocodejson.php
+++ b/lib/template/search-geocodejson.php
@@ -20,7 +20,9 @@ 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(