|
17 | 17 | B01Q10MapParserConfig, |
18 | 18 | Q10EraseZone, |
19 | 19 | Q10HeaderCalibration, |
| 20 | + Q10MapPacket, |
20 | 21 | Q10Point, |
21 | 22 | parse_map_packet, |
22 | 23 | ) |
23 | 24 | from roborock.map.b01_q10_overlays import ZONE_TYPE_NO_GO, ZONE_TYPE_NO_MOP, Q10Zone |
24 | 25 | from roborock.map.b01_q10_render import ( |
25 | 26 | _Q10_RESOLUTIONS, |
| 27 | + Q10MapRender, |
26 | 28 | draw_path_on_map, |
27 | 29 | render_q10_map, |
28 | 30 | solve_q10_calibration, |
|
36 | 38 | IDENTITY = GridCalibration(resolution=1.0, origin_x=0.0, origin_y=5.0, y_sign=1) |
37 | 39 |
|
38 | 40 |
|
39 | | -def _packet(): |
| 41 | +def _packet() -> Q10MapPacket: |
40 | 42 | return parse_map_packet(FIXTURE.read_bytes()) |
41 | 43 |
|
42 | 44 |
|
43 | | -def _render(packet=None, **kwargs): |
44 | | - packet = packet if packet is not None else _packet() |
45 | | - args = dict(calibration=None, path=[], robot_position=None, zones=[], virtual_walls=[], config=CONFIG) |
46 | | - args.update(kwargs) |
47 | | - return render_q10_map(packet, **args) |
| 45 | +def _render( |
| 46 | + packet: Q10MapPacket | None = None, |
| 47 | + *, |
| 48 | + calibration: GridCalibration | None = None, |
| 49 | + path: list[Q10Point] | None = None, |
| 50 | + robot_position: Q10Point | None = None, |
| 51 | + zones: list[Q10Zone] | None = None, |
| 52 | + virtual_walls: list[Q10Zone] | None = None, |
| 53 | +) -> Q10MapRender: |
| 54 | + return render_q10_map( |
| 55 | + packet if packet is not None else _packet(), |
| 56 | + calibration=calibration, |
| 57 | + path=path or [], |
| 58 | + robot_position=robot_position, |
| 59 | + zones=zones or [], |
| 60 | + virtual_walls=virtual_walls or [], |
| 61 | + config=CONFIG, |
| 62 | + ) |
48 | 63 |
|
49 | 64 |
|
50 | 65 | def _floor_world_points(layers, cal: GridCalibration, count: int) -> list[Q10Point]: |
|
0 commit comments