X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2a784fa3d4533d11e3227f868085dcee5a9870c6..ecee3828b38dbcf1712c1a1a3ccee1c3bc774f78:/lib/lib.php
diff --git a/lib/lib.php b/lib/lib.php
index 693b3046..a5351918 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,5 +1,6 @@
1) {
$sWord = array_shift($aWords);
$sFirstToken .= ($sFirstToken?' ':'').$sWord;
@@ -98,10 +99,6 @@ function getTokensFromSets($aSets)
}
-/*
- GB Postcode functions
- */
-
function gbPostcodeCalculate($sPostcode, $sPostcodeSector, $sPostcodeEnd, &$oDB)
{
// Try an exact match on the gb_postcode table
@@ -497,7 +494,10 @@ function _debugDumpGroupedSearches($aData, $aTokens)
}
}
echo "
";
- echo "rank | Name Tokens | Name Not | Address Tokens | Address Not | country | operator | class | type | house# | Lat | Lon | Radius |
";
+ echo "rank | Name Tokens | Name Not | ";
+ echo "Address Tokens | Address Not | country | ";
+ echo "operator | class | type | house# | ";
+ echo "Lat | Lon | Radius |
";
foreach ($aData as $iRank => $aRankedSet) {
foreach ($aRankedSet as $aRow) {
echo "";
@@ -599,87 +599,10 @@ function addQuotes($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)
{
- $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);