From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 23 Aug 2014 20:25:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~522
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/c03ae560e33b17f8623578c572a7b096c2311008?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'
---

c03ae560e33b17f8623578c572a7b096c2311008
diff --combined lib/lib.php
index b54023a4,d3b88711..a7584b37
--- a/lib/lib.php
+++ b/lib/lib.php
@@@ -94,8 -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);
  	}
  
@@@ -178,7 -177,7 +178,7 @@@
  	{
  		$aResult = array(array(join(' ',$aWords)));
  		$sFirstToken = '';
 -		if ($iDepth < 8) {
 +		if ($iDepth < 7) {
  			while(sizeof($aWords) > 1)
  			{
  				$sWord = array_shift($aWords);
@@@ -386,6 -385,8 +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',),