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

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

diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php
index 51d3e1a3027863c51815fccd8dd465855f6cd2fd..9624718273fadcc64679bf4a456150f1d75c9b7a 100644 (file)
--- a/lib/template/address-jsonv2.php
+++ b/lib/template/address-jsonv2.php
@@ -1,7 +1,4 @@
 <?php
-       header ("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
        $aFilteredPlaces = array();
 
        if (!sizeof($aPlace))
@@ -32,13 +29,4 @@
                if ($bShowAddressDetails && $aAddress && sizeof($aAddress)) $aFilteredPlaces['address'] = $aAddress;
        }
 
-       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);