FIX: In the datasource hostip.info, the region code (i.e. CA) is now correctly moved to the property (previously, it was part of the property )

Author: Benjamin Pick

data-sources/hostinfo.php

@@ -36,6 +36,19 @@ public function city($ip) {
 			$r['country']['iso_code'] = strtoupper($data['country_code']);
 
 		if ($data['city']) {
+			// In USA, region code is part of the city parameter
+			$cityParts = explode(',', $data['city']);
+			$data['city'] = trim($cityParts[0]);
+			if (!empty($cityParts[1])) {
+				$region = trim($cityParts[1]);
+				if (!empty($region)) {
+					$r['subdivisions'][0] = array(
+						'iso_code' => $region,
+						'names' => array('en' => $region),
+					);
+				}
+			}
+
 			$r['city']['names'] = [ 'en' => $data['city'] ];
 		}
 
@@ -80,6 +93,7 @@ private function api_call($ip) {
 					if ($key == 'country_code' && $value == 'XX')
 						$value = '';
 				}
+				
 				$hasInfo = $data['country_name'] || $data['country_code'] || $data['city'];
 			}
 

data-sources/ipstack.php

@@ -84,7 +84,7 @@ public function city($ip) {
 		if (!empty($data['country_code']))
             $r['country']['iso_code'] = strtoupper($data['country_code']);
 
-            if (!empty($data['region_code'])) {
+        if (!empty($data['region_code'])) {
             $r['subdivisions'][0] = array(
                 'iso_code' => $data['region_code'],
                 'names' => $this->locales($locale, $data['region_name']),

geoip-detect.php

@@ -5,7 +5,7 @@
 Description:     Provides geographic information detected by an IP adress.
 Author:          Yellow Tree (Benjamin Pick)
 Author URI:      http://www.yellowtree.de
-Version:         5.4.1
+Version:         5.5.0-beta1
 License:         GPLv3 or later
 License URI:     http://www.gnu.org/licenses/gpl-3.0.html
 Text Domain:     geoip-detect
@@ -16,7 +16,7 @@
 Requires PHP:    7.2.5
 */
 
-define('GEOIP_DETECT_VERSION', '5.4.1');
+define('GEOIP_DETECT_VERSION', '5.5.0');
 
 /*
 Copyright 2013-2023 Yellow Tree, Siegen, Germany

readme.txt

@@ -174,6 +174,9 @@ If you use Maxmind "Automatic download" then you need to upgrade to this plugin
 
 == Changelog ==
 
+= 5.5.0 =
+* FIX [!]: In the datasource "hostip.info", the region code (i.e. CA) is now correctly moved to the property `mostSpecificSubdivision` (previously, it was part of the property `city`)
+
 = 5.4.1 =
 * NEW: JS now emit events 'geoip-detect-shortcodes-done' and 'geoip-detect-body-classes-done', see https://github.com/yellowtree/geoip-detect/wiki/API:-AJAX#events
 * FIX: Remove Fatal Error in check_requirements ("Undefined constand GEOIP_DETECT_DEBUG")