X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/8b491e85448629c8921b4bb7399df319f73977be..d45524cbfb299f5004a03c52802c64749c5ad212:/website/reverse.php diff --git a/website/reverse.php b/website/reverse.php index e2dfaef8..75eb2677 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -1,7 +1,8 @@ CONST_PolygonOutput_MaximumTypes) + { + if (CONST_PolygonOutput_MaximumTypes) + { + userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option"); + } + else + { + userError("Polygon output is disabled"); + } + exit; + } + + + // Polygon simplification threshold (optional) + $fThreshold = getParamFloat('polygon_threshold', 0.0); + + $oDB =& getDB(); ini_set('memory_limit', '200M'); // Format for output - $sOutputFormat = 'xml'; - if (isset($_GET['format']) && ( $_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) - { - $sOutputFormat = $_GET['format']; - } + $sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml'); // Preferred language $aLangPrefOrder = getPreferredLanguages(); @@ -34,24 +56,28 @@ $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder); - if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R')) + $sOsmType = getParamSet('osmtype', array('N', 'W', 'R')); + $iOsmId = getParamInt('osmid', -1); + $fLat = getParamFloat('lat'); + $fLon = getParamFloat('lon'); + if ($sOsmType && $iOsmId > 0) { - $aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']); + $aLookup = array('osm_type' => $sOsmType, 'osm_id' => $iOsmId); } - else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon'])) + else if ($fLat !== false && $fLon !==false) { $oReverseGeocode = new ReverseGeocode($oDB); $oReverseGeocode->setLanguagePreference($aLangPrefOrder); - $oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']); - $oReverseGeocode->setZoom(@$_GET['zoom']); + $oReverseGeocode->setLatLon($fLat, $fLon); + $oReverseGeocode->setZoom(getParamInt('zoom')); $aLookup = $oReverseGeocode->lookup(); if (CONST_Debug) var_dump($aLookup); } else { - $aLookup = null; + userError("Need coordinates or OSM object to lookup."); } if ($aLookup) @@ -63,6 +89,21 @@ $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false)); $aPlace = $oPlaceLookup->lookupPlace($aLookup); + + $oPlaceLookup->setIncludePolygonAsPoints($bAsPoints); + $oPlaceLookup->setIncludePolygonAsText($bAsText); + $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON); + $oPlaceLookup->setIncludePolygonAsKML($bAsKML); + $oPlaceLookup->setIncludePolygonAsSVG($bAsSVG); + $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold); + + $fRadius = $fDiameter = getResultDiameter($aPlace); + $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius); + + if ($aOutlineResult) + { + $aPlace = array_merge($aPlace, $aOutlineResult); + } } else { @@ -76,6 +117,10 @@ exit; } - $sTileURL = CONST_Map_Tile_URL; - $sTileAttribution = CONST_Map_Tile_Attribution; + if ($sOutputFormat=='html') + { + $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"); + $sTileURL = CONST_Map_Tile_URL; + $sTileAttribution = CONST_Map_Tile_Attribution; + } include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');