xuwang
/
cross_doctor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/yzj/20251101

This commit is contained in:
yinzijian 2025-12-02 16:26:22 +08:00
parent bdaf030452 a5f768bb0f
commit 972668f816
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/common_worker.py
View File

@ -17,8 +17,8 @@ from app.global_source import *
def load_roadnet_by_city(citycode: int): def load_roadnet_by_city(citycode: int):
logging.info('start load roadnet for %d' % citycode) logging.info('start load roadnet for %d' % citycode)
net_filename = 'data/xl_roadnet_%d.txt' % citycode net_filename = './../common_roadnet/data/xl_roadnet_%d.txt' % citycode
roadinfo_filename = 'data/xl_roadinfo_%d.txt' % citycode roadinfo_filename = './../common_roadnet/data/xl_roadinfo_%d.txt' % citycode
# roadlinks_filename = 'data/xl_roadlinks_%d.txt' % citycode # roadlinks_filename = 'data/xl_roadlinks_%d.txt' % citycode
g_roadnet.load_from_file(net_filename, citycode) g_roadnet.load_from_file(net_filename, citycode)
g_roadinfo_manager.load_from_file(roadinfo_filename) g_roadinfo_manager.load_from_file(roadinfo_filename)
@ -77,7 +77,7 @@ def load_all_roadnet():
reload_base_info(citycode) reload_base_info(citycode)
else: else:
# 加载data目录下的所有城市的roadnet # 加载data目录下的所有城市的roadnet
citycode_set = list_all_citycode('./data') citycode_set = list_all_citycode('../common_roadnet/data')
for citycode in citycode_set: for citycode in citycode_set:
load_roadnet_by_city(citycode) load_roadnet_by_city(citycode)
global g_roadnet, g_roadinfo_manager global g_roadnet, g_roadinfo_manager