rebase

diff --git a/lib/PlaceLookup.php b/lib/PlaceLookup.php
index 98af69f23b8c70b53747c69cabfce9d5a0c06e0e..5ae1da2191c73ee731141e2db1f6a568483e64a4 100644 (file)
--- a/lib/PlaceLookup.php
+++ b/lib/PlaceLookup.php
@@ -164,21 +164,19 @@ class PlaceLookup
 
         $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID)));
 
 
         $aResults = $this->lookup(array($iPlaceID => new Result($iPlaceID)));
 

-        return empty($aResults) ? null : reset($aResults);
+        return sizeof($aResults) ? reset($aResults) : null;

     }
 
     public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
     {
     }
 
     public function lookup($aResults, $iMinRank = 0, $iMaxRank = 30)
     {

-        Debug::newFunction('Place lookup');
-
-        if (empty($aResults)) {
+        if (!sizeof($aResults)) {

             return array();
         }
         $aSubSelects = array();
 
         $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);
             return array();
         }
         $aSubSelects = array();
 
         $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_PLACEX);

+        if (CONST_Debug) var_dump('PLACEX', $sPlaceIDs);

         if ($sPlaceIDs) {
         if ($sPlaceIDs) {

-            Debug::printVar('Ids from placex', $sPlaceIDs);

             $sSQL  = 'SELECT ';
             $sSQL .= '    osm_type,';
             $sSQL .= '    osm_id,';
             $sSQL  = 'SELECT ';
             $sSQL .= '    osm_type,';
             $sSQL .= '    osm_id,';


@@ -248,7 +246,6 @@ class PlaceLookup
         // postcode table
         $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
         if ($sPlaceIDs) {
         // postcode table
         $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_POSTCODE);
         if ($sPlaceIDs) {

-            Debug::printVar('Ids from location_postcode', $sPlaceIDs);

             $sSQL = 'SELECT';
             $sSQL .= "  'P' as osm_type,";
             $sSQL .= '  (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,';
             $sSQL = 'SELECT';
             $sSQL .= "  'P' as osm_type,";
             $sSQL .= '  (SELECT osm_id from placex p WHERE p.place_id = lp.parent_place_id) as osm_id,';


@@ -279,7 +276,6 @@ class PlaceLookup
             if (CONST_Use_US_Tiger_Data) {
                 $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER);
                 if ($sPlaceIDs) {
             if (CONST_Use_US_Tiger_Data) {
                 $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_TIGER);
                 if ($sPlaceIDs) {

-                    Debug::printVar('Ids from Tiger table', $sPlaceIDs);

                     $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER);
                     // Tiger search only if a housenumber was searched and if it was found
                     // (realized through a join)
                     $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_TIGER);
                     // Tiger search only if a housenumber was searched and if it was found
                     // (realized through a join)


@@ -325,7 +321,6 @@ class PlaceLookup
             // osmline - interpolated housenumbers
             $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE);
             if ($sPlaceIDs) {
             // osmline - interpolated housenumbers
             $sPlaceIDs = Result::joinIdsByTable($aResults, Result::TABLE_OSMLINE);
             if ($sPlaceIDs) {

-                Debug::printVar('Ids from interpolation', $sPlaceIDs);

                 $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_OSMLINE);
                 // interpolation line search only if a housenumber was searched
                 // (realized through a join)
                 $sHousenumbers = Result::sqlHouseNumberTable($aResults, Result::TABLE_OSMLINE);
                 // interpolation line search only if a housenumber was searched
                 // (realized through a join)


@@ -411,13 +406,16 @@ class PlaceLookup
             }
         }
 
             }
         }
 

-        if (empty($aSubSelects)) {
+        if (CONST_Debug) var_dump($aSubSelects);
+
+        if (!sizeof($aSubSelects)) {

             return array();
         }
 
             return array();
         }
 

-        $sSQL = join(' UNION ', $aSubSelects);
-        Debug::printSQL($sSQL);
-        $aPlaces = chksql($this->oDB->getAll($sSQL), 'Could not lookup place');
+        $aPlaces = chksql(
+            $this->oDB->getAll(join(' UNION ', $aSubSelects)),
+            'Could not lookup place'
+        );

 
         $aClassType = getClassTypes();
         foreach ($aPlaces as &$aPlace) {
 
         $aClassType = getClassTypes();
         foreach ($aPlaces as &$aPlace) {


@@ -459,12 +457,12 @@ class PlaceLookup
             $aPlace['addresstype'] = $sAddressType;
         }
 
             $aPlace['addresstype'] = $sAddressType;
         }
 

-        Debug::printVar('Places', $aPlaces);
+        if (CONST_Debug) var_dump($aPlaces);

 
         return $aPlaces;
     }
 
 
         return $aPlaces;
     }
 

-    public function getAddressDetails($iPlaceID, $bAll = false, $sHousenumber = -1)
+    private function getAddressDetails($iPlaceID, $bAll, $sHousenumber)

     {
         $sSQL = 'SELECT *,';
         $sSQL .= '  get_name_by_language(name,'.$this->aLangPrefOrderSql.') as localname';
     {
         $sSQL = 'SELECT *,';
         $sSQL .= '  get_name_by_language(name,'.$this->aLangPrefOrderSql.') as localname';


@@ -528,7 +526,7 @@ class PlaceLookup
      */
 
 
      */
 
 

-    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null)
+    public function getOutlines($iPlaceID, $fLon = null, $fLat = null, $fRadius = null, $fLonReverse = null, $fLatReverse = null)

     {
 
         $aOutlineResult = array();
     {
 
         $aOutlineResult = array();


@@ -536,10 +534,23 @@ class PlaceLookup
 
         if (CONST_Search_AreaPolygons) {
             // Get the bounding box and outline polygon
 
         if (CONST_Search_AreaPolygons) {
             // Get the bounding box and outline polygon

-            $sSQL  = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
-            $sSQL .= 'ST_Y(centroid) as centrelat,ST_X(centroid) as centrelon,';
-            $sSQL .= 'ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
-            $sSQL .= 'ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';
+            $sSQL = 'select place_id,0 as numfeatures,st_area(geometry) as area,';
+            if ($fLonReverse != null && $fLatReverse != null) {
+                $sSQL .= ' CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN';
+                $sSQL .= ' ST_Y(ST_LineInterpolatePoint(geometry,';
+                $sSQL .= ' ST_LineLocatePoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))))';
+                $sSQL .= ' ELSE ST_Y(centroid) ';
+                $sSQL .= ' END as centrelat, ';
+                $sSQL .= ' CASE WHEN (class = \'highway\') AND (ST_GeometryType(geometry) = \'ST_LineString\') THEN';
+                $sSQL .= ' ST_X(ST_LineInterpolatePoint(geometry,';
+                $sSQL .= ' ST_LineLocatePoint(geometry, ST_SetSRID(ST_Point('.$fLatReverse.','.$fLonReverse.'),4326))))';
+                $sSQL .= ' ELSE ST_X(centroid) ';
+                $sSQL .= ' END as centrelon, ';
+            } else {
+                $sSQL .= ' ST_Y(centroid) as centrelat, ST_X(centroid) as centrelon,';
+            }
+            $sSQL .= ' ST_YMin(geometry) as minlat,ST_YMax(geometry) as maxlat,';
+            $sSQL .= ' ST_XMin(geometry) as minlon,ST_XMax(geometry) as maxlon';

             if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson';
             if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml';
             if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg';
             if ($this->bIncludePolygonAsGeoJSON) $sSQL .= ',ST_AsGeoJSON(geometry) as asgeojson';
             if ($this->bIncludePolygonAsKML) $sSQL .= ',ST_AsKML(geometry) as askml';
             if ($this->bIncludePolygonAsSVG) $sSQL .= ',ST_AsSVG(geometry) as assvg';

diff --git a/website/reverse.php b/website/reverse.php
index 3bcac2ce40b2a99c412d6dd027e9c7f0af7bd09d..3ce7a20dd154513b43dab49835541d7e8e51b684 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -41,7 +41,7 @@ if ($sOsmType && $iOsmId > 0) {
 
     if ($oLookup) {
         $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));
 
     if ($oLookup) {
         $aPlaces = $oPlaceLookup->lookup(array($oLookup->iId => $oLookup));

-        if (!empty($aPlaces)) {
+        if (sizeof($aPlaces)) {

             $aPlace = reset($aPlaces);
         }
     }
             $aPlace = reset($aPlaces);
         }
     }


@@ -55,14 +55,16 @@ if (isset($aPlace)) {
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],
         $aPlace['place_id'],
         $aPlace['lon'],
         $aPlace['lat'],

-        $fRadius
+        $fRadius,
+        $fLat,
+        $fLon

     );
 
     if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
 } else {
     );
 
     if ($aOutlineResult) {
         $aPlace = array_merge($aPlace, $aOutlineResult);
     }
 } else {

-    $aPlace = array();
+    $aPlace = [];

 }
 
 
 }
 
 


@@ -72,10 +74,8 @@ if (CONST_Debug) {
 }
 
 if ($sOutputFormat == 'html') {
 }
 
 if ($sOutputFormat == 'html') {

-    $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
+    $sDataDate = chksql($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;
 }
     $sTileURL = CONST_Map_Tile_URL;
     $sTileAttribution = CONST_Map_Tile_Attribution;
 }

-
-$sOutputTemplate = ($sOutputFormat=='jsonv2' ? 'json' : $sOutputFormat);
-include(CONST_BasePath.'/lib/template/address-'.$sOutputTemplate.'.php');
+include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');