make HTML validator happy with details page

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 132be9a54aa54602135d63d2a723fbf63d4f4526..c6febe7384de1e128d5f12ba6140474480c58af2 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -202,6 +202,98 @@
                        return $this->sQuery;
                }
 
+
+               function loadParamArray($aParams)
+               {
+                       if (isset($aParams['addressdetails'])) $this->bIncludeAddressDetails = (bool)$aParams['addressdetails'];
+                       if (isset($aParams['bounded'])) $this->bBoundedSearch = (bool)$aParams['bounded'];
+                       if (isset($aParams['dedupe'])) $this->bDeDupe = (bool)$aParams['dedupe'];
+
+                       if (isset($aParams['limit'])) $this->setLimit((int)$aParams['limit']);
+                       if (isset($aParams['offset'])) $this->iOffset = (int)$aParams['offset'];
+
+                       if (isset($aParams['fallback'])) $this->bFallback = (bool)$aParams['fallback'];
+
+                       // List of excluded Place IDs - used for more acurate pageing
+                       if (isset($aParams['exclude_place_ids']) && $aParams['exclude_place_ids'])
+                       {
+                               foreach(explode(',',$aParams['exclude_place_ids']) as $iExcludedPlaceID)
+                               {
+                                       $iExcludedPlaceID = (int)$iExcludedPlaceID;
+                                       if ($iExcludedPlaceID) $aExcludePlaceIDs[$iExcludedPlaceID] = $iExcludedPlaceID;
+                               }
+                               $this->aExcludePlaceIDs = $aExcludePlaceIDs;
+                       }
+
+                       // Only certain ranks of feature
+                       if (isset($aParams['featureType'])) $this->setFeatureType($aParams['featureType']);
+                       if (isset($aParams['featuretype'])) $this->setFeatureType($aParams['featuretype']);
+
+                       // Country code list
+                       if (isset($aParams['countrycodes']))
+                       {
+                               $aCountryCodes = array();
+                               foreach(explode(',',$aParams['countrycodes']) as $sCountryCode)
+                               {
+                                       if (preg_match('/^[a-zA-Z][a-zA-Z]$/', $sCountryCode))
+                                       {
+                                               $aCountryCodes[] = strtolower($sCountryCode);
+                                       }
+                               }
+                               $this->aCountryCodes = $aCountryCodes;
+                       }
+
+                       if (isset($aParams['viewboxlbrt']) && $aParams['viewboxlbrt'])
+                       {
+                               $aCoOrdinatesLBRT = explode(',',$aParams['viewboxlbrt']);
+                               $this->setViewBox($aCoOrdinatesLBRT[0], $aCoOrdinatesLBRT[1], $aCoOrdinatesLBRT[2], $aCoOrdinatesLBRT[3]);
+                       }
+                       else if (isset($aParams['viewbox']) && $aParams['viewbox'])
+                       {
+                               $aCoOrdinatesLTRB = explode(',',$aParams['viewbox']);
+                               $this->setViewBox($aCoOrdinatesLTRB[0], $aCoOrdinatesLTRB[3], $aCoOrdinatesLTRB[2], $aCoOrdinatesLTRB[1]);
+                       }
+
+                       if (isset($aParams['route']) && $aParams['route'] && isset($aParams['routewidth']) && $aParams['routewidth'])
+                       {
+                               $aPoints = explode(',',$aParams['route']);
+                               if (sizeof($aPoints) % 2 != 0)
+                               {
+                                       userError("Uneven number of points");
+                                       exit;
+                               }
+                               $fPrevCoord = false;
+                               $aRoute = array();
+                               foreach($aPoints as $i => $fPoint)
+                               {
+                                       if ($i%2)
+                                       {
+                                               $aRoute[] = array((float)$fPoint, $fPrevCoord);
+                                       }
+                                       else
+                                       {
+                                               $fPrevCoord = (float)$fPoint;
+                                       }
+                               }
+                               $this->aRoutePoints = $aRoute;
+                       }
+               }
+
+               function setQueryFromParams($aParams)
+               {
+                       // Search query
+                       $sQuery = (isset($aParams['q'])?trim($aParams['q']):'');
+                       if (!$sQuery)
+                       {
+                               $this->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+                               $this->setReverseInPlan(false);
+                       }
+                       else
+                       {
+                               $this->setQuery($sQuery);
+                       }
+               }
+
                function loadStructuredAddressElement($sValue, $sKey, $iNewMinAddressRank, $iNewMaxAddressRank, $aItemListValues)
                {
                        $sValue = trim($sValue);
@@ -391,9 +483,9 @@
                        // Conflicts between US state abreviations and various words for 'the' in different languages
                        if (isset($this->aLangPrefOrder['name:en']))
                        {
-                               $sQuery = preg_replace('/,\s*il\s*(,|$)/',', illinois\1', $sQuery);
-                               $sQuery = preg_replace('/,\s*al\s*(,|$)/',', alabama\1', $sQuery);
-                               $sQuery = preg_replace('/,\s*la\s*(,|$)/',', louisiana\1', $sQuery);
+                               $sQuery = preg_replace('/(^|,)\s*il\s*(,|$)/','\1illinois\2', $sQuery);
+                               $sQuery = preg_replace('/(^|,)\s*al\s*(,|$)/','\1alabama\2', $sQuery);
+                               $sQuery = preg_replace('/(^|,)\s*la\s*(,|$)/','\1louisiana\2', $sQuery);
                        }
 
                        // View Box SQL
@@ -1174,7 +1266,14 @@
                                                        if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
                                                        if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 
-                                                       $sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+                                                       if ($aSearch['sHouseNumber'])
+                                                       {
+                                                               $sImportanceSQL = '- abs(26 - address_rank) + 3';
+                                                       }
+                                                       else
+                                                       {
+                                                               $sImportanceSQL = '(case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end)';
+                                                       }
                                                        if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
                                                        if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
                                                        $aOrder[] = "$sImportanceSQL DESC";
@@ -1581,7 +1680,7 @@
                                                        $aResult['aPolyPoints'][] = array($aPoint[1], $aPoint[2]);
                                                }
                                        }
-                                       $aResult['aBoundingBox'] = array($aPointPolygon['minlat'],$aPointPolygon['maxlat'],$aPointPolygon['minlon'],$aPointPolygon['maxlon']);
+                                       $aResult['aBoundingBox'] = array((string)$aPointPolygon['minlat'],(string)$aPointPolygon['maxlat'],(string)$aPointPolygon['minlon'],(string)$aPointPolygon['maxlon']);
                                }
 
                                // Is there an icon set for this type of result?