fix format error in polygon output

[nominatim.git] / lib / lib.php
diff --git a/lib/lib.php b/lib/lib.php

index 39e6da407d5f761c48c00e481182920f1f23399f..1959ded3d4748738215e4349f3bb35a1aad25267 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -7,7 +7,7 @@
                 echo "<html><body><h1>Internal Server Error</h1>";
                 echo '<p>Nominatim has encountered an internal error while processing your request. This is most likely because of a bug in the software.</p>';
                 echo "<p><b>Details:</b> ".$sError,"</p>";
-               echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above an the URL you used.</p>';
+               echo '<p>Feel free to report the bug in the <a href="http://trac.openstreetmap.org">OSM bug database</a>. Please include the error message above and the URL you used.</p>';
                 if (CONST_Debug)
                 {
                         echo "<hr><h2>Debugging Information</h2><br>";
@@ -94,7 +94,7 @@
                 return ($a['foundorder'] < $b['foundorder']?-1:1);
         }
  
-       function getPrefferedLangauges()
+       function getPreferredLanguages()
         {
                 // If we have been provided the value in $_GET it overrides browser value
                 if (isset($_GET['accept-language']) && $_GET['accept-language'])
@@ -273,7 +273,7 @@
                 return false;
  
                 /*
-                       $fTotalFac is a suprisingly good indicator of accuracy
+                       $fTotalFac is a surprisingly good indicator of accuracy
                         $iZoom = 18 + round(log($fTotalFac,32));
                         $iZoom = max(13,min(18,$iZoom));
                 */
@@ -592,45 +592,25 @@
         }
         
         
-        function javascript_isarray($xVal)
-        {
-                if (!is_array($xVal)) return false;
-                for($i = 0; $i < sizeof($xVal); $i++)
-                {
-                        if (!array_key_exists($i, $xVal)) return false;
-                }
-                return true;
-        }
  
-        function javascript_renderData($xVal, $bForceHash = false)
-        {
-                if (is_array($xVal))
-                {
-                        $aVals = array();
-                        if (javascript_isarray($xVal) && !$bForceHash)
-                        {
-                                foreach($xVal as $sKey => $xData)
-                                {
-                                        $aVals[] = javascript_renderData($xData);
-                                }
-                                return '['.join(',',$aVals).']';
-                        }
-                        else
-                        {
-                                foreach($xVal as $sKey => $xData)
-                                {
-                                        $aVals[] = '"'.addslashes($sKey).'"'.':'.javascript_renderData($xData);
-                                }
-                                return '{'.join(',',$aVals).'}';
-                        }
-                }
-                else
-                {
-                        if (is_bool($xVal)) return $xVal?'true':'false';
-//                     if (is_numeric($xVal)) return $xVal;
-                        return '"'.str_replace('>','\\>',str_replace(array("\n","\r"),'\\n',str_replace(array("\n\r","\r\n"),'\\n',str_replace('"','\\"',$xVal)))).'"';
-                }
-        }
+    function javascript_renderData($xVal)
+    {
+        header("Access-Control-Allow-Origin: *");
+
+        $jsonout = json_encode($xVal);
+
+               if( ! isset($_GET['json_callback'])) {
+                       header("Content-Type: application/json; charset=UTF-8");
+                       echo $jsonout;
+               } else {
+                       if (preg_match('/^[$_\p{L}][$_\p{L}\p{Nd}.[\]]*$/u',$_GET['json_callback'])) {
+                               header("Content-Type: application/javascript; charset=UTF-8");
+                               echo $_GET['json_callback'].'('.$jsonout.')';
+                       } else {
+                               header('HTTP/1.0 400 Bad Request');
+                       }
+               }
+    }
  
         function _debugDumpGroupedSearches($aData, $aTokens)
         {