From a5750a6ef673c3f707364ac827063b69f94b26ce Mon Sep 17 00:00:00 2001 From: gemo1011 Date: Wed, 20 Jun 2018 11:35:51 +0200 Subject: [PATCH] fixed getoutlinesfunction --- lib/PlaceLookup.php | 2 +- lib/ReverseGeocode.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php index ade073e5..44161a7e 100644 --- a/lib/PlaceLookup.php +++ b/lib/PlaceLookup.php @@ -557,10 +557,10 @@ class PlaceLookup if ($this->bIncludePolygonAsText || $this->bIncludePolygonAsPoints) $sSQL .= ',ST_AsText(geometry) as astext'; if ($fLonReverse != null && $fLatReverse != null) { $sFrom = ' from (SELECT * , ST_ClosestPoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326)) AS closest_point'; + $sFrom .= ' from placex where place_id = '.$iPlaceID.') as plx'; } else { $sFrom = ' from placex where place_id = '.$iPlaceID; } - $sFrom .= ' from placex where place_id = '.$iPlaceID.') as plx'; if ($this->fPolygonSimplificationThreshold > 0) { $sSQL .= ' from (select place_id,centroid,ST_SimplifyPreserveTopology(geometry,'.$this->fPolygonSimplificationThreshold.') as geometry'.$sFrom.') as plx'; } else { diff --git a/lib/ReverseGeocode.php b/lib/ReverseGeocode.php index 44ab2bdf..91a043da 100644 --- a/lib/ReverseGeocode.php +++ b/lib/ReverseGeocode.php @@ -127,10 +127,6 @@ class ReverseGeocode protected function lookupPolygon($sPointSQL, $iMaxRank) { - - $oResult = null; - $aPlace = null; - $sSQL = 'SELECT * FROM'; $sSQL .= '(select place_id,parent_place_id,rank_address, rank_search, country_code, geometry'; $sSQL .= ' FROM placex'; @@ -253,6 +249,9 @@ class ReverseGeocode $iParentPlaceID = $aPlace['parent_place_id']; if ($bDoInterpolation && $iMaxRank >= 30) { + if ($aPlace['rank_address'] <=27) { + $iDistance = 0.001; + } $aHouse = $this->lookupInterpolation($sPointSQL, $iDistance); if ($aHouse) { @@ -282,7 +281,7 @@ class ReverseGeocode 'Could not determine closest place.' ); if ($aStreet) { - $iDistance = $aPlace['distance']; + $iDistance = $aStreet['distance']; $iPlaceID = $aStreet['place_id']; $oResult = new Result($iPlaceID); $iParentPlaceID = $aStreet['parent_place_id']; -- 2.39.5