From 0e6f89f88bef6021fbfae2d6bfdfc19e85f7db46 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Wed, 20 Nov 2019 11:27:22 -0800 Subject: [PATCH] for now, just clobber turn restrictions when merging roads. want to move forward with fixing other maps. also remove label from previous fixes --- data/fixes/huge_seattle.json | 120 ++++++++++++----------------------- data/fixes/montlake.json | 15 ++--- map_editor/src/world.rs | 2 +- map_model/src/raw.rs | 17 +---- 4 files changed, 49 insertions(+), 105 deletions(-) diff --git a/data/fixes/huge_seattle.json b/data/fixes/huge_seattle.json index 5948306e07..2b2da0dce3 100644 --- a/data/fixes/huge_seattle.json +++ b/data/fixes/huge_seattle.json @@ -1318,8 +1318,7 @@ "inner_x": 10269.0275, "inner_y": 7771.4273 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1331,8 +1330,7 @@ "inner_x": 9793.0142, "inner_y": 8445.1221 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1344,8 +1342,7 @@ "inner_x": 10651.883, "inner_y": 9060.6815 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1357,8 +1354,7 @@ "inner_x": 10527.5088, "inner_y": 7987.9884 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1370,8 +1366,7 @@ "inner_x": 9269.3356, "inner_y": 8108.1985 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1383,8 +1378,7 @@ "inner_x": 9329.6519, "inner_y": 8438.6465 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1396,8 +1390,7 @@ "inner_x": 9687.3006, "inner_y": 8353.1153 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1409,8 +1402,7 @@ "inner_x": 9233.7646, "inner_y": 9245.2339 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1422,8 +1414,7 @@ "inner_x": 10331.0035, "inner_y": 8036.827 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1435,8 +1426,7 @@ "inner_x": 10371.5768, "inner_y": 8027.7614 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1448,8 +1438,7 @@ "inner_x": 9010.6791, "inner_y": 8187.1181 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1461,8 +1450,7 @@ "inner_x": 10105.1281, "inner_y": 8111.7091 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1474,8 +1462,7 @@ "inner_x": 9435.7831, "inner_y": 9300.545 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1487,8 +1474,7 @@ "inner_x": 10587.3845, "inner_y": 8440.8655 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1500,8 +1486,7 @@ "inner_x": 8957.6544, "inner_y": 8033.452 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1513,8 +1498,7 @@ "inner_x": 10271.0257, "inner_y": 7675.7826 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1526,8 +1510,7 @@ "inner_x": 9595.7676, "inner_y": 8838.2062 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1539,8 +1522,7 @@ "inner_x": 9236.5757, "inner_y": 9445.3624 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1552,8 +1534,7 @@ "inner_x": 10592.0907, "inner_y": 9117.1591 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1565,8 +1546,7 @@ "inner_x": 10646.7779, "inner_y": 9080.735 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1578,8 +1558,7 @@ "inner_x": 10682.7693, "inner_y": 9067.3575 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1591,8 +1570,7 @@ "inner_x": 10630.5749, "inner_y": 9048.2283 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1604,8 +1582,7 @@ "inner_x": 10652.2508, "inner_y": 9032.2657 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1617,8 +1594,7 @@ "inner_x": 9063.4712, "inner_y": 8941.9028 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1630,8 +1606,7 @@ "inner_x": 10494.885, "inner_y": 9246.8074 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1643,8 +1618,7 @@ "inner_x": 10396.1365, "inner_y": 8846.172 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1656,8 +1630,7 @@ "inner_x": 10641.223, "inner_y": 9129.4166 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1669,8 +1642,7 @@ "inner_x": 10721.8423, "inner_y": 8038.0877 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1682,8 +1654,7 @@ "inner_x": 10323.3259, "inner_y": 7955.3369 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1695,8 +1666,7 @@ "inner_x": 9845.6945, "inner_y": 8436.4953 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1708,8 +1678,7 @@ "inner_x": 9741.3517, "inner_y": 8436.7662 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1721,8 +1690,7 @@ "inner_x": 9812.9869, "inner_y": 8410.4856 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1734,8 +1702,7 @@ "inner_x": 9761.7609, "inner_y": 8401.6372 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1747,8 +1714,7 @@ "inner_x": 10321.6159, "inner_y": 7930.9696 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1760,8 +1726,7 @@ "inner_x": 10429.8788, "inner_y": 7906.0778 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1773,8 +1738,7 @@ "inner_x": 9050.7621, "inner_y": 8033.1725 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1786,8 +1750,7 @@ "inner_x": 10462.157, "inner_y": 7895.5567 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1799,8 +1762,7 @@ "inner_x": 10273.3944, "inner_y": 7856.8821 }, - "intersection_type": "TrafficSignal", - "label": null + "intersection_type": "TrafficSignal" } ], [ @@ -1812,8 +1774,7 @@ "inner_x": 10462.1336, "inner_y": 7929.3772 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ], [ @@ -1825,8 +1786,7 @@ "inner_x": 9145.7009, "inner_y": 8001.5757 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ] ], diff --git a/data/fixes/montlake.json b/data/fixes/montlake.json index 2c1375e1e0..3052ff58cf 100644 --- a/data/fixes/montlake.json +++ b/data/fixes/montlake.json @@ -124,8 +124,7 @@ "inner_x": 458.3261, "inner_y": 1778.3842 }, - "intersection_type": "Border", - "label": null + "intersection_type": "Border" } ], [ @@ -137,8 +136,7 @@ "inner_x": 1743.1581, "inner_y": 1519.3766 }, - "intersection_type": "Border", - "label": null + "intersection_type": "Border" } ], [ @@ -150,8 +148,7 @@ "inner_x": 1743.7994, "inner_y": 1582.462 }, - "intersection_type": "Border", - "label": null + "intersection_type": "Border" } ], [ @@ -163,8 +160,7 @@ "inner_x": 1511.0743, "inner_y": 1777.5641 }, - "intersection_type": "Border", - "label": null + "intersection_type": "Border" } ], [ @@ -176,8 +172,7 @@ "inner_x": 1735.7188, "inner_y": 644.3151 }, - "intersection_type": "StopSign", - "label": null + "intersection_type": "StopSign" } ] ], diff --git a/map_editor/src/world.rs b/map_editor/src/world.rs index fb03634525..f9a14bfd00 100644 --- a/map_editor/src/world.rs +++ b/map_editor/src/world.rs @@ -1,5 +1,5 @@ use aabb_quadtree::{ItemId, QuadTree}; -use ezgui::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, Line, Prerender, Text}; +use ezgui::{Color, Drawable, EventCtx, GeomBatch, GfxCtx, Prerender, Text}; use geom::{Bounds, Circle, Distance, Polygon}; use std::collections::HashMap; use std::fmt::Debug; diff --git a/map_model/src/raw.rs b/map_model/src/raw.rs index e5c477325e..515fcc9095 100644 --- a/map_model/src/raw.rs +++ b/map_model/src/raw.rs @@ -366,18 +366,6 @@ impl RawMap { } pub fn can_merge_short_road(&self, id: OriginalRoad) -> Result<(), Error> { - let mut orig_restrictions = BTreeSet::new(); - for r in self - .roads_per_intersection(id.i1) - .into_iter() - .chain(self.roads_per_intersection(id.i2)) - { - orig_restrictions.extend(self.turn_restrictions_involving(r)); - } - if !orig_restrictions.is_empty() { - return Err(Error::new(format!("Some turn restriction near {}", id))); - } - let i1 = &self.intersections[&id.i1]; let i2 = &self.intersections[&id.i2]; if i1.intersection_type == IntersectionType::Border @@ -412,9 +400,10 @@ impl RawMap { orig_restrictions.extend(self.turn_restrictions_involving(r)); } // Clear out these restrictions first - /*for tr in &orig_restrictions { + for tr in &orig_restrictions { + println!("Warning: deleting turn restriction"); self.delete_turn_restriction(*tr); - }*/ + } let (i1, i2) = (short.i1, short.i2); let i1_pt = self.intersections[&i1].point;