more generalized javascript_renderData

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

diff --git a/lib/template/address-json.php b/lib/template/address-json.php
index 3c7327a32465dc0c568005b1b41d867e2d997c1d..83c8b57cb523944e739901f5994895e72db0858e 100644 (file)
--- a/lib/template/address-json.php
+++ b/lib/template/address-json.php
@@ -1,7 +1,4 @@
 <?php
-       header ("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
        $aFilteredPlaces = array();
 
        if (!sizeof($aPlace))
@@ -27,13 +24,5 @@
                if ($bShowAddressDetails) $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);