Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 85f6fe8eb7c5fb7cdfe04fb29fd2ef3e4c9fd83a..b620c63e831a504d9fca78adf4df33fc35b37cf9 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -2,7 +2,7 @@
 
 $aFilteredPlaces = array();
 
-if (!sizeof($aPlace)) {
+if (empty($aPlace)) {
     if (isset($sError))
         $aFilteredPlaces['error'] = $sError;
     else $aFilteredPlaces['error'] = 'Unable to geocode';
@@ -17,7 +17,7 @@ if (!sizeof($aPlace)) {
     if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat'];
     if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon'];
 
-    if ($sOutputFormat == 'jsonv2') {
+    if ($sOutputFormat == 'jsonv2' || $sOutputFormat == 'geojson') {
         $aFilteredPlaces['place_rank'] = $aPlace['rank_search'];
 
         $aFilteredPlaces['category'] = $aPlace['class'];