X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/909b0c7462b336d07cab4499529957a4096a8c18..819b858ba70fa01484ec8547f3f34b654aa4181c:/lib/lib.php
diff --git a/lib/lib.php b/lib/lib.php
index 8f353a4d..cdd6b5cb 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -545,9 +545,13 @@ function _debugDumpGroupedSearches($aData, $aTokens)
echo "
".$aRow['sPostcode']." | ";
echo "".$aRow['sHouseNumber']." | ";
- echo "".$aRow['fLat']." | ";
- echo "".$aRow['fLon']." | ";
- echo "".$aRow['fRadius']." | ";
+ if ($aRow['oNear']) {
+ echo "".$aRow['oNear']->lat()." | ";
+ echo "".$aRow['oNear']->lon()." | ";
+ echo "".$aRow['oNear']->radius()." | ";
+ } else {
+ echo " | | | ";
+ }
echo "";
}
@@ -613,10 +617,10 @@ function geometryText2Points($geometry_as_text, $fRadius)
//
preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
//
- } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
+/* } elseif (preg_match('#MULTIPOLYGON\\(\\(\\(([- 0-9.,]+)#', $geometry_as_text, $aMatch)) {
//
preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/', $aMatch[1], $aPolyPoints, PREG_SET_ORDER);
- //
+ */
} elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#', $geometry_as_text, $aMatch)) {
//
$aPolyPoints = createPointsAroundCenter($aMatch[1], $aMatch[2], $fRadius);