'commit'
This commit is contained in:
@@ -78,15 +78,19 @@ def load_yunnan_area_data():
|
|||||||
|
|
||||||
def query_area_info(query_str):
|
def query_area_info(query_str):
|
||||||
"""
|
"""
|
||||||
查询行政区划信息(优化版)
|
查询行政区划信息
|
||||||
:param query_str: 简称或全称
|
:param query_str: 简称或全称
|
||||||
:return: 包含full_name和area_code的字典,未找到返回None
|
:return: 包含full_name和area_code的字典,未找到返回None
|
||||||
"""
|
"""
|
||||||
|
# 修复:显式加载数据并初始化映射字典
|
||||||
|
abbrev_map, fullname_map = load_jiancheng_data()
|
||||||
|
yunnan_area_map = load_yunnan_area_data()
|
||||||
|
|
||||||
# 1. 先查简称映射表
|
# 1. 先查简称映射表
|
||||||
if query_str in abbrev_map:
|
if query_str in abbrev_map:
|
||||||
return abbrev_map[query_str]
|
return abbrev_map[query_str]
|
||||||
|
|
||||||
# 2. 直接查询完整行政区划数据(新增)
|
# 2. 再查完整行政区划数据
|
||||||
if query_str in yunnan_area_map:
|
if query_str in yunnan_area_map:
|
||||||
return yunnan_area_map[query_str]
|
return yunnan_area_map[query_str]
|
||||||
|
|
||||||
@@ -94,7 +98,7 @@ def query_area_info(query_str):
|
|||||||
if query_str in fullname_map:
|
if query_str in fullname_map:
|
||||||
return fullname_map[query_str]
|
return fullname_map[query_str]
|
||||||
|
|
||||||
# 4. 尝试模糊匹配(新增)
|
# 4. 尝试模糊匹配
|
||||||
for name, info in yunnan_area_map.items():
|
for name, info in yunnan_area_map.items():
|
||||||
if query_str in name or name in query_str:
|
if query_str in name or name in query_str:
|
||||||
return info
|
return info
|
||||||
|
Reference in New Issue
Block a user