Start to organize rendering code into a submodule

osm2streets/src/lib.rs

@@ -32,10 +32,7 @@ pub use osm2lanes::{
 mod geometry;
 mod ids;
 mod intersection;
-mod marking;
 mod operations;
-mod output;
-mod paint;
 mod pathfinding;
 mod render;
 mod road;

osm2streets/src/render.rs → osm2streets/src/render/mod.rs

@@ -1,3 +1,7 @@
+mod marking;
+mod output;
+mod paint;
+
 use std::collections::{BTreeMap, BTreeSet};
 use std::fs::File;
 use std::io::Write;

osm2streets/src/output.rs → osm2streets/src/render/output.rs

@@ -1,13 +1,13 @@
 use itertools::Itertools;
 
-use crate::{BufferType, Direction, LaneType, Placement, StreetNetwork, TrafficInterruption};
 use geo::MapCoordsInPlace;
 use geom::{Distance, Line, Pt2D};
 
 use osm2lanes::{RoadPosition, TrafficClass};
 
-use crate::marking::{LongitudinalLine, RoadMarking, Transverse};
-use crate::paint::PaintArea;
+use crate::render::marking::{LongitudinalLine, RoadMarking, Transverse};
+use crate::render::paint::PaintArea;
+use crate::{BufferType, Direction, LaneType, Placement, StreetNetwork, TrafficInterruption};
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct Surface {

osm2streets/src/paint.rs → osm2streets/src/render/paint.rs

@@ -1,4 +1,4 @@
-use crate::{marking, marking::RoadMarking};
+use crate::render::{marking, marking::RoadMarking};
 
 // We use geom and stay in map space. Output is done in latlon.
 use geom::{Angle, Distance, Line, PolyLine, Polygon, Pt2D, Ring};