Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / AddressDetails.php

diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php
index 657dc3e26a687af457d7c82f40c5ace30d07c1aa..cfdd04167c259de142147e00846ff1b9546fd8e7 100644 (file)
--- a/lib-php/AddressDetails.php
+++ b/lib-php/AddressDetails.php
@@ -94,7 +94,7 @@ class AddressDetails
                 $aAddress[$sTypeLabel] = $sName;
 
                 if (!empty($aLine['name'])) {
-                    $this->addStateCode($aAddress, $sTypeLabel, $aLine['name']);
+                    $this->addSubdivisionCode($aAddress, $aLine['admin_level'], $aLine['name']);
                 }
             }
         }
@@ -179,16 +179,13 @@ class AddressDetails
         return $this->aAddressLines;
     }
 
-    /**
-     * Add `state_code` field to address details to represent second part of ISO 3166-2 country subdivision code
-     */
-    private function addStateCode(&$aAddress, $sTypeLabel, $nameDetails)
+    private function addSubdivisionCode(&$aAddress, $iAdminLevel, $nameDetails)
     {
         if (is_string($nameDetails)) {
             $nameDetails = json_decode('{' . str_replace('"=>"', '":"', $nameDetails) . '}', true);
         }
         if (!empty($nameDetails['ISO3166-2'])) {
-            $aAddress["$sTypeLabel:ISO3166-2"] = $nameDetails['ISO3166-2'];
+            $aAddress["ISO3166-2-lvl$iAdminLevel"] = $nameDetails['ISO3166-2'];
         }
     }
 }