Bring in the code for coloring cells by area... with definite bugs

backend/Cargo.toml

@@ -23,3 +23,4 @@ wasm-bindgen = "0.2.87"
 web-sys = { version = "0.3.64", features = ["console"] }
 bincode = "1.3.3"
 petgraph = "0.6.4"
+contour = "0.12.0"

backend/src/lib.rs

@@ -12,11 +12,13 @@ use wasm_bindgen::prelude::*;
 
 use self::cells::Cell;
 use self::neighbourhood::Neighbourhood;
+use self::render_cells::RenderCells;
 use self::shortcuts::Shortcuts;
 
 mod cells;
 mod mercator;
 mod neighbourhood;
+mod render_cells;
 mod scrape;
 mod shortcuts;
 mod tags;

backend/src/neighbourhood.rs

@@ -6,12 +6,14 @@ use geo::{
 };
 use geojson::{Feature, GeoJson, Geometry};
 
-use crate::{Cell, IntersectionID, MapModel, RoadID, Shortcuts};
+use crate::render_cells::Color;
+use crate::{Cell, IntersectionID, MapModel, RenderCells, RoadID, Shortcuts};
 
 pub struct Neighbourhood {
     pub interior_roads: HashSet<RoadID>,
     crosses: HashMap<RoadID, f64>,
     pub border_intersections: HashSet<IntersectionID>,
+    pub boundary_polygon: Polygon,
 }
 
 impl Neighbourhood {
@@ -60,6 +62,7 @@ impl Neighbourhood {
             interior_roads,
             crosses,
             border_intersections,
+            boundary_polygon: boundary,
         })
     }
 
@@ -69,28 +72,16 @@ impl Neighbourhood {
         // TODO Decide how/where state lives
         let modal_filters = BTreeMap::new();
         let cells = Cell::find_all(map, self, &modal_filters);
+        let render_cells = RenderCells::new(map, self, &cells);
         let shortcuts = Shortcuts::new(map, self);
 
-        // TODO Temporary rendering
-        let mut road_to_cell = HashMap::new();
-        for (idx, cell) in cells.iter().enumerate() {
-            for (r, _) in &cell.roads {
-                road_to_cell.insert(*r, idx);
-            }
-        }
-
         for r in &self.interior_roads {
             let mut f = map.get_r(*r).to_gj(&map.mercator);
             f.set_property("kind", "interior_road");
             f.set_property(
                 "shortcuts",
                 shortcuts.count_per_road.get(r).cloned().unwrap_or(0),
             );
-            if let Some(cell) = road_to_cell.get(r) {
-                f.set_property("cell", *cell);
-            } else {
-                error!("A road has no cell");
-            }
             features.push(f);
         }
         for (r, pct) in &self.crosses {
@@ -105,6 +96,19 @@ impl Neighbourhood {
             features.push(f);
         }
 
+        for (polygons, color) in render_cells
+            .polygons_per_cell
+            .into_iter()
+            .zip(render_cells.colors)
+        {
+            let mut f = Feature::from(Geometry::from(&map.mercator.to_wgs84(&polygons)));
+            match color {
+                Color::Disconnected => f.set_property("color", "disconnected"),
+                Color::Cell(idx) => f.set_property("color", idx),
+            }
+            features.push(f);
+        }
+
         GeoJson::from(features)
     }
 }