1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
use std::collections::{BTreeMap, BTreeSet, HashSet};
use anyhow::Result;
use serde::{Deserialize, Serialize};
use abstutil::Timer;
use geom::{Distance, HashablePt2D, Line, Speed, Time};
use raw_map::{get_lane_specs_ltr, InputRoad};
pub use self::perma::PermanentMapEdits;
use crate::make::{match_points_to_lanes, snap_driveway, trim_path};
use crate::{
connectivity, AccessRestrictions, BuildingID, ControlStopSign, ControlTrafficSignal, Direction,
IntersectionID, IntersectionType, LaneID, LaneSpec, LaneType, Map, MapConfig, Movement,
ParkingLotID, PathConstraints, Pathfinder, Road, RoadID, TransitRouteID, TurnID, TurnType,
Zone,
};
mod compat;
mod perma;
#[derive(Debug, Clone, PartialEq)]
pub struct MapEdits {
pub edits_name: String,
pub commands: Vec<EditCmd>,
pub merge_zones: bool,
pub changed_roads: BTreeSet<RoadID>,
pub original_intersections: BTreeMap<IntersectionID, EditIntersection>,
pub original_crosswalks: BTreeMap<IntersectionID, EditCrosswalks>,
pub changed_routes: BTreeSet<TransitRouteID>,
pub proposal_description: Vec<String>,
pub proposal_link: Option<String>,
}
#[derive(Debug, Clone, PartialEq)]
pub enum EditIntersection {
StopSign(ControlStopSign),
TrafficSignal(traffic_signal_data::TrafficSignal),
Closed,
}
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct EditRoad {
pub lanes_ltr: Vec<LaneSpec>,
pub speed_limit: Speed,
pub access_restrictions: AccessRestrictions,
}
#[derive(Debug, Clone, PartialEq)]
pub struct EditCrosswalks(pub BTreeMap<TurnID, TurnType>);
impl EditRoad {
pub fn get_orig_from_osm(r: &Road, cfg: &MapConfig) -> EditRoad {
EditRoad {
lanes_ltr: get_lane_specs_ltr(&r.osm_tags, cfg),
speed_limit: r.speed_limit_from_osm(),
access_restrictions: r.access_restrictions_from_osm(),
}
}
fn diff(&self, other: &EditRoad) -> Vec<String> {
#![allow(clippy::comparison_chain)]
let mut lt = 0;
let mut dir = 0;
let mut width = 0;
for (spec1, spec2) in self.lanes_ltr.iter().zip(other.lanes_ltr.iter()) {
if spec1.lt != spec2.lt {
lt += 1;
}
if spec1.dir != spec2.dir {
dir += 1;
}
if spec1.width != spec2.width {
width += 1;
}
}
let mut changes = Vec::new();
if lt == 1 {
changes.push("1 lane type".to_string());
} else if lt > 1 {
changes.push(format!("{} lane types", lt));
}
if dir == 1 {
changes.push("1 lane reversal".to_string());
} else if dir > 1 {
changes.push(format!("{} lane reversals", dir));
}
if width == 1 {
changes.push("1 lane width".to_string());
} else {
changes.push(format!("{} lane widths", width));
}
if self.speed_limit != other.speed_limit {
changes.push("speed limit".to_string());
}
if self.access_restrictions != other.access_restrictions {
changes.push("access restrictions".to_string());
}
changes
}
pub fn create_for_test(input_lt: &str, input_dir: &str) -> EditRoad {
assert_eq!(input_lt.len(), input_dir.len());
EditRoad {
lanes_ltr: input_lt
.chars()
.zip(input_dir.chars())
.map(|(lt, dir)| LaneSpec {
lt: LaneType::from_char(lt),
dir: if dir == '^' {
Direction::Fwd
} else {
Direction::Back
},
width: Distance::ZERO,
})
.collect(),
speed_limit: Speed::ZERO,
access_restrictions: AccessRestrictions::new(),
}
}
pub fn check_lanes_ltr(
&self,
description: String,
input_lt: &str,
input_dir: &str,
expected_lt: &str,
expected_dir: &str,
ok: &mut bool,
) {
let actual_lt: String = self.lanes_ltr.iter().map(|s| s.lt.to_char()).collect();
let actual_dir: String = self
.lanes_ltr
.iter()
.map(|s| if s.dir == Direction::Fwd { '^' } else { 'v' })
.collect();
if actual_lt != expected_lt || actual_dir != expected_dir {
*ok = false;
println!("{}", description);
println!("Input:");
println!(" {}", input_lt);
println!(" {}", input_dir);
println!("Got:");
println!(" {}", actual_lt);
println!(" {}", actual_dir);
println!("Expected:");
println!(" {}", expected_lt);
println!(" {}", expected_dir);
println!();
}
}
}
#[derive(Debug, Clone, PartialEq)]
pub enum EditCmd {
ChangeRoad {
r: RoadID,
old: EditRoad,
new: EditRoad,
},
ChangeIntersection {
i: IntersectionID,
new: EditIntersection,
old: EditIntersection,
},
ChangeRouteSchedule {
id: TransitRouteID,
old: Vec<Time>,
new: Vec<Time>,
},
ChangeCrosswalks {
i: IntersectionID,
old: EditCrosswalks,
new: EditCrosswalks,
},
}
pub struct EditEffects {
pub changed_roads: BTreeSet<RoadID>,
pub deleted_lanes: BTreeSet<LaneID>,
pub changed_intersections: BTreeSet<IntersectionID>,
pub added_turns: BTreeSet<TurnID>,
pub deleted_turns: BTreeSet<TurnID>,
pub changed_parking_lots: BTreeSet<ParkingLotID>,
modified_lanes: BTreeSet<LaneID>,
}
impl MapEdits {
pub(crate) fn new() -> MapEdits {
MapEdits {
edits_name: "TODO temporary".to_string(),
proposal_description: Vec::new(),
proposal_link: None,
commands: Vec::new(),
merge_zones: true,
changed_roads: BTreeSet::new(),
original_intersections: BTreeMap::new(),
original_crosswalks: BTreeMap::new(),
changed_routes: BTreeSet::new(),
}
}
pub fn load_from_file(map: &Map, path: String, timer: &mut Timer) -> Result<MapEdits> {
let perma = match abstio::maybe_read_json::<PermanentMapEdits>(path.clone(), timer) {
Ok(perma) => perma,
Err(_) => {
let bytes = abstio::slurp_file(path)?;
let value = serde_json::from_slice(&bytes)?;
compat::upgrade(value, map)?
}
};
if map.get_name().city != perma.map_name.city {
bail!(
"Edits are for {:?}, but this map is {:?}",
perma.map_name.city,
map.get_name().city
);
}
let edits = perma.into_edits_permissive(map);
if edits.commands.is_empty() {
bail!("None of the edits apply to this map");
}
Ok(edits)
}
pub fn load_from_bytes(map: &Map, bytes: Vec<u8>) -> Result<MapEdits> {
let perma = match abstutil::from_json::<PermanentMapEdits>(&bytes) {
Ok(perma) => perma,
Err(_) => {
let contents = std::str::from_utf8(&bytes)?;
let value = serde_json::from_str(contents)?;
compat::upgrade(value, map)?
}
};
let edits = perma.into_edits_permissive(map);
if edits.commands.is_empty() {
bail!("None of the edits apply to this map");
}
Ok(edits)
}
fn save(&self, map: &Map) {
if self.edits_name.starts_with("Untitled Proposal") && self.commands.is_empty() {
return;
}
abstio::write_json(
abstio::path_edits(map.get_name(), &self.edits_name),
&self.to_permanent(map),
);
}
fn update_derived(&mut self, map: &Map) {
self.changed_roads.clear();
self.original_intersections.clear();
self.original_crosswalks.clear();
self.changed_routes.clear();
for cmd in &self.commands {
match cmd {
EditCmd::ChangeRoad { r, .. } => {
self.changed_roads.insert(*r);
}
EditCmd::ChangeIntersection { i, ref old, .. } => {
if !self.original_intersections.contains_key(i) {
self.original_intersections.insert(*i, old.clone());
}
}
EditCmd::ChangeCrosswalks { i, ref old, .. } => {
if !self.original_crosswalks.contains_key(i) {
self.original_crosswalks.insert(*i, old.clone());
}
}
EditCmd::ChangeRouteSchedule { id, .. } => {
self.changed_routes.insert(*id);
}
}
}
self.changed_roads.retain(|r| {
map.get_r_edit(*r) != EditRoad::get_orig_from_osm(map.get_r(*r), &map.config)
});
self.original_intersections
.retain(|i, orig| map.get_i_edit(*i) != orig.clone());
self.original_crosswalks
.retain(|i, orig| map.get_i_crosswalks_edit(*i) != orig.clone());
self.changed_routes.retain(|br| {
let r = map.get_tr(*br);
r.spawn_times != r.orig_spawn_times
});
}
pub fn compress(&mut self, map: &Map) {
for r in &self.changed_roads {
self.commands.push(EditCmd::ChangeRoad {
r: *r,
old: EditRoad::get_orig_from_osm(map.get_r(*r), &map.config),
new: map.get_r_edit(*r),
});
}
for (i, old) in &self.original_intersections {
self.commands.push(EditCmd::ChangeIntersection {
i: *i,
old: old.clone(),
new: map.get_i_edit(*i),
});
}
for (i, old) in &self.original_crosswalks {
self.commands.push(EditCmd::ChangeCrosswalks {
i: *i,
old: old.clone(),
new: map.get_i_crosswalks_edit(*i),
});
}
for r in &self.changed_routes {
let r = map.get_tr(*r);
self.commands.push(EditCmd::ChangeRouteSchedule {
id: r.id,
new: r.spawn_times.clone(),
old: r.orig_spawn_times.clone(),
});
}
}
pub fn changed_lanes(&self, map: &Map) -> (BTreeSet<LaneID>, BTreeSet<RoadID>) {
let mut lanes = BTreeSet::new();
let mut roads = BTreeSet::new();
for r in &self.changed_roads {
let r = map.get_r(*r);
let orig = EditRoad::get_orig_from_osm(r, map.get_config());
if r.speed_limit != orig.speed_limit
|| r.access_restrictions != orig.access_restrictions
|| r.lanes.len() != orig.lanes_ltr.len()
{
roads.insert(r.id);
} else {
for (l, spec) in r.lanes.iter().zip(orig.lanes_ltr.iter()) {
if l.dir != spec.dir || l.lane_type != spec.lt || l.width != spec.width {
lanes.insert(l.id);
}
}
}
}
(lanes, roads)
}
pub fn get_checksum(&self, map: &Map) -> String {
let bytes = abstutil::to_json(&self.to_permanent(map));
let mut context = md5::Context::new();
context.consume(&bytes);
format!("{:x}", context.compute())
}
pub fn get_title(&self) -> &str {
if self.proposal_description.is_empty() {
&self.edits_name
} else {
&self.proposal_description[0]
}
}
}
impl Default for MapEdits {
fn default() -> MapEdits {
MapEdits::new()
}
}
impl EditCmd {
pub fn describe(&self, map: &Map) -> (String, Vec<String>) {
let mut details = Vec::new();
let summary = match self {
EditCmd::ChangeRoad { r, old, new } => {
details = new.diff(old);
format!("road #{}", r.0)
}
EditCmd::ChangeIntersection { i, new, .. } => match new {
EditIntersection::StopSign(_) => format!("stop sign #{}", i.0),
EditIntersection::TrafficSignal(_) => format!("traffic signal #{}", i.0),
EditIntersection::Closed => format!("close {}", i),
},
EditCmd::ChangeCrosswalks { i, .. } => format!("crosswalks at {}", i),
EditCmd::ChangeRouteSchedule { id, .. } => {
format!("reschedule route {}", map.get_tr(*id).short_name)
}
};
(summary, details)
}
fn apply(&self, effects: &mut EditEffects, map: &mut Map) {
match self {
EditCmd::ChangeRoad { r, ref new, .. } => {
if map.get_r_edit(*r) == new.clone() {
return;
}
modify_lanes(map, *r, new.lanes_ltr.clone(), effects);
let road = &mut map.roads[r.0];
road.speed_limit = new.speed_limit;
road.access_restrictions = new.access_restrictions.clone();
effects.changed_roads.insert(road.id);
for i in [road.src_i, road.dst_i] {
effects.changed_intersections.insert(i);
let i = &mut map.intersections[i.0];
i.outgoing_lanes.clear();
i.incoming_lanes.clear();
for r in &i.roads {
for lane in &map.roads[r.0].lanes {
if lane.src_i == i.id {
i.outgoing_lanes.push(lane.id);
} else {
assert_eq!(lane.dst_i, i.id);
i.incoming_lanes.push(lane.id);
}
}
}
recalculate_turns(i.id, map, effects);
}
}
EditCmd::ChangeIntersection {
i,
ref new,
ref old,
} => {
if map.get_i_edit(*i) == new.clone() {
return;
}
map.stop_signs.remove(i);
map.traffic_signals.remove(i);
effects.changed_intersections.insert(*i);
match new {
EditIntersection::StopSign(ref ss) => {
map.intersections[i.0].intersection_type = IntersectionType::StopSign;
map.stop_signs.insert(*i, ss.clone());
}
EditIntersection::TrafficSignal(ref raw_ts) => {
map.intersections[i.0].intersection_type = IntersectionType::TrafficSignal;
if old == &EditIntersection::Closed {
recalculate_turns(*i, map, effects);
}
map.traffic_signals.insert(
*i,
ControlTrafficSignal::import(raw_ts.clone(), *i, map).unwrap(),
);
}
EditIntersection::Closed => {
map.intersections[i.0].intersection_type = IntersectionType::Construction;
}
}
if old == &EditIntersection::Closed || new == &EditIntersection::Closed {
recalculate_turns(*i, map, effects);
}
}
EditCmd::ChangeCrosswalks { i, ref new, .. } => {
if map.get_i_crosswalks_edit(*i) == new.clone() {
return;
}
effects.changed_intersections.insert(*i);
for (turn, turn_type) in &new.0 {
map.mut_turn(*turn).turn_type = *turn_type;
}
}
EditCmd::ChangeRouteSchedule { id, new, .. } => {
map.transit_routes[id.0].spawn_times = new.clone();
}
}
}
fn undo(self) -> EditCmd {
match self {
EditCmd::ChangeRoad { r, old, new } => EditCmd::ChangeRoad {
r,
old: new,
new: old,
},
EditCmd::ChangeIntersection { i, old, new } => EditCmd::ChangeIntersection {
i,
old: new,
new: old,
},
EditCmd::ChangeCrosswalks { i, old, new } => EditCmd::ChangeCrosswalks {
i,
old: new,
new: old,
},
EditCmd::ChangeRouteSchedule { id, old, new } => EditCmd::ChangeRouteSchedule {
id,
old: new,
new: old,
},
}
}
}
fn recalculate_turns(id: IntersectionID, map: &mut Map, effects: &mut EditEffects) {
let i = &mut map.intersections[id.0];
if i.is_border() {
assert!(i.turns.is_empty());
return;
}
let mut old_turns = Vec::new();
for t in std::mem::take(&mut i.turns) {
effects.deleted_turns.insert(t.id);
old_turns.push(t);
}
if i.is_closed() {
return;
}
{
let turns = crate::make::turns::make_all_turns(map, map.get_i(id));
let i = &mut map.intersections[id.0];
for t in turns {
effects.added_turns.insert(t.id);
i.turns.push(t);
}
}
let movements = Movement::for_i(id, map);
let i = &mut map.intersections[id.0];
i.movements = movements;
match i.intersection_type {
IntersectionType::StopSign => {
map.stop_signs.insert(id, ControlStopSign::new(map, id));
}
IntersectionType::TrafficSignal => {
map.traffic_signals
.insert(id, ControlTrafficSignal::new(map, id));
}
IntersectionType::Border | IntersectionType::Construction => unreachable!(),
}
}
fn modify_lanes(map: &mut Map, r: RoadID, lanes_ltr: Vec<LaneSpec>, effects: &mut EditEffects) {
let mut road_geom_changed = Vec::new();
{
let road = map.get_r(r);
let (src_i, dst_i) = (road.src_i, road.dst_i);
let changed_road_width = lanes_ltr.iter().map(|spec| spec.width).sum();
road_geom_changed.extend(recalculate_intersection_polygon(
map,
r,
changed_road_width,
src_i,
));
road_geom_changed.extend(recalculate_intersection_polygon(
map,
r,
changed_road_width,
dst_i,
));
}
{
let road = &mut map.roads[r.0];
for lane in &road.lanes {
effects.deleted_lanes.insert(lane.id);
}
road.recreate_lanes(lanes_ltr);
}
for r in road_geom_changed {
effects.changed_roads.insert(r);
let lane_specs = map.get_r(r).lane_specs();
let road = &mut map.roads[r.0];
road.recreate_lanes(lane_specs);
for lane in &road.lanes {
effects.modified_lanes.insert(lane.id);
}
}
effects.modified_lanes.extend(effects.deleted_lanes.clone());
}
fn recalculate_intersection_polygon(
map: &mut Map,
changed_road: RoadID,
changed_road_width: Distance,
i: IntersectionID,
) -> Vec<RoadID> {
let intersection = map.get_i(i);
let mut input_roads = Vec::new();
let mut id_mapping = BTreeMap::new();
for r in &intersection.roads {
let r = map.get_r(*r);
id_mapping.insert(r.orig_id, r.id);
let half_width = if r.id == changed_road {
changed_road_width / 2.0
} else {
r.get_half_width()
};
let mut trimmed_center_pts = r.center_pts.clone();
if r.src_i == i {
if let Some(pl) = r
.untrimmed_center_pts
.safe_get_slice_ending_at(trimmed_center_pts.first_pt())
.and_then(|pl| pl.extend(trimmed_center_pts.clone()).ok())
{
trimmed_center_pts = pl;
}
} else if let Some(pl) = r
.untrimmed_center_pts
.safe_get_slice_starting_at(trimmed_center_pts.last_pt())
.and_then(|pl| trimmed_center_pts.clone().extend(pl).ok())
{
trimmed_center_pts = pl;
}
input_roads.push(InputRoad {
id: r.orig_id,
center_pts: trimmed_center_pts,
half_width,
osm_tags: r.osm_tags.clone(),
});
}
let results = raw_map::intersection_polygon(
intersection.orig_id,
input_roads,
&BTreeMap::new(),
)
.unwrap();
map.intersections[i.0].polygon = results.intersection_polygon;
let mut affected = Vec::new();
for (orig_id, (pl, _)) in results.trimmed_center_pts {
let id = id_mapping[&orig_id];
map.roads[id.0].center_pts = pl;
if id != changed_road {
affected.push(id);
}
}
affected
}
fn fix_building_driveways(map: &mut Map, input: Vec<BuildingID>, effects: &mut EditEffects) {
let mut center_per_bldg: BTreeMap<BuildingID, HashablePt2D> = BTreeMap::new();
let mut query: HashSet<HashablePt2D> = HashSet::new();
for id in input {
let center = map.get_b(id).polygon.center().to_hashable();
center_per_bldg.insert(id, center);
query.insert(center);
}
let sidewalk_buffer = Distance::meters(7.5);
let mut sidewalk_pts = match_points_to_lanes(
map,
query,
|l| l.is_walkable(),
sidewalk_buffer,
Distance::meters(1000.0),
&mut Timer::throwaway(),
);
for (id, bldg_center) in center_per_bldg {
match sidewalk_pts.remove(&bldg_center).and_then(|pos| {
Line::new(bldg_center.to_pt2d(), pos.pt(map))
.map(|l| (pos, trim_path(&map.get_b(id).polygon, l)))
.ok()
}) {
Some((sidewalk_pos, driveway_geom)) => {
let b = &mut map.buildings[id.0];
b.sidewalk_pos = sidewalk_pos;
b.driveway_geom = driveway_geom.to_polyline();
effects.changed_roads.insert(sidewalk_pos.lane().road);
}
None => {
error!("{} isn't snapped to a sidewalk now!", id);
}
}
}
}
fn fix_parking_lot_driveways(map: &mut Map, input: Vec<ParkingLotID>) {
let mut center_per_lot: Vec<(ParkingLotID, HashablePt2D)> = Vec::new();
let mut query: HashSet<HashablePt2D> = HashSet::new();
for id in input {
let center = map.get_pl(id).polygon.center().to_hashable();
center_per_lot.push((id, center));
query.insert(center);
}
let sidewalk_buffer = Distance::meters(7.5);
let sidewalk_pts = match_points_to_lanes(
map,
query,
|l| l.is_walkable(),
sidewalk_buffer,
Distance::meters(1000.0),
&mut Timer::throwaway(),
);
for (id, center) in center_per_lot {
match snap_driveway(center, &map.get_pl(id).polygon, &sidewalk_pts, map) {
Ok((driveway_line, driving_pos, sidewalk_line, sidewalk_pos)) => {
let pl = &mut map.parking_lots[id.0];
pl.driveway_line = driveway_line;
pl.driving_pos = driving_pos;
pl.sidewalk_line = sidewalk_line;
pl.sidewalk_pos = sidewalk_pos;
}
Err(err) => {
error!("{} isn't snapped to a sidewalk now: {}", id, err);
}
}
}
}
impl Map {
pub fn new_edits(&self) -> MapEdits {
let mut edits = MapEdits::new();
let mut i = 1;
loop {
let name = format!("Untitled Proposal {}", i);
if !abstio::file_exists(abstio::path_edits(&self.name, &name)) {
edits.edits_name = name;
return edits;
}
i += 1;
}
}
pub fn get_edits(&self) -> &MapEdits {
&self.edits
}
pub fn unsaved_edits(&self) -> bool {
self.edits.edits_name.starts_with("Untitled Proposal") && !self.edits.commands.is_empty()
}
pub fn get_r_edit(&self, r: RoadID) -> EditRoad {
let r = self.get_r(r);
EditRoad {
lanes_ltr: r.lane_specs(),
speed_limit: r.speed_limit,
access_restrictions: r.access_restrictions.clone(),
}
}
pub fn edit_road_cmd<F: Fn(&mut EditRoad)>(&self, r: RoadID, f: F) -> EditCmd {
let old = self.get_r_edit(r);
let mut new = old.clone();
f(&mut new);
EditCmd::ChangeRoad { r, old, new }
}
pub fn get_i_edit(&self, i: IntersectionID) -> EditIntersection {
match self.get_i(i).intersection_type {
IntersectionType::StopSign => EditIntersection::StopSign(self.get_stop_sign(i).clone()),
IntersectionType::TrafficSignal => {
EditIntersection::TrafficSignal(self.get_traffic_signal(i).export(self))
}
IntersectionType::Construction => EditIntersection::Closed,
IntersectionType::Border => unreachable!(),
}
}
pub fn get_i_crosswalks_edit(&self, i: IntersectionID) -> EditCrosswalks {
let mut turns = BTreeMap::new();
for turn in &self.get_i(i).turns {
if turn.turn_type.pedestrian_crossing() {
turns.insert(turn.id, turn.turn_type);
}
}
EditCrosswalks(turns)
}
pub fn save_edits(&self) {
let mut edits = self.edits.clone();
edits.commands.clear();
edits.compress(self);
edits.save(self);
}
pub fn must_apply_edits(&mut self, new_edits: MapEdits, timer: &mut Timer) -> EditEffects {
self.apply_edits(new_edits, true, timer)
}
pub fn try_apply_edits(&mut self, new_edits: MapEdits, timer: &mut Timer) {
self.apply_edits(new_edits, false, timer);
}
pub fn clear_edits_before_save(&mut self) {
self.edits = self.new_edits();
}
fn apply_edits(
&mut self,
mut new_edits: MapEdits,
enforce_valid: bool,
timer: &mut Timer,
) -> EditEffects {
self.edits_generation += 1;
let mut effects = EditEffects {
changed_roads: BTreeSet::new(),
deleted_lanes: BTreeSet::new(),
changed_intersections: BTreeSet::new(),
added_turns: BTreeSet::new(),
deleted_turns: BTreeSet::new(),
changed_parking_lots: BTreeSet::new(),
modified_lanes: BTreeSet::new(),
};
if self.edits == new_edits {
return effects;
}
let mut start_at_idx = 0;
for (cmd1, cmd2) in self.edits.commands.iter().zip(new_edits.commands.iter()) {
if cmd1 == cmd2 {
start_at_idx += 1;
} else {
break;
}
}
timer.start_iter("undo old edits", self.edits.commands.len() - start_at_idx);
for _ in start_at_idx..self.edits.commands.len() {
timer.next();
self.edits
.commands
.pop()
.unwrap()
.undo()
.apply(&mut effects, self);
}
timer.start_iter("apply new edits", new_edits.commands.len() - start_at_idx);
for cmd in &new_edits.commands[start_at_idx..] {
timer.next();
cmd.apply(&mut effects, self);
}
timer.start("re-snap buildings");
let mut recalc_buildings = Vec::new();
for b in self.all_buildings() {
if effects.modified_lanes.contains(&b.sidewalk()) {
recalc_buildings.push(b.id);
}
}
fix_building_driveways(self, recalc_buildings, &mut effects);
timer.stop("re-snap buildings");
timer.start("re-snap parking lots");
let mut recalc_parking_lots = Vec::new();
for pl in self.all_parking_lots() {
if effects.modified_lanes.contains(&pl.driving_pos.lane())
|| effects.modified_lanes.contains(&pl.sidewalk_pos.lane())
{
recalc_parking_lots.push(pl.id);
effects.changed_parking_lots.insert(pl.id);
}
}
fix_parking_lot_driveways(self, recalc_parking_lots);
timer.stop("re-snap parking lots");
if enforce_valid {
for id in &effects.changed_roads {
let stops = self.get_r(*id).transit_stops.clone();
for s in stops {
let sidewalk_pos = self.get_ts(s).sidewalk_pos;
let driving_lane = self
.get_r(*id)
.find_closest_lane(sidewalk_pos.lane(), |l| {
PathConstraints::Bus.can_use(l, self)
})
.unwrap();
let driving_pos = sidewalk_pos.equiv_pos(driving_lane, self);
self.transit_stops.get_mut(&s).unwrap().driving_pos = driving_pos;
}
}
}
let merge_zones_changed = self.edits.merge_zones != new_edits.merge_zones;
new_edits.update_derived(self);
self.edits = new_edits;
self.pathfinder_dirty = true;
if !effects.changed_roads.is_empty() || merge_zones_changed {
self.zones = Zone::make_all(self);
}
effects
.added_turns
.retain(|t| self.maybe_get_t(*t).is_some());
let mut more_changed_intersections = Vec::new();
for t in effects
.deleted_turns
.iter()
.chain(effects.added_turns.iter())
{
more_changed_intersections.push(t.parent);
}
effects
.changed_intersections
.extend(more_changed_intersections);
self.recalculate_road_to_buildings();
effects
}
pub fn recalculate_pathfinding_after_edits(&mut self, timer: &mut Timer) {
if !self.pathfinder_dirty {
return;
}
let mut pathfinder = std::mem::replace(&mut self.pathfinder, Pathfinder::empty());
pathfinder.apply_edits(self, timer);
self.pathfinder = pathfinder;
timer.start("recompute blackholes");
for road in &mut self.roads {
for lane in &mut road.lanes {
lane.driving_blackhole = false;
lane.biking_blackhole = false;
}
}
for l in connectivity::find_scc(self, PathConstraints::Car).1 {
self.mut_lane(l).driving_blackhole = true;
}
for l in connectivity::find_scc(self, PathConstraints::Bike).1 {
self.mut_lane(l).biking_blackhole = true;
}
timer.stop("recompute blackholes");
self.pathfinder_dirty = false;
}
pub fn incremental_edit_traffic_signal(&mut self, signal: ControlTrafficSignal) {
assert_eq!(
self.get_i(signal.id).intersection_type,
IntersectionType::TrafficSignal
);
self.traffic_signals.insert(signal.id, signal);
}
pub fn get_edits_change_key(&self) -> usize {
self.edits_generation
}
}