X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/4e2fe6427ce03a0ed3c5fdfe384f7867ef52fcca..414e6f089fc361ac22e28227be2d34a256226505:/lib/lib.php diff --git a/lib/lib.php b/lib/lib.php index cd23b068..3a6166a6 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -68,7 +68,7 @@ function javascript_renderData($xVal, $iOptions = 0) throw new Exception('Invalid json_callback value', 400); } - $iOptions |= JSON_UNESCAPED_UNICODE; + $iOptions |= JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES; if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) { $iOptions |= JSON_PRETTY_PRINT; } @@ -177,10 +177,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);