X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/70f0d6ba8bc0e8c4115155b27a36e8a9a037d727..65aba66c99903322bc56c7ca99ac29446dd94d09:/lib/lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 07d5bcf3..a7584b37 100644
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -45,7 +45,7 @@
 		if (!$sUserError) $sUserError = $sError;
 		error_log('ERROR: '.$sError);
 		echo $sUserError."\n";
-		exit;
+		exit(-1);
 	}
 
 
@@ -94,7 +94,8 @@
 
 	function bySearchRank($a, $b)
 	{
-		if ($a['iSearchRank'] == $b['iSearchRank']) return 0;
+		if ($a['iSearchRank'] == $b['iSearchRank'])
+            return strlen($a['sOperator']) + strlen($a['sHouseNumber']) - strlen($b['sOperator']) - strlen($b['sHouseNumber']);
 		return ($a['iSearchRank'] < $b['iSearchRank']?-1:1);
 	}
 
@@ -385,6 +386,8 @@
  'landuse:commercial' => array('label'=>'Commercial','frequency'=>657,'icon'=>'',),
 
  'place:airport' => array('label'=>'Airport','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
+ 'aeroway:aerodrome' => array('label'=>'Aerodrome','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
+ 'aeroway' => array('label'=>'Aeroway','frequency'=>36,'icon'=>'transport_airport2', 'defdiameter' => 0.03,),
  'railway:station' => array('label'=>'Station','frequency'=>3431,'icon'=>'transport_train_station2', 'defdiameter' => 0.01,),
  'amenity:place_of_worship' => array('label'=>'Place Of Worship','frequency'=>9049,'icon'=>'place_of_worship_unknown3',),
  'amenity:pub' => array('label'=>'Pub','frequency'=>18969,'icon'=>'food_pub',),
@@ -788,7 +791,7 @@
 			{
 				$sTypeLabel = strtolower(isset($aTypeLabel['simplelabel'])?$aTypeLabel['simplelabel']:$aTypeLabel['label']);
 				$sTypeLabel = str_replace(' ','_',$sTypeLabel);
-				if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]))
+				if (!isset($aAddress[$sTypeLabel]) || (isset($aFallback[$sTypeLabel]) && $aFallback[$sTypeLabel]) || $aLine['class'] == 'place')
 				{
 					$aAddress[$sTypeLabel] = $aLine['localname']?$aLine['localname']:$aLine['housenumber'];
 				}