]> git.openstreetmap.org Git - nominatim.git/blobdiff - lib/template/search-jsonv2.php
Merge branch 'master' of http://github.com/twain47/Nominatim
[nominatim.git] / lib / template / search-jsonv2.php
index cb09baa48dcbf7e6f634f0225cd4cce9df40c998..89479dfb84f6f0480a01898f899c83100300a6b9 100644 (file)
@@ -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)
        {
@@ -39,6 +36,7 @@
                $aPlace['lat'] = $aPointDetails['lat'];
                $aPlace['lon'] = $aPointDetails['lon'];
                $aPlace['display_name'] = $aPointDetails['name'];
+               $aPlace['place_rank'] = $aResult['rank_search'];
 
                $aPlace['category'] = $aPointDetails['class'];
                $aPlace['type'] = $aPointDetails['type'];
                $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);