update osm2pgsql to latest version

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index cc8a90e0ae134350ec3039addb4adab1b379a0d7..1959ded3d4748738215e4349f3bb35a1aad25267 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -94,7 +94,7 @@
                return ($a['foundorder'] < $b['foundorder']?-1:1);
        }
 
                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'])
        {
                // 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;
 
                /*
                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));
                */
                        $iZoom = 18 + round(log($fTotalFac,32));
                        $iZoom = max(13,min(18,$iZoom));
                */


@@ -597,7 +597,7 @@
     {
         header("Access-Control-Allow-Origin: *");
 
     {
         header("Access-Control-Allow-Origin: *");
 

-        $jsonout = json_encode($xVal, JSON_UNESCAPED_UNICODE);
+        $jsonout = json_encode($xVal);

 
                if( ! isset($_GET['json_callback'])) {
                        header("Content-Type: application/json; charset=UTF-8");
 
                if( ! isset($_GET['json_callback'])) {
                        header("Content-Type: application/json; charset=UTF-8");