hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:twain47/Nominatim

Browse Source
This commit is contained in:
Brian Quinion
2012-12-14 20:48:33 +00:00
parent 1965f423dc d45011cc32
commit b86d5c6a42
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/lib.php
View File

@@ -116,15 +116,17 @@
} }
$aLanguages = array(); $aLanguages = array();
if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER)) if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
{ if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $aLanguagesParse, PREG_SET_ORDER))
foreach($aLanguagesParse as $iLang => $aLanguage)
{ {
$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100); foreach($aLanguagesParse as $iLang => $aLanguage)
if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10; {
$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
}
arsort($aLanguages);
} }
arsort($aLanguages); }
}
if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1); if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1);
foreach($aLanguages as $sLangauge => $fLangauagePref) foreach($aLanguages as $sLangauge => $fLangauagePref)
{ {

2
lib/template/address-json.php
View File

@@ -3,7 +3,7 @@
if (!sizeof($aPlace)) if (!sizeof($aPlace))
{ {
if ($sError) if (isset($sError))
$aFilteredPlaces['error'] = $sError; $aFilteredPlaces['error'] = $sError;
else else
$aFilteredPlaces['error'] = 'Unable to geocode'; $aFilteredPlaces['error'] = 'Unable to geocode';

2
lib/template/address-jsonv2.php
View File

@@ -3,7 +3,7 @@
if (!sizeof($aPlace)) if (!sizeof($aPlace))
{ {
if ($sError) if (isset($sError))
$aFilteredPlaces['error'] = $sError; $aFilteredPlaces['error'] = $sError;
else else
$aFilteredPlaces['error'] = 'Unable to geocode'; $aFilteredPlaces['error'] = 'Unable to geocode';

2
lib/template/address-xml.php
View File

@@ -14,7 +14,7 @@
if (!sizeof($aPlace)) if (!sizeof($aPlace))
{ {
if ($sError) if (isset($sError))
echo "<error>$sError</error>"; echo "<error>$sError</error>";
else else
echo "<error>Unable to geocode</error>"; echo "<error>Unable to geocode</error>";

2
lib/template/search-jsonv2.php
View File

@@ -40,7 +40,7 @@
$aPlace['category'] = $aPointDetails['class']; $aPlace['category'] = $aPointDetails['class'];
$aPlace['type'] = $aPointDetails['type']; $aPlace['type'] = $aPointDetails['type'];
if ($aPointDetails['icon']) if (isset($aPointDetails['icon']))
{ {
$aPlace['icon'] = $aPointDetails['icon']; $aPlace['icon'] = $aPointDetails['icon'];
} }

1
sql/functions.sql
View File

@@ -1526,6 +1526,7 @@ BEGIN
-- Merge address from parent -- Merge address from parent
nameaddress_vector := array_merge(nameaddress_vector, location.nameaddress_vector); nameaddress_vector := array_merge(nameaddress_vector, location.nameaddress_vector);
nameaddress_vector := array_merge(nameaddress_vector, location.name_vector);
--return NEW; --return NEW;
-- Performance, it would be more acurate to do all the rest of the import process but it takes too long -- Performance, it would be more acurate to do all the rest of the import process but it takes too long
-- Just be happy with inheriting from parent road only -- Just be happy with inheriting from parent road only

2
website/search.php
View File

@@ -1475,7 +1475,7 @@
logEnd($oDB, $hLog, sizeof($aToFilter)); logEnd($oDB, $hLog, sizeof($aToFilter));
} }
$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs); $sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
$sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"]; if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
if ($bShowPolygons) $sMoreURL .= '&polygon=1'; if ($bShowPolygons) $sMoreURL .= '&polygon=1';
if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1'; if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']); if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);