diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index 84c68a99..23b97707 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -5,12 +5,16 @@ protected $iPlaceID; - protected $bIsTiger = false; + protected $sType = false; protected $aLangPrefOrder = array(); protected $bAddressDetails = false; + protected $bExtraTags = false; + + protected $bNameDetails = false; + function PlaceLookup(&$oDB) { $this->oDB =& $oDB; @@ -26,6 +30,22 @@ $this->bAddressDetails = $bAddressDetails; } + function setIncludeExtraTags($bExtraTags = false) + { + if ((float) CONST_Postgresql_Version > 9.2) + { + $this->bExtraTags = $bExtraTags; + } + } + + function setIncludeNameDetails($bNameDetails = false) + { + if ((float) CONST_Postgresql_Version > 9.2) + { + $this->bNameDetails = $bNameDetails; + } + } + function setPlaceID($iPlaceID) { $this->iPlaceID = $iPlaceID; @@ -37,9 +57,16 @@ $this->iPlaceID = $this->oDB->getOne($sSQL); } - function setIsTiger($b = false) + function lookupPlace($details) { - $this->bIsTiger = $b; + if (isset($details['place_id'])) $this->iPlaceID = $details['place_id']; + if (isset($details['type'])) $this->sType = $details['type']; + if (isset($details['osm_type']) && isset($details['osm_id'])) + { + $this->setOSMID($details['osm_type'], $details['osm_id']); + } + + return $this->lookup(); } function lookup() @@ -48,28 +75,33 @@ $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, extratags, parent_place_id, linked_place_id, rank_address, rank_search, "; - $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, "; - $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; - $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,"; - $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,"; - $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,"; - $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon"; - $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID; - - - if ($this->bIsTiger) + if ($this->sType == 'tiger') { $sSQL = "select place_id,partition, 'T' as osm_type, place_id as osm_id, 'place' as class, 'house' as type, null as admin_level, housenumber, null as street, null as isin, postcode,"; - $sSQL .= " 'us' as country_code, null as extratags, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,"; + $sSQL .= " 'us' as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,"; $sSQL .= " coalesce(null,0.75-(30::float/40)) as importance, null as indexed_status, null as indexed_date, null as wikipedia, 'us' as calculated_country_code, "; $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; $sSQL .= " null as placename,"; $sSQL .= " null as ref,"; + if ($this->bExtraTags) $sSQL .= " null as extra,"; + if ($this->bNameDetails) $sSQL .= " null as names,"; $sSQL .= " st_y(centroid) as lat,"; $sSQL .= " st_x(centroid) as lon"; $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID; } + else + { + $sSQL = "select placex.place_id, partition, osm_type, osm_id, class, type, admin_level, housenumber, street, isin, postcode, country_code, parent_place_id, linked_place_id, rank_address, rank_search, "; + $sSQL .= " coalesce(importance,0.75-(rank_search::float/40)) as importance, indexed_status, indexed_date, wikipedia, calculated_country_code, "; + $sSQL .= " get_address_by_language(place_id, $sLanguagePrefArraySQL) as langaddress,"; + $sSQL .= " get_name_by_language(name, $sLanguagePrefArraySQL) as placename,"; + $sSQL .= " get_name_by_language(name, ARRAY['ref']) as ref,"; + if ($this->bExtraTags) $sSQL .= " hstore_to_json(extratags) as extra,"; + if ($this->bNameDetails) $sSQL .= " hstore_to_json(name) as names,"; + $sSQL .= " (case when centroid is null then st_y(st_centroid(geometry)) else st_y(centroid) end) as lat,"; + $sSQL .= " (case when centroid is null then st_x(st_centroid(geometry)) else st_x(centroid) end) as lon"; + $sSQL .= " from placex where place_id = ".(int)$this->iPlaceID; + } $aPlace = $this->oDB->getRow($sSQL); @@ -87,6 +119,29 @@ $aPlace['aAddress'] = $aAddress; } + if ($this->bExtraTags) + { + if ($aPlace['extra']) + { + $aPlace['sExtraTags'] = json_decode($aPlace['extra']); + } + else + { + $aPlace['sExtraTags'] = array(); + } + } + + if ($this->bNameDetails) + { + if ($aPlace['names']) + { + $aPlace['sNameDetails'] = json_decode($aPlace['names']); + } + else + { + $aPlace['sNameDetails'] = array(); + } + } $aClassType = getClassTypes(); $sAddressType = ''; @@ -129,7 +184,7 @@ function getAddressNames() { - $aAddressLines = $this->getAddressDetails(false);; + $aAddressLines = $this->getAddressDetails(false); $aAddress = array(); $aFallback = array(); diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 98110d82..e40ce6cc 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -9,8 +9,6 @@ protected $aLangPrefOrder = array(); - protected $bShowAddressDetails = true; - function ReverseGeocode(&$oDB) { $this->oDB =& $oDB; @@ -21,11 +19,6 @@ $this->aLangPrefOrder = $aLangPref; } - function setIncludeAddressDetails($bAddressDetails = true) - { - $this->bAddressDetails = $bAddressDetails; - } - function setLatLon($fLat, $fLon) { $this->fLat = (float)$fLat; @@ -171,13 +164,8 @@ } } - $oPlaceLookup = new PlaceLookup($this->oDB); - $oPlaceLookup->setLanguagePreference($this->aLangPrefOrder); - $oPlaceLookup->setIncludeAddressDetails($this->bAddressDetails); - $oPlaceLookup->setPlaceId($iPlaceID); - $oPlaceLookup->setIsTiger($bPlaceIsTiger); - - return $oPlaceLookup->lookup(); + return array('place_id' => $iPlaceID, + 'type' => $bPlaceIsTiger ? 'tiger' : 'osm'); } } ?> diff --git a/lib/lib.php b/lib/lib.php index c68f04eb..57bd4723 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -39,6 +39,12 @@ exit; } + function getParamBool($name, $default=false) + { + if (!isset($_GET[$name])) return $default; + + return (bool) $_GET[$name]; + } function fail($sError, $sUserError = false) { @@ -668,12 +674,11 @@ } - function javascript_renderData($xVal) + function javascript_renderData($xVal, $iOptions = 0) { header("Access-Control-Allow-Origin: *"); - $iOptions = 0; if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) - $iOptions = JSON_UNESCAPED_UNICODE; + $iOptions |= JSON_UNESCAPED_UNICODE; $jsonout = json_encode($xVal, $iOptions); if( ! isset($_GET['json_callback'])) diff --git a/lib/template/address-json.php b/lib/template/address-json.php index 2f077818..c994eb02 100644 --- a/lib/template/address-json.php +++ b/lib/template/address-json.php @@ -10,7 +10,7 @@ } else { - if ($aPlace['place_id']) $aFilteredPlaces['place_id'] = $aPlace['place_id']; + if (isset($aPlace['place_id'])) $aFilteredPlaces['place_id'] = $aPlace['place_id']; $aFilteredPlaces['licence'] = "Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright"; $sOSMType = ($aPlace['osm_type'] == 'N'?'node':($aPlace['osm_type'] == 'W'?'way':($aPlace['osm_type'] == 'R'?'relation':''))); if ($sOSMType) @@ -21,8 +21,10 @@ if (isset($aPlace['lat'])) $aFilteredPlaces['lat'] = $aPlace['lat']; if (isset($aPlace['lon'])) $aFilteredPlaces['lon'] = $aPlace['lon']; $aFilteredPlaces['display_name'] = $aPlace['langaddress']; - if ($bShowAddressDetails) $aFilteredPlaces['address'] = $aPlace['aAddress']; + if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress']; + if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags']; + if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails']; } - javascript_renderData($aFilteredPlaces); + javascript_renderData($aFilteredPlaces, JSON_FORCE_OBJECT); diff --git a/lib/template/address-jsonv2.php b/lib/template/address-jsonv2.php index 92cf4f1c..f05dbd80 100644 --- a/lib/template/address-jsonv2.php +++ b/lib/template/address-jsonv2.php @@ -23,16 +23,19 @@ $aFilteredPlaces['place_rank'] = $aPlace['rank_search']; - $aFilteredPlaces['category'] = $aPlace['class']; - $aFilteredPlaces['type'] = $aPlace['type']; + $aFilteredPlaces['category'] = $aPlace['class']; + $aFilteredPlaces['type'] = $aPlace['type']; $aFilteredPlaces['importance'] = $aPlace['importance']; - $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']); + $aFilteredPlaces['addresstype'] = strtolower($aPlace['addresstype']); $aFilteredPlaces['display_name'] = $aPlace['langaddress']; - $aFilteredPlaces['name'] = $aPlace['placename']; - if ($bShowAddressDetails && $aPlace['aAddress'] && sizeof($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress']; + $aFilteredPlaces['name'] = $aPlace['placename']; + + if (isset($aPlace['aAddress'])) $aFilteredPlaces['address'] = $aPlace['aAddress']; + if (isset($aPlace['sExtraTags'])) $aFilteredPlaces['extratags'] = $aPlace['sExtraTags']; + if (isset($aPlace['sNameDetails'])) $aFilteredPlaces['namedetails'] = $aPlace['sNameDetails']; } - javascript_renderData($aFilteredPlaces); + javascript_renderData($aFilteredPlaces, JSON_FORCE_OBJECT); diff --git a/lib/template/address-xml.php b/lib/template/address-xml.php index 9eeb3b77..ba085eea 100644 --- a/lib/template/address-xml.php +++ b/lib/template/address-xml.php @@ -29,7 +29,8 @@ if (isset($aPlace['lon'])) echo ' lon="'.htmlspecialchars($aPlace['lon']).'"'; echo ">".htmlspecialchars($aPlace['langaddress']).""; - if ($bShowAddressDetails) { + if (isset($aPlace['aAddress'])) + { echo ""; foreach($aPlace['aAddress'] as $sKey => $sValue) { @@ -40,6 +41,30 @@ } echo ""; } + + if (isset($aPlace['sExtraTags'])) + { + echo ""; + foreach ($aPlace['sExtraTags'] as $sKey => $sValue) + { + echo ''; + echo htmlspecialchars($sValue); + echo ""; + } + echo ""; + } + + if (isset($aPlace['sNameDetails'])) + { + echo ""; + foreach ($aPlace['sNameDetails'] as $sKey => $sValue) + { + echo ''; + echo htmlspecialchars($sValue); + echo ""; + } + echo ""; + } } echo ""; diff --git a/website/reverse.php b/website/reverse.php index 93cb5877..abc33a09 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -28,40 +28,52 @@ $sOutputFormat = $_GET['format']; } - // Show address breakdown - $bShowAddressDetails = true; - if (isset($_GET['addressdetails'])) $bShowAddressDetails = (bool)$_GET['addressdetails']; - // Preferred language $aLangPrefOrder = getPreferredLanguages(); $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')) { - $oPlaceLookup = new PlaceLookup($oDB); - $oPlaceLookup->setLanguagePreference($aLangPrefOrder); - $oPlaceLookup->setIncludeAddressDetails($bShowAddressDetails); - $oPlaceLookup->setOSMID($_GET['osm_type'], $_GET['osm_id']); - - $aPlace = $oPlaceLookup->lookup(); + $aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']); } else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon'])) { $oReverseGeocode = new ReverseGeocode($oDB); $oReverseGeocode->setLanguagePreference($aLangPrefOrder); - $oReverseGeocode->setIncludeAddressDetails($bShowAddressDetails); $oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']); $oReverseGeocode->setZoom(@$_GET['zoom']); - $aPlace = $oReverseGeocode->lookup(); + $aLookup = $oReverseGeocode->lookup(); + if (CONST_Debug) var_dump($aLookup); + } + else + { + $aLookup = null; + } + + if ($aLookup) + { + $oPlaceLookup = new PlaceLookup($oDB); + $oPlaceLookup->setLanguagePreference($aLangPrefOrder); + $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true)); + $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false)); + $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false)); + + $aPlace = $oPlaceLookup->lookupPlace($aLookup); } else { $aPlace = null; } - if (CONST_Debug) exit; + + if (CONST_Debug) + { + var_dump($aPlace); + exit; + } include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');