From 1b33999f105a0d2499b880f77fefae29346bab2d Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 25 Jul 2016 22:44:01 +0200 Subject: [PATCH 1/4] refactor ReverseGeocode - remove unused functions and members - move coordinates from being members to being parameters of lookup() --- lib/Geocode.php | 5 +-- lib/ReverseGeocode.php | 72 ++---------------------------------------- utils/warm.php | 16 ++++++---- website/reverse.php | 5 +-- 4 files changed, 16 insertions(+), 82 deletions(-) diff --git a/lib/Geocode.php b/lib/Geocode.php index 2d246d98..ce77862b 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -1698,10 +1698,11 @@ { // Just interpret as a reverse geocode $oReverse = new ReverseGeocode($this->oDB); - $oReverse->setLatLon((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]); $oReverse->setZoom(18); - $aLookup = $oReverse->lookup(false); + $aLookup = $oReverse->lookup((float)$this->aNearPoint[0], + (float)$this->aNearPoint[1], + false); if (CONST_Debug) var_dump("Reverse search", $aLookup); diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 0c684a4e..6a531ebb 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -2,42 +2,14 @@ class ReverseGeocode { protected $oDB; - - protected $fLat; - protected $fLon; protected $iMaxRank = 28; - protected $aLangPrefOrder = array(); - - protected $bIncludePolygonAsPoints = false; - protected $bIncludePolygonAsText = false; - protected $bIncludePolygonAsGeoJSON = false; - protected $bIncludePolygonAsKML = false; - protected $bIncludePolygonAsSVG = false; - protected $fPolygonSimplificationThreshold = 0.0; - function ReverseGeocode(&$oDB) { $this->oDB =& $oDB; } - function setLanguagePreference($aLangPref) - { - $this->aLangPrefOrder = $aLangPref; - } - - function setLatLon($fLat, $fLon) - { - $this->fLat = (float)$fLat; - $this->fLon = (float)$fLon; - } - - function setRank($iRank) - { - $this->iMaxRank = $iRank; - } - function setZoom($iZoom) { // Zoom to rank, this could probably be calculated but a lookup gives fine control @@ -66,51 +38,11 @@ $this->iMaxRank = (isset($iZoom) && isset($aZoomRank[$iZoom]))?$aZoomRank[$iZoom]:28; } - function setIncludePolygonAsPoints($b = true) - { - $this->bIncludePolygonAsPoints = $b; - } - - function getIncludePolygonAsPoints() - { - return $this->bIncludePolygonAsPoints; - } - - function setIncludePolygonAsText($b = true) - { - $this->bIncludePolygonAsText = $b; - } - - function getIncludePolygonAsText() - { - return $this->bIncludePolygonAsText; - } - - function setIncludePolygonAsGeoJSON($b = true) - { - $this->bIncludePolygonAsGeoJSON = $b; - } - - function setIncludePolygonAsKML($b = true) - { - $this->bIncludePolygonAsKML = $b; - } - - function setIncludePolygonAsSVG($b = true) - { - $this->bIncludePolygonAsSVG = $b; - } - - function setPolygonSimplificationThreshold($f) - { - $this->fPolygonSimplificationThreshold = $f; - } - // returns { place_id =>, type => '(osm|tiger)' } // fails if no place was found - function lookup($bDoInterpolation = true) + function lookup($fLat, $fLon, $bDoInterpolation = true) { - $sPointSQL = 'ST_SetSRID(ST_Point('.$this->fLon.','.$this->fLat.'),4326)'; + $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)'; $iMaxRank = $this->iMaxRank; $iMaxRank_orig = $this->iMaxRank; diff --git a/utils/warm.php b/utils/warm.php index 72eac27a..b034fa8c 100755 --- a/utils/warm.php +++ b/utils/warm.php @@ -27,7 +27,10 @@ if (!$aResult['search-only']) { $oReverseGeocode = new ReverseGeocode($oDB); - $oReverseGeocode->setIncludeAddressDetails(true); + $oReverseGeocode->setZoom(20); + $oPlaceLookup = new PlaceLookup($oDB); + $oPlaceLookup->setIncludeAddressDetails(true); + $oPlaceLookup->setLanguagePreference(array('en')); echo "Warm reverse: "; if ($bVerbose) echo "\n"; @@ -35,11 +38,12 @@ $fLat = rand(-9000, 9000) / 100; $fLon = rand(-18000, 18000) / 100; if ($bVerbose) echo "$fLat, $fLon = "; - $oReverseGeocode->setLanguagePreference(array('en')); - $oReverseGeocode->setLatLon($fLat, $fLon); - $oReverseGeocode->setZoom(20); - $aDetails = $oReverseGeocode->lookup(); - if ($bVerbose) echo $aDetails['langaddress']."\n"; + $aLookup = $oReverseGeocode->lookup($fLat, $fLon); + if ($aLookup && $aLookup['place_id']) + { + $aDetails = $oPlaceLookup->lookupPlace($aLookup); + if ($bVerbose) echo $aDetails['langaddress']."\n"; + } else echo "."; } echo "\n"; diff --git a/website/reverse.php b/website/reverse.php index 0e0f2ff8..07ef2d74 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -54,12 +54,9 @@ else if ($fLat !== false && $fLon !==false) { $oReverseGeocode = new ReverseGeocode($oDB); - $oReverseGeocode->setLanguagePreference($aLangPrefOrder); - - $oReverseGeocode->setLatLon($fLat, $fLon); $oReverseGeocode->setZoom(getParamInt('zoom', 18)); - $aLookup = $oReverseGeocode->lookup(); + $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if (CONST_Debug) var_dump($aLookup); } else if ($sOutputFormat != 'html') From 0d179b8c97fee42617ac3303e238e5df3850c99f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 25 Jul 2016 23:02:30 +0200 Subject: [PATCH 2/4] remove unnecessary local variable --- lib/ReverseGeocode.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 6a531ebb..b523d0aa 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -4,7 +4,6 @@ protected $oDB; protected $iMaxRank = 28; - function ReverseGeocode(&$oDB) { $this->oDB =& $oDB; @@ -44,7 +43,6 @@ { $sPointSQL = 'ST_SetSRID(ST_Point('.$fLon.','.$fLat.'),4326)'; $iMaxRank = $this->iMaxRank; - $iMaxRank_orig = $this->iMaxRank; // Find the nearest point $fSearchDiam = 0.0004; @@ -87,7 +85,7 @@ $bIsInUnitedStates = ($aPlace['calculated_country_code'] == 'us'); } // if a street or house was found, look in interpolation lines table - if ($bDoInterpolation && $iMaxRank_orig >= 28 && $aPlace && $aPlace['rank_search'] >= 26) + if ($bDoInterpolation && $this->iMaxRank >= 28 && $aPlace && $aPlace['rank_search'] >= 26) { // if a house was found, search the interpolation line that is at least as close as the house $sSQL = 'SELECT place_id, parent_place_id, 30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction'; @@ -152,7 +150,7 @@ } // Only street found? If it's in the US we can check TIGER data for nearest housenumber - if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $iMaxRank_orig >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) + if (CONST_Use_US_Tiger_Data && $bDoInterpolation && $bIsInUnitedStates && $this->iMaxRank >= 28 && $iPlaceID && ($aPlace['rank_search'] == 26 || $aPlace['rank_search'] == 27 )) { $fSearchDiam = 0.001; $sSQL = 'SELECT place_id,parent_place_id,30 as rank_search, ST_line_locate_point(linegeo,'.$sPointSQL.') as fraction'; From d594bb238b974afa638bcb8f92c069c97914f9b9 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 25 Jul 2016 23:55:06 +0200 Subject: [PATCH 3/4] cleanup interface of PlaceLookup Move lookup parameters (place id, type, frac etc.) from members to parameters for lookup(). --- lib/Geocode.php | 16 ++++----- lib/PlaceLookup.php | 80 +++++++++++++++---------------------------- utils/warm.php | 3 +- website/hierarchy.php | 3 +- website/lookup.php | 3 +- website/reverse.php | 31 ++++++++--------- 6 files changed, 54 insertions(+), 82 deletions(-) diff --git a/lib/Geocode.php b/lib/Geocode.php index ce77862b..3d1e82d3 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -1735,19 +1735,19 @@ if (CONST_Debug) { echo 'Recheck words:<\i>'; var_dump($aRecheckWords); } + $oPlaceLookup = new PlaceLookup($this->oDB); + $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints); + $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText); + $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON); + $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML); + $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG); + $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold); + foreach($aSearchResults as $iResNum => $aResult) { // Default $fDiameter = getResultDiameter($aResult); - $oPlaceLookup = new PlaceLookup($this->oDB); - $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints); - $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText); - $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON); - $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML); - $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG); - $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold); - $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2); if ($aOutlineResult) { diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index 831f6ef6..7ba192d7 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -3,18 +3,10 @@ { protected $oDB; - protected $iPlaceID; - - protected $sType = false; - - protected $fTigerFraction = -1; - protected $aLangPrefOrder = array(); protected $bAddressDetails = false; - protected $bExtraTags = false; - protected $bNameDetails = false; protected $bIncludePolygonAsPoints = false; @@ -91,38 +83,23 @@ $this->fPolygonSimplificationThreshold = $f; } - - function setPlaceID($iPlaceID) - { - $this->iPlaceID = $iPlaceID; - } - - function setOSMID($sType, $iID) + function lookupOSMID($sType, $iID) { $sSQL = "select place_id from placex where osm_type = '".pg_escape_string($sType)."' and osm_id = ".(int)$iID." order by type = 'postcode' asc"; - $this->iPlaceID = chksql($this->oDB->getOne($sSQL)); + $iPlaceID = chksql($this->oDB->getOne($sSQL)); + + return $this->lookup((int)$iPlaceID); } - function lookupPlace($details) + function lookup($iPlaceID, $sType = '', $fInterpolFraction = 0.0) { - 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']); - } - if (isset($details['fraction'])) $this->fInterpolFraction = $details['fraction']; - - return $this->lookup(); - } - - function lookup() - { - if (!$this->iPlaceID) return null; + if (!$iPlaceID) return null; $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; + $bIsTiger = CONST_Use_US_Tiger_Data && $sType == 'tiger'; + $bIsInterpolation = $sType == 'interpolation'; - if (CONST_Use_US_Tiger_Data && $this->sType == 'tiger') + if ($bIsTiger) { $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, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,"; @@ -134,13 +111,13 @@ if ($this->bNameDetails) $sSQL .= " null as names,"; $sSQL .= " ST_X(point) as lon, ST_Y(point) as lat from (select *, ST_LineInterpolatePoint(linegeo, (housenumber-startnumber::float)/(endnumber-startnumber)::float) as point from "; $sSQL .= " (select *, "; - $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; - $sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; - $sSQL .= " WHEN interpolationtype='all' THEN (".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; + $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; + $sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; + $sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; $sSQL .= " END as housenumber"; - $sSQL .= " from location_property_tiger where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2"; + $sSQL .= " from location_property_tiger where place_id = ".$iPlaceID.") as blub1) as blub2"; } - else if ($this->sType == 'interpolation') + else if ($bIsInterpolation) { $sSQL = "select place_id, partition, 'W' as osm_type, osm_id, 'place' as class, 'house' as type, null admin_level, housenumber, null as street, null as isin, postcode,"; $sSQL .= " calculated_country_code as country_code, parent_place_id, null as linked_place_id, 30 as rank_address, 30 as rank_search,"; @@ -152,11 +129,11 @@ if ($this->bNameDetails) $sSQL .= " null as names,"; $sSQL .= " ST_X(point) as lon, ST_Y(point) as lat from (select *, ST_LineInterpolatePoint(linegeo, (housenumber-startnumber::float)/(endnumber-startnumber)::float) as point from "; $sSQL .= " (select *, "; - $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; - $sSQL .= " WHEN interpolationtype='even' THEN ((".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; - $sSQL .= " WHEN interpolationtype='all' THEN (".$this->fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; + $sSQL .= " CASE WHEN interpolationtype='odd' THEN floor((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2+1"; + $sSQL .= " WHEN interpolationtype='even' THEN ((".$fInterpolFraction."*(endnumber-startnumber)+startnumber)/2)::int*2"; + $sSQL .= " WHEN interpolationtype='all' THEN (".$fInterpolFraction."*(endnumber-startnumber)+startnumber)::int"; $sSQL .= " END as housenumber"; - $sSQL .= " from location_property_osmline where place_id = ".(int)$this->iPlaceID.") as blub1) as blub2"; + $sSQL .= " from location_property_osmline where place_id = ".$iPlaceID.") as blub1) as blub2"; // testcase: interpolationtype=odd, startnumber=1000, endnumber=1006, fInterpolFraction=1 => housenumber=1007 => error in st_lineinterpolatepoint // but this will never happen, because if the searched point is that close to the endnumber, the endnumber house will be directly taken from placex (in ReverseGeocode.php line 220) // and not interpolated @@ -172,7 +149,7 @@ 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; + $sSQL .= " from placex where place_id = ".$iPlaceID; } $aPlace = chksql($this->oDB->getRow($sSQL), "Could not lookup place"); @@ -181,11 +158,10 @@ if ($this->bAddressDetails) { - if(CONST_Use_US_Tiger_Data && $this->sType == 'tiger' || $this->sType == 'interpolation') // to get addressdetails for tiger data, the housenumber is needed - $aAddress = $this->getAddressNames($aPlace['housenumber']); - else - $aAddress = $this->getAddressNames(); - $aPlace['aAddress'] = $aAddress; + // to get addressdetails for tiger data, the housenumber is needed + $iHousenumber = ($bIsTiger || $bIsInterpolation) ? $aPlace['housenumber'] : -1; + $aPlace['aAddress'] = $this->getAddressNames($aPlace['place_id'], + $iHousenumber); } if ($this->bExtraTags) @@ -232,22 +208,20 @@ return $aPlace; } - function getAddressDetails($bAll = false, $housenumber = -1) + function getAddressDetails($iPlaceID, $bAll = false, $housenumber = -1) { - if (!$this->iPlaceID) return null; - $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted", $this->aLangPrefOrder))."]"; - $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$this->iPlaceID.",".$housenumber.")"; + $sSQL = "select *,get_name_by_language(name,$sLanguagePrefArraySQL) as localname from get_addressdata(".$iPlaceID.",".$housenumber.")"; if (!$bAll) $sSQL .= " WHERE isaddress OR type = 'country_code'"; $sSQL .= " order by rank_address desc,isaddress desc"; return chksql($this->oDB->getAll($sSQL)); } - function getAddressNames($housenumber = -1) + function getAddressNames($iPlaceID, $housenumber = -1) { - $aAddressLines = $this->getAddressDetails(false, $housenumber); + $aAddressLines = $this->getAddressDetails($iPlaceID, false, $housenumber); $aAddress = array(); $aFallback = array(); diff --git a/utils/warm.php b/utils/warm.php index b034fa8c..18121eb6 100755 --- a/utils/warm.php +++ b/utils/warm.php @@ -41,7 +41,8 @@ $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if ($aLookup && $aLookup['place_id']) { - $aDetails = $oPlaceLookup->lookupPlace($aLookup); + $aDetails = $oPlaceLookup->lookup((int)$aLookup['place_id'], + $aLookup['type'], $aLookup['fraction']); if ($bVerbose) echo $aDetails['langaddress']."\n"; } else echo "."; diff --git a/website/hierarchy.php b/website/hierarchy.php index b14422fa..28a56f00 100755 --- a/website/hierarchy.php +++ b/website/hierarchy.php @@ -57,9 +57,8 @@ $oPlaceLookup = new PlaceLookup($oDB); $oPlaceLookup->setLanguagePreference($aLangPrefOrder); $oPlaceLookup->setIncludeAddressDetails(true); - $oPlaceLookup->setPlaceId($iPlaceID); - $aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails()); + $aPlaceAddress = array_reverse($oPlaceLookup->getAddressDetails($iPlaceID)); if (!sizeof($aPlaceAddress)) userError("Unknown place id."); diff --git a/website/lookup.php b/website/lookup.php index 2e2a1c2f..5fc6c309 100755 --- a/website/lookup.php +++ b/website/lookup.php @@ -44,8 +44,7 @@ if ( $iId > 0 && ($sType == 'N' || $sType == 'W' || $sType == 'R') ) { $aCleanedQueryParts[] = $sType . $iId; - $oPlaceLookup->setOSMID($sType, $iId); - $oPlace = $oPlaceLookup->lookup(); + $oPlace = $oPlaceLookup->lookupOSMID($sType, $iId); if ($oPlace){ // we want to use the search-* output templates, so we need to fill // $aSearchResults and slightly change the (reverse search) oPlace diff --git a/website/reverse.php b/website/reverse.php index 07ef2d74..f7c01860 100755 --- a/website/reverse.php +++ b/website/reverse.php @@ -43,37 +43,38 @@ $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder); + $oPlaceLookup = new PlaceLookup($oDB); + $oPlaceLookup->setLanguagePreference($aLangPrefOrder); + $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true)); + $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false)); + $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false)); + $sOsmType = getParamSet('osm_type', array('N', 'W', 'R')); $iOsmId = getParamInt('osm_id', -1); $fLat = getParamFloat('lat'); $fLon = getParamFloat('lon'); if ($sOsmType && $iOsmId > 0) { - $aLookup = array('osm_type' => $sOsmType, 'osm_id' => $iOsmId); + $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId); } - else if ($fLat !== false && $fLon !==false) + else if ($fLat !== false && $fLon !== false) { $oReverseGeocode = new ReverseGeocode($oDB); $oReverseGeocode->setZoom(getParamInt('zoom', 18)); $aLookup = $oReverseGeocode->lookup($fLat, $fLon); if (CONST_Debug) var_dump($aLookup); + + $aPlace = $oPlaceLookup->lookup((int)$aLookup['place_id'], + $aLookup['type'], $aLookup['fraction']); } else if ($sOutputFormat != 'html') { userError("Need coordinates or OSM object to lookup."); } - if ($aLookup) + if ($aPlace) { - $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); - $oPlaceLookup->setIncludePolygonAsPoints(false); $oPlaceLookup->setIncludePolygonAsText($bAsText); $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON); @@ -82,17 +83,15 @@ $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold); $fRadius = $fDiameter = getResultDiameter($aPlace); - $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius); + $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], + $aPlace['lon'], $aPlace['lat'], + $fRadius); if ($aOutlineResult) { $aPlace = array_merge($aPlace, $aOutlineResult); } } - else - { - $aPlace = null; - } if (CONST_Debug) From 0a95bdc5f54dab0d46e613c9586840b958a1f669 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 26 Jul 2016 23:01:42 +0200 Subject: [PATCH 4/4] remove unused functions in Geocode --- lib/Geocode.php | 55 ++-------------------------------------------- website/search.php | 30 ++++++++++++------------- 2 files changed, 16 insertions(+), 69 deletions(-) diff --git a/lib/Geocode.php b/lib/Geocode.php index 3d1e82d3..9249b314 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -63,11 +63,6 @@ $this->aLangPrefOrder = $aLangPref; } - function setIncludeAddressDetails($bAddressDetails = true) - { - $this->bIncludeAddressDetails = (bool)$bAddressDetails; - } - function getIncludeAddressDetails() { return $this->bIncludeAddressDetails; @@ -88,21 +83,11 @@ $this->bIncludePolygonAsPoints = $b; } - function getIncludePolygonAsPoints() - { - return $this->bIncludePolygonAsPoints; - } - function setIncludePolygonAsText($b = true) { $this->bIncludePolygonAsText = $b; } - function getIncludePolygonAsText() - { - return $this->bIncludePolygonAsText; - } - function setIncludePolygonAsGeoJSON($b = true) { $this->bIncludePolygonAsGeoJSON = $b; @@ -123,11 +108,6 @@ $this->fPolygonSimplificationThreshold = $f; } - function setDeDupe($bDeDupe = true) - { - $this->bDeDupe = (bool)$bDeDupe; - } - function setLimit($iLimit = 10) { if ($iLimit > 50) $iLimit = 50; @@ -137,32 +117,11 @@ $this->iLimit = $this->iFinalLimit + min($this->iFinalLimit, 10); } - function setOffset($iOffset = 0) - { - $this->iOffset = $iOffset; - } - - function setFallback($bFallback = true) - { - $this->bFallback = (bool)$bFallback; - } - - function setExcludedPlaceIDs($a) - { - // TODO: force to int - $this->aExcludePlaceIDs = $a; - } - function getExcludedPlaceIDs() { return $this->aExcludePlaceIDs; } - function setBounded($bBoundedSearch = true) - { - $this->bBoundedSearch = (bool)$bBoundedSearch; - } - function setViewBox($fLeft, $fBottom, $fRight, $fTop) { $this->aViewBox = array($fLeft, $fBottom, $fRight, $fTop); @@ -174,11 +133,6 @@ return $this->aViewBox[0].','.$this->aViewBox[3].','.$this->aViewBox[2].','.$this->aViewBox[1]; } - function setRoute($aRoutePoints) - { - $this->aRoutePoints = $aRoutePoints; - } - function setFeatureType($sFeatureType) { switch($sFeatureType) @@ -200,8 +154,8 @@ function setRankRange($iMin, $iMax) { - $this->iMinAddressRank = (int)$iMin; - $this->iMaxAddressRank = (int)$iMax; + $this->iMinAddressRank = $iMin; + $this->iMaxAddressRank = $iMax; } function setNearPoint($aNearPoint, $fRadiusDeg = 0.1) @@ -209,11 +163,6 @@ $this->aNearPoint = array((float)$aNearPoint[0], (float)$aNearPoint[1], (float)$fRadiusDeg); } - function setCountryCodesList($aCountryCodes) - { - $this->aCountryCodes = $aCountryCodes; - } - function setQuery($sQueryString) { $this->sQuery = $sQueryString; diff --git a/website/search.php b/website/search.php index 4baf3ef5..4c283d1a 100755 --- a/website/search.php +++ b/website/search.php @@ -32,6 +32,7 @@ if ($sOutputFormat == 'html') { $oGeocode->setIncludePolygonAsText(getParamBool('polygon')); + $bAsText = false; } else { @@ -84,22 +85,20 @@ include(CONST_BasePath.'/lib/template/search-batch-json.php'); exit; } + + if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') + { + $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1); + + // reverse order of '/' separated string + $aPhrases = explode('/', $sQuery); + $aPhrases = array_reverse($aPhrases); + $sQuery = join(', ',$aPhrases); + $oGeocode->setQuery($sQuery); + } else { - if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/') - { - $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1); - - // reverse order of '/' separated string - $aPhrases = explode('/', $sQuery); - $aPhrases = array_reverse($aPhrases); - $sQuery = join(', ',$aPhrases); - $oGeocode->setQuery($sQuery); - } - else - { - $oGeocode->setQueryFromParams($_GET); - } + $oGeocode->setQueryFromParams($_GET); } $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder); @@ -113,13 +112,12 @@ } logEnd($oDB, $hLog, sizeof($aSearchResults)); - $bAsText = $oGeocode->getIncludePolygonAsText(); $sQuery = $oGeocode->getQueryString(); $sViewBox = $oGeocode->getViewBoxString(); $bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']); $aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs(); - $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs()); + $sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs); if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"]; if ($bShowPolygons) $sMoreURL .= '&polygon=1'; if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';