Fix generate sa

This commit is contained in:
WQY\qiong
2023-05-17 21:11:41 +08:00
parent 7218fc5db7
commit 2cab278c9f
2 changed files with 23 additions and 0 deletions

View File

@@ -1,10 +1,14 @@
from .s32_region_util import calculate_boundary, inflate_boundary from .s32_region_util import calculate_boundary, inflate_boundary
from .s34_sa_cal import * from .s34_sa_cal import *
from .s34_sa import get_all_service_area_ids
from .batch_exe import execute_batch_command from .batch_exe import execute_batch_command
def generate_service_area(name: str) -> ChangeSet: def generate_service_area(name: str) -> ChangeSet:
cs = ChangeSet() cs = ChangeSet()
for id in get_all_service_area_ids(name):
cs.delete({'type': 'service_area', 'id': id})
sass = calculate_service_area(name) sass = calculate_service_area(name)
time_index = 0 time_index = 0

View File

@@ -6181,6 +6181,16 @@ class TestApi:
assert sa['source'] == 'j1' assert sa['source'] == 'j1'
assert sa['nodes'] == ['j1'] assert sa['nodes'] == ['j1']
assert get_all_service_area_ids(p) == ['sa']
sas = get_all_service_areas(p)
assert len(sas) == 1
sa = sas[0]
assert sa['id'] == 'sa'
assert sa['time_index'] == 1
assert sa['boundary'] == [(0.0, 0.0), (1.0, 0.0), (1.0, 1.0), (0.0, 0.0)]
assert sa['source'] == 'j1'
assert sa['nodes'] == ['j1']
delete_service_area(p, ChangeSet({'id': 'sa'})) delete_service_area(p, ChangeSet({'id': 'sa'}))
sa = get_service_area(p, 'sa') sa = get_service_area(p, 'sa')
assert sa == {} assert sa == {}
@@ -6288,6 +6298,15 @@ class TestApi:
cs = generate_service_area(p).operations cs = generate_service_area(p).operations
assert len(cs) == 78 assert len(cs) == 78
assert len(get_all_service_area_ids(p)) == 78
assert len(get_all_service_areas(p)) == 78
cs = generate_service_area(p).operations
assert len(cs) == 78 * 2
assert len(get_all_service_area_ids(p)) == 78
assert len(get_all_service_areas(p)) == 78
self.leave(p) self.leave(p)