fix CityLevelDistrict triggers mismatched city&province (#198)

Co-authored-by: ell <[email protected]>

Author: EllaLiu5

src/main/java/org/bitlap/geocoding/core/impl/RegionInterpreterVisitor.kt

@@ -384,15 +384,19 @@ open class RegionInterpreterVisitor (
         }
     }
 
-    private fun updateCityAndProvince(distinct: RegionEntity?) {
-        if (distinct == null) return
+    private fun updateCityAndProvince(district: RegionEntity?) {
+        if (district == null) return
         if (!curDivision.hasCity()) {
-            curDivision.city = persister.getRegion(distinct.parentId)?.also { city ->
-                if (!curDivision.hasProvince()) {
-                    curDivision.province = persister.getRegion(city.parentId)
-                }
+            // CityLevelDistrict类型的parent是省级因此直接赋值city
+            if (district.type == CityLevelDistrict) {
+                curDivision.city = district
+            } else {
+                curDivision.city = persister.getRegion(district.parentId)
             }
         }
+        if (!curDivision.hasProvince() && curDivision.hasCity()) {
+            curDivision.province = persister.getRegion(curDivision.city!!.parentId)
+        }
     }
 
     /**

src/test/java/org/bitlap/geocoding/TestNormalizing.kt

@@ -516,6 +516,22 @@ class TestNormalizing {
                 "绿地城润园"
             )
         )
+        // fix CityLevelDistrict 识别错误
+        assertEquals(
+            Geocoding.normalizing("陈场镇绿地城润园"),
+            Address(
+                420000000000, "湖北省",
+                429004000000, "仙桃市",
+                429004000000, "仙桃市",
+                429004114000, "陈场镇",
+                429004114000, "陈场镇",
+                null, null,
+                null,
+                null,
+                null,
+                "绿地城润园"
+            )
+        )
     }