fix display of nearpoint in debug view

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 693b30467f45d640073669cb85bc14f423f2e80d..a5439ef25a9dd39fd41ed2a843e9bbb45b4fa1dc 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,5 +1,6 @@
 <?php
 
 <?php
 

+

 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;
 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;


@@ -32,6 +33,23 @@ function getCacheMemoryMB()
     return (int)($aMatches[1]/1024);
 }
 
     return (int)($aMatches[1]/1024);
 }
 

+function getDatabaseDate(&$oDB)
+{
+    // Find the newest node in the DB
+    $iLastOSMID = $oDB->getOne("select max(osm_id) from place where osm_type = 'N'");
+    // Lookup the timestamp that node was created
+    $sLastNodeURL = 'https://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
+    $sLastNodeXML = file_get_contents($sLastNodeURL);
+
+    if ($sLastNodeXML === false) {
+        return false;
+    }
+
+    preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
+
+    return $aLastNodeDate[1];
+}
+

 
 function bySearchRank($a, $b)
 {
 
 function bySearchRank($a, $b)
 {


@@ -54,7 +72,7 @@ function getWordSets($aWords, $iDepth)
 {
     $aResult = array(array(join(' ', $aWords)));
     $sFirstToken = '';
 {
     $aResult = array(array(join(' ', $aWords)));
     $sFirstToken = '';

-    if ($iDepth < 8) {
+    if ($iDepth < 7) {

         while (sizeof($aWords) > 1) {
             $sWord = array_shift($aWords);
             $sFirstToken .= ($sFirstToken?' ':'').$sWord;
         while (sizeof($aWords) > 1) {
             $sWord = array_shift($aWords);
             $sFirstToken .= ($sFirstToken?' ':'').$sWord;


@@ -98,29 +116,6 @@ function getTokensFromSets($aSets)
 }
 
 
 }
 
 

-/*
-   GB Postcode functions
- */
-
-function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB)
-{
-    // Try an exact match on the gb_postcode table
-    $sSQL = 'select \'AA\', ST_X(ST_Centroid(geometry)) as lon,ST_Y(ST_Centroid(geometry)) as lat from gb_postcode where postcode = \''.$sPostcode.'\'';
-    $aNearPostcodes = chksql($oDB->getAll($sSQL));
-
-    if (sizeof($aNearPostcodes)) {
-        $aPostcodes = array();
-        foreach ($aNearPostcodes as $aPostcode) {
-            $aPostcodes[] = array('lat' => $aPostcode['lat'], 'lon' => $aPostcode['lon'], 'radius' => 0.005);
-        }
-
-        return $aPostcodes;
-    }
-
-    return false;
-}
-
-

 function getClassTypes()
 {
     return array(
 function getClassTypes()
 {
     return array(


@@ -466,11 +461,14 @@ function getResultDiameter($aResult)
 
 function javascript_renderData($xVal, $iOptions = 0)
 {
 
 function javascript_renderData($xVal, $iOptions = 0)
 {

-    if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400)
-        $iOptions |= JSON_UNESCAPED_UNICODE;
+    $iOptions |= JSON_UNESCAPED_UNICODE;
+    if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) {
+        $iOptions |= JSON_PRETTY_PRINT;
+    }
+

     $jsonout = json_encode($xVal, $iOptions);
 
     $jsonout = json_encode($xVal, $iOptions);
 

-    if (! isset($_GET['json_callback'])) {
+    if (!isset($_GET['json_callback'])) {

         header("Content-Type: application/json; charset=UTF-8");
         echo $jsonout;
     } else {
         header("Content-Type: application/json; charset=UTF-8");
         echo $jsonout;
     } else {


@@ -497,7 +495,10 @@ function _debugDumpGroupedSearches($aData, $aTokens)
         }
     }
     echo "<table border=\"1\">";
         }
     }
     echo "<table border=\"1\">";

-    echo "<tr><th>rank</th><th>Name Tokens</th><th>Name Not</th><th>Address Tokens</th><th>Address Not</th><th>country</th><th>operator</th><th>class</th><th>type</th><th>house#</th><th>Lat</th><th>Lon</th><th>Radius</th></tr>";
+    echo "<tr><th>rank</th><th>Name Tokens</th><th>Name Not</th>";
+    echo "<th>Address Tokens</th><th>Address Not</th><th>country</th>";
+    echo "<th>operator</th><th>class</th><th>type</th><th>postcode</th><th>house#</th>";
+    echo "<th>Lat</th><th>Lon</th><th>Radius</th></tr>";

     foreach ($aData as $iRank => $aRankedSet) {
         foreach ($aRankedSet as $aRow) {
             echo "<tr>";
     foreach ($aData as $iRank => $aRankedSet) {
         foreach ($aRankedSet as $aRow) {
             echo "<tr>";


@@ -541,10 +542,11 @@ function _debugDumpGroupedSearches($aData, $aTokens)
             echo "<td>".$aRow['sClass']."</td>";
             echo "<td>".$aRow['sType']."</td>";
 
             echo "<td>".$aRow['sClass']."</td>";
             echo "<td>".$aRow['sType']."</td>";
 

+            echo "<td>".$aRow['sPostcode']."</td>";

             echo "<td>".$aRow['sHouseNumber']."</td>";
 
             echo "<td>".$aRow['sHouseNumber']."</td>";
 

-            echo "<td>".$aRow['fLat']."</td>";
-            echo "<td>".$aRow['fLon']."</td>";
+            echo "<td>".$aRow['oNear']->lat()."</td>";
+            echo "<td>".$aRow['oNear']->lon()."</td>";

             echo "<td>".$aRow['fRadius']."</td>";
 
             echo "</tr>";
             echo "<td>".$aRow['fRadius']."</td>";
 
             echo "</tr>";


@@ -599,87 +601,10 @@ function addQuotes($s)
     return "'".$s."'";
 }
 
     return "'".$s."'";
 }
 

-// returns boolean
-function validLatLon($fLat, $fLon)
-{
-    return ($fLat <= 90.1 && $fLat >= -90.1 && $fLon <= 180.1 && $fLon >= -180.1);
-}
-
-// Do we have anything that looks like a lat/lon pair?
-// returns array(lat,lon,query_with_lat_lon_removed)
-// or null
-function looksLikeLatLonPair($sQuery)
-{
-    $sFound    = null;
-    $fQueryLat = null;
-    $fQueryLon = null;
-
-    if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[° ]+([0-9.]+)?[′\']*[, ]+([EW])[ ]+([0-9]+)[° ]+([0-9]+[0-9.]*)[′\']*?\\b/', $sQuery, $aData)) {
-        //              1         2                   3                  4         5            6
-        // degrees decimal minutes
-        // N 40 26.767, W 79 58.933
-        // N 40°26.767′, W 79°58.933′
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
-        $fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
-    } elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\']*[ ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\' ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1             2                      3          4            5                    6
-        // degrees decimal minutes
-        // 40 26.767 N, 79 58.933 W
-        // 40° 26.767′ N 79° 58.933′ W
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
-        $fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
-    } elseif (preg_match('/\\b([NS])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*[, ]+([EW])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*\\b/', $sQuery, $aData)) {
-        //                    1        2            3            4                5        6            7            8
-        // degrees decimal seconds
-        // N 40 26 46 W 79 58 56
-        // N 40° 26′ 46″, W 79° 58′ 56″
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60 + $aData[4]/3600);
-        $fQueryLon = ($aData[5]=='E'?1:-1) * ($aData[6] + $aData[7]/60 + $aData[8]/3600);
-    } elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1            2            3            4          5            6            7            8
-        // degrees decimal seconds
-        // 40 26 46 N 79 58 56 W
-        // 40° 26′ 46″ N, 79° 58′ 56″ W
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[4]=='N'?1:-1) * ($aData[1] + $aData[2]/60 + $aData[3]/3600);
-        $fQueryLon = ($aData[8]=='E'?1:-1) * ($aData[5] + $aData[6]/60 + $aData[7]/3600);
-    } elseif (preg_match('/\\b([NS])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*[, ]+([EW])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*\\b/', $sQuery, $aData)) {
-        //                    1        2                               3        4
-        // degrees decimal
-        // N 40.446° W 79.982°
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2]);
-        $fQueryLon = ($aData[3]=='E'?1:-1) * ($aData[4]);
-    } elseif (preg_match('/\\b([0-9]+[0-9]*\\.[0-9]+)[° ]+([NS])[, ]+([0-9]+[0-9]*\\.[0-9]+)[° ]+([EW])\\b/', $sQuery, $aData)) {
-        //                    1                           2          3                           4
-        // degrees decimal
-        // 40.446° N 79.982° W
-        $sFound    = $aData[0];
-        $fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]);
-        $fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[3]);
-    } elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData)) {
-        //                 1          2                             3                        4
-        // degrees decimal
-        // 12.34, 56.78
-        // [12.456,-78.90]
-        $sFound    = $aData[0];
-        $fQueryLat = $aData[2];
-        $fQueryLon = $aData[3];
-    }
-
-    if (!validLatLon($fQueryLat, $fQueryLon)) return;
-    $sQuery = trim(str_replace($sFound, ' ', $sQuery));
-
-    return array('lat' => $fQueryLat, 'lon' => $fQueryLon, 'query' => $sQuery);
-}
-

 
 function geometryText2Points($geometry_as_text, $fRadius)
 {
 
 function geometryText2Points($geometry_as_text, $fRadius)
 {

-    $aPolyPoints = NULL;
+    $aPolyPoints = null;

     if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
         //
         preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
     if (preg_match('#POLYGON\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
         //
         preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);