Fix the build, removing all callers of Polygon::into_ring. #951

And fix a bad Polygon::rectangle caller from widgetry.

apps/game/src/edit/roads.rs

@@ -1016,8 +1016,8 @@ fn fade_irrelevant(app: &App, r: RoadID) -> GeomBatch {
     match Polygon::convex_hull(holes) {
         Ok(hole) => {
             let fade_area = Polygon::with_holes(
-                map.get_boundary_polygon().clone().into_ring(),
-                vec![hole.into_ring()],
+                map.get_boundary_polygon().get_outer_ring(),
+                vec![hole.get_outer_ring()],
             );
             GeomBatch::from(vec![(app.cs.fade_map_dark, fade_area)])
         }

apps/game/src/edit/traffic_signals/mod.rs

@@ -981,8 +981,8 @@ pub fn fade_irrelevant(app: &App, members: &BTreeSet<IntersectionID>) -> GeomBat
     match Polygon::convex_hull(holes) {
         Ok(hole) => {
             let fade_area = Polygon::with_holes(
-                app.primary.map.get_boundary_polygon().clone().into_ring(),
-                vec![hole.into_ring()],
+                app.primary.map.get_boundary_polygon().get_outer_ring(),
+                vec![hole.get_outer_ring()],
             );
             GeomBatch::from(vec![(app.cs.fade_map_dark, fade_area)])
         }

apps/ltn/src/draw_cells.rs

@@ -158,7 +158,7 @@ impl RenderCellsBuilder {
         // enum with 3 cases, just assign a new index to mean "boundary."
         let boundary_marker = neighbourhood.cells.len();
         for (pt, _) in
-            geom::PolyLine::unchecked_new(boundary_polygon.clone().into_ring().into_points())
+            geom::PolyLine::unchecked_new(boundary_polygon.get_outer_ring().into_points())
                 .step_along(Distance::meters(RESOLUTION_M / 2.0), Distance::ZERO)
         {
             // TODO Refactor helpers to transform between map-space and the grid tiles. Possibly

apps/ltn/src/neighbourhood.rs

@@ -134,12 +134,12 @@ impl Neighbourhood {
             n.borders.insert(road.dst_i);
         }
         let fade_area = Polygon::with_holes(
-            map.get_boundary_polygon().clone().into_ring(),
+            map.get_boundary_polygon().get_outer_ring(),
             vec![app
                 .session
                 .partitioning
                 .neighbourhood_boundary_polygon(app, id)
-                .into_ring()],
+                .get_outer_ring()],
         );
         n.fade_irrelevant = GeomBatch::from(vec![(app.cs.fade_map_dark, fade_area)]).upload(ctx);
 

apps/santa/src/player.rs

@@ -148,7 +148,7 @@ impl Player {
                     } else {
                         // Find the exact point on the boundary where we go out of bounds
                         let old_ring = match self.on {
-                            On::Intersection(i) => app.map.get_i(i).polygon.clone().into_ring(),
+                            On::Intersection(i) => app.map.get_i(i).polygon.get_outer_ring(),
                             On::Road(r, _, _) => {
                                 let road = app.map.get_r(r);
                                 road.center_pts.to_thick_ring(road.get_width())

convert_osm/src/extract.rs

@@ -149,7 +149,7 @@ pub fn extract_osm(
         abstio::write_binary(map.name.city.input_path("footways.bin"), &extra_footways);
     }
 
-    let boundary = map.streets.boundary_polygon.clone().into_ring();
+    let boundary = map.streets.boundary_polygon.get_outer_ring();
 
     // TODO Fill this out in a separate loop to keep a mutable borrow short. Maybe do this in
     // reader, or stop doing this entirely.

headless/src/main.rs

@@ -536,7 +536,7 @@ fn export_geometry(map: &Map, i: IntersectionID) -> geojson::GeoJson {
     pairs.push((
         i.polygon
             .translate(-center.x(), -center.y())
-            .into_ring()
+            .get_outer_ring()
             .to_geojson(None),
         props,
     ));

map_model/src/make/transit.rs

@@ -164,8 +164,7 @@ fn create_route(
         // Find the first time the route shape hits the map boundary
         let entry_pt = *map
             .boundary_polygon
-            .clone()
-            .into_ring()
+            .get_outer_ring()
             .all_intersections(&route.shape)
             .get(0)
             .ok_or_else(|| anyhow!("couldn't find where shape enters map"))?;
@@ -191,8 +190,7 @@ fn create_route(
         // Find the last time the route shape hits the map boundary
         let exit_pt = *map
             .boundary_polygon
-            .clone()
-            .into_ring()
+            .get_outer_ring()
             .all_intersections(&route.shape)
             .last()
             .ok_or_else(|| anyhow!("couldn't find where shape leaves map"))?;

map_model/src/map.rs

@@ -904,7 +904,7 @@ impl Map {
             let mut props = serde_json::Map::new();
             props.insert("type".to_string(), "intersection".into());
             props.insert("id".to_string(), i.orig_id.to_string().into());
-            pairs.push((i.polygon.clone().into_ring().to_geojson(gps_bounds), props));
+            pairs.push((i.polygon.get_outer_ring().to_geojson(gps_bounds), props));
         }
         for r in self.all_roads() {
             let mut props = serde_json::Map::new();

widgetry/src/widgets/mod.rs

@@ -552,7 +552,7 @@ impl Widget {
     }
 
     pub fn horiz_separator(ctx: &EventCtx, pct_container_width: f64) -> Widget {
-        GeomBatch::from(vec![(Color::CLEAR, Polygon::rectangle(0.0, 2.0))])
+        GeomBatch::from(vec![(Color::CLEAR, Polygon::rectangle(0.1, 2.0))])
             .into_widget(ctx)
             .container()
             .bg(ctx.style().section_outline.1)