Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim

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

diff --git a/lib/template/search-jsonv2.php b/lib/template/search-jsonv2.php
index 5e52238b73f029abc56a7e5e2f45994bfdc83919..095bfb797a6b5b27e1aaddb14ba298bc49db7e5f 100644 (file)
--- a/lib/template/search-jsonv2.php
+++ b/lib/template/search-jsonv2.php
@@ -1,7 +1,4 @@
 <?php
-       header("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
        $aFilteredPlaces = array();
        foreach($aSearchResults as $iResNum => $aPointDetails)
        {
@@ -47,7 +44,7 @@
                        $aPlace['icon'] = $aPointDetails['icon'];
                }
 
-               if (isset($aPointDetails['address']))
+               if (isset($aPointDetails['address']) && sizeof($aPointDetails['address'])>0)
                {
                        $aPlace['address'] = $aPointDetails['address'];
                 }
@@ -55,11 +52,4 @@
                $aFilteredPlaces[] = $aPlace;
        }
 
-       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
-       {
-               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
-       }
-       else
-       {
-               echo javascript_renderData($aFilteredPlaces);
-       }
+       javascript_renderData($aFilteredPlaces);