From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 24 Sep 2014 20:14:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~507
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/866b702e0e1807b17180af79943ce02ea0890a7c

Merge remote-tracking branch 'upstream/master'
---

866b702e0e1807b17180af79943ce02ea0890a7c
diff --cc lib/lib.php
index a7584b37,e200202b..a05ddc4b
--- a/lib/lib.php
+++ b/lib/lib.php
@@@ -905,3 -905,93 +905,93 @@@
  	{
  		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;
+ 
+ 		// degrees decimal minutes
+ 		// N 40 26.767, W 79 58.933
+ 		// N 40°26.767′, W 79°58.933′
+ 		//                  1         2                   3                  4         5            6
+ 		if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[° ]+([0-9.]+)?[′\']*[, ]+([EW])[ ]+([0-9]+)[° ]+([0-9]+[0-9.]*)[′\']*?\\b/', $sQuery, $aData))
+ 		{
+ 			$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);
+ 		}
+ 		// degrees decimal minutes
+ 		// 40 26.767 N, 79 58.933 W
+ 		// 40° 26.767′ N 79° 58.933′ W
+ 		//                      1             2                      3          4            5                    6
+ 		elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\']*[ ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+[0-9.]*)?[′\' ]+([EW])\\b/', $sQuery, $aData))
+ 		{
+ 			$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);
+ 		}
+ 		// degrees decimal seconds
+ 		// N 40 26 46 W 79 58 56
+ 		// N 40° 26′ 46″ W, 79° 58′ 56″
+ 		//                      1        2            3            4                5        6            7            8
+ 		elseif (preg_match('/\\b([NS])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*[, ]+([EW])[ ]([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″"]*\\b/', $sQuery, $aData))
+ 		{
+ 			$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);
+ 		}
+ 		// degrees decimal seconds
+ 		// 40 26 46 N 79 58 56 W
+ 		// 40° 26′ 46″ N, 79° 58′ 56″ W
+ 		//                      1            2            3            4          5            6            7            8
+ 		elseif (preg_match('/\\b([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([NS])[, ]+([0-9]+)[° ]+([0-9]+)[′\' ]+([0-9]+)[″" ]+([EW])\\b/', $sQuery, $aData))
+ 		{
+ 			$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);
+ 		}
+ 		// degrees decimal
+ 		// N 40.446° W 79.982°
+ 		//                      1        2                               3        4
+ 		elseif (preg_match('/\\b([NS])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*[, ]+([EW])[ ]([0-9]+[0-9]*\\.[0-9]+)[°]*\\b/', $sQuery, $aData))
+ 		{
+ 			$sFound    = $aData[0];
+ 			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2]);
+ 			$fQueryLon = ($aData[3]=='E'?1:-1) * ($aData[4]);
+ 		}
+ 		// degrees decimal
+ 		// 40.446° N 79.982° W
+ 		//                      1                           2          3                           4
+ 		elseif (preg_match('/\\b([0-9]+[0-9]*\\.[0-9]+)[° ]+([NS])[, ]+([0-9]+[0-9]*\\.[0-9]+)[° ]+([EW])\\b/', $sQuery, $aData))
+ 		{
+ 			$sFound    = $aData[0];
+ 			$fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]);
+ 			$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[3]);
+ 		}
+ 		// degrees decimal
+ 		// 12.34, 56.78
+ 		// [12.456,-78.90]
+ 		//                   1          2                             3                        4
+ 		elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData))
+ 		{
+ 			$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);
 -	}
++	}