X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/bf77b444bf9f18be6bc98c05c8dfc6d796ab30fa..026081e131961740b887debc2d781c433c99760d:/website/search.php diff --git a/website/search.php b/website/search.php index c1169c8a..f2f806d6 100755 --- a/website/search.php +++ b/website/search.php @@ -30,8 +30,8 @@ $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2 // Show / use polygons if ($sOutputFormat == 'html') { - $oGeocode->setIncludePolygonAsText($oParams->getBool('polygon')); - $bAsText = false; + $oGeocode->setIncludePolygonAsGeoJSON($oParams->getBool('polygon_geojson')); + $bAsGeoJSON = false; } else { $bAsPoints = $oParams->getBool('polygon'); $bAsGeoJSON = $oParams->getBool('polygon_geojson'); @@ -110,6 +110,7 @@ if ($bShowPolygons) $sMoreURL .= '&polygon=1'; if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1'; if ($oGeocode->getIncludeExtraTags()) $sMoreURL .= '&extratags=1'; if ($oGeocode->getIncludeNameDetails()) $sMoreURL .= '&namedetails=1'; +if ($oGeocode->getCountryCodes()) $sMoreURL .= '&countrycodes='.join(',', $oGeocode->getCountryCodes()); if ($sViewBox) $sMoreURL .= '&viewbox='.urlencode($sViewBox); if (isset($_GET['nearlat']) && isset($_GET['nearlon'])) $sMoreURL .= '&nearlat='.(float)$_GET['nearlat'].'&nearlon='.(float)$_GET['nearlon']; $sMoreURL .= '&q='.urlencode($sQuery);