X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5c7b9ef909b3c30bbe640f4373a1127e15a7e018..37940803273aeab88ae37f8f6c9698478df52fc2:/lib-php/website/details.php diff --git a/lib-php/website/details.php b/lib-php/website/details.php index 55a088d1..98fb6ef7 100644 --- a/lib-php/website/details.php +++ b/lib-php/website/details.php @@ -1,4 +1,12 @@ getPreferredLanguages(); $sPlaceId = $oParams->getString('place_id'); $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R')); -$iOsmId = $oParams->getInt('osmid', -1); +$iOsmId = $oParams->getInt('osmid', 0); $sClass = $oParams->getString('class'); $bIncludeKeywords = $oParams->getBool('keywords', false); @@ -30,7 +38,7 @@ $oDB->connect(); $sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder)); -if ($sOsmType && $iOsmId > 0) { +if ($sOsmType && $iOsmId !== 0) { $sSQL = 'SELECT place_id FROM placex WHERE osm_type = :type AND osm_id = :id'; $aSQLParams = array(':type' => $sOsmType, ':id' => $iOsmId); // osm_type and osm_id are not unique enough @@ -83,7 +91,7 @@ if ($sOsmType && $iOsmId > 0) { } if ($sPlaceId === false) { - throw new Exception('No place with that OSM ID found.', 404); + throw new \Exception('No place with that OSM ID found.', 404); } } else { if ($sPlaceId === false) { @@ -95,16 +103,22 @@ $iPlaceID = (int)$sPlaceId; if (CONST_Use_US_Tiger_Data) { $iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_property_tiger WHERE place_id = '.$iPlaceID); - if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; + if ($iParentPlaceID) { + $iPlaceID = $iParentPlaceID; + } } // interpolated house numbers $iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_property_osmline WHERE place_id = '.$iPlaceID); -if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; +if ($iParentPlaceID) { + $iPlaceID = $iParentPlaceID; +} // artificial postcodes $iParentPlaceID = $oDB->getOne('SELECT parent_place_id FROM location_postcode WHERE place_id = '.$iPlaceID); -if ($iParentPlaceID) $iPlaceID = $iParentPlaceID; +if ($iParentPlaceID) { + $iPlaceID = $iParentPlaceID; +} $hLog = logStart($oDB, 'details', $_SERVER['QUERY_STRING'], $aLangPrefOrder); @@ -140,7 +154,7 @@ $sSQL .= " WHERE place_id = $iPlaceID"; $aPointDetails = $oDB->getRow($sSQL, null, 'Could not get details of place object.'); if (!$aPointDetails) { - throw new Exception('No place with that place ID found.', 404); + throw new \Exception('No place with that place ID found.', 404); } $aPointDetails['localname'] = $aPointDetails['localname']?$aPointDetails['localname']:$aPointDetails['housenumber']; @@ -192,7 +206,7 @@ if ($bIncludeLinkedPlaces) { $aLinkedLines = $oDB->getAll($sSQL); } -// All places this is an imediate parent of +// All places this is an immediate parent of $aHierarchyLines = false; if ($bIncludeHierarchy) { $sSQL = 'SELECT obj.place_id, osm_type, osm_id, class, type, housenumber,';