safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

fix to NearPoint::extractFromQuery handling first minus sign

Browse Source
This commit is contained in:
marc tobias
2017-09-19 12:40:10 +01:00
parent 15a215729e
commit e67a6dc321
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/NearPoint.php
View File

@@ -133,8 +133,8 @@ class NearPoint
$sFound = $aData[0]; $sFound = $aData[0];
$fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]); $fQueryLat = ($aData[2]=='N'?1:-1) * ($aData[1]);
$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[3]); $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)) { } elseif (preg_match('/(\\[|^|\\b)?(-?[0-9]+[0-9]*\\.[0-9]+)[, ]+(-?[0-9]+[0-9]*\\.[0-9]+)(\\]|$|\\b)/', $sQuery, $aData)) {
/* 1 2 3 4 /* 1 2 3 4
* degrees decimal * degrees decimal
* 12.34, 56.78 * 12.34, 56.78
* [12.456,-78.90] * [12.456,-78.90]

4
test/php/Nominatim/NearPointTest.php
View File

@@ -35,6 +35,10 @@ class NearPointTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($aRes['pt']->radius(), 0.1); $this->assertEquals($aRes['pt']->radius(), 0.1);
$this->assertEquals($aRes['query'], ''); $this->assertEquals($aRes['query'], '');
$aRes = NearPoint::extractFromQuery(' -12.456,-78.90 ');
$this->assertEquals($aRes['pt']->lat(), -12.456);
$this->assertEquals($aRes['pt']->lon(), -78.90);
// http://en.wikipedia.org/wiki/Geographic_coordinate_conversion // http://en.wikipedia.org/wiki/Geographic_coordinate_conversion
// these all represent the same location // these all represent the same location
$aQueries = array( $aQueries = array(