From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 16 Sep 2013 22:22:08 +0000 (+0200)
Subject: move country to end of structured query
X-Git-Tag: v2.2.0~22
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/008407c2f7fa03f234fea0b2d2dae7867fba3948

move country to end of structured query

Fixes https://trac.openstreetmap.org/ticket/4918
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 0ea56c7a..cadad111 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -221,8 +221,8 @@
 			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCity, 'city', 14, 24, false);
 			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCounty, 'county', 9, 13, false);
 			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sState, 'state', 8, 8, false);
-			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCountry, 'country', 4, 4, false);
 			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sPostalCode, 'postalcode' , 5, 11, array(5, 11));
+			$this->loadStructuredAddressElement($this->aStructuredQuery, $this->iMinAddressRank, $this->iMaxAddressRank, $this->aAddressRankList, $sCountry, 'country', 4, 4, false);
 
 			if (sizeof($this->aStructuredQuery) > 0) 
 			{