Store study area boundary and name in savefiles also

Author: dabreegster

backend/src/lib.rs

@@ -42,14 +42,14 @@ pub struct LTN {
 impl LTN {
     /// Call with bytes of an osm.pbf or osm.xml string
     #[wasm_bindgen(constructor)]
-    pub fn new(input_bytes: &[u8]) -> Result<LTN, JsValue> {
+    pub fn new(input_bytes: &[u8], study_area_name: Option<String>) -> Result<LTN, JsValue> {
         // Panics shouldn't happen, but if they do, console.log them.
         console_error_panic_hook::set_once();
         START.call_once(|| {
             console_log::init_with_level(log::Level::Info).unwrap();
         });
 
-        let map = MapModel::new(input_bytes).map_err(err_to_js)?;
+        let map = MapModel::new(input_bytes, study_area_name).map_err(err_to_js)?;
         Ok(LTN {
             map,
             neighbourhood: None,

backend/src/map_model.rs

@@ -16,6 +16,7 @@ pub struct MapModel {
     pub intersections: Vec<Intersection>,
     // All geometry stored in worldspace, including rtrees
     pub mercator: Mercator,
+    pub study_area_name: Option<String>,
     pub boundary_polygon: Polygon,
 
     // TODO Wasteful, can share some
@@ -67,8 +68,8 @@ pub struct Intersection {
 
 impl MapModel {
     /// Call with bytes of an osm.pbf or osm.xml string
-    pub fn new(input_bytes: &[u8]) -> Result<MapModel> {
-        crate::scrape::scrape_osm(input_bytes)
+    pub fn new(input_bytes: &[u8], study_area_name: Option<String>) -> Result<MapModel> {
+        crate::scrape::scrape_osm(input_bytes, study_area_name)
     }
 
     pub fn get_r(&self, r: RoadID) -> &Road {
@@ -241,6 +242,22 @@ impl MapModel {
             f.remove_property("road");
         }
         gj.features.extend(self.boundaries.values().cloned());
+
+        let mut f = Feature::from(Geometry::from(
+            &self.mercator.to_wgs84(&self.boundary_polygon),
+        ));
+        f.set_property("kind", "study_area_boundary");
+        gj.features.push(f);
+
+        gj.foreign_members = Some(
+            serde_json::json!({
+                "study_area_name": self.study_area_name,
+            })
+            .as_object()
+            .unwrap()
+            .clone(),
+        );
+
         gj
     }
 

backend/src/scrape.rs

@@ -12,7 +12,7 @@ struct Way {
     tags: Tags,
 }
 
-pub fn scrape_osm(input_bytes: &[u8]) -> Result<MapModel> {
+pub fn scrape_osm(input_bytes: &[u8], study_area_name: Option<String>) -> Result<MapModel> {
     let mut node_mapping = HashMap::new();
     let mut highways = Vec::new();
     osm_reader::parse(input_bytes, |elem| match elem {
@@ -62,6 +62,7 @@ pub fn scrape_osm(input_bytes: &[u8]) -> Result<MapModel> {
         intersections,
         mercator,
         boundary_polygon,
+        study_area_name,
 
         router_original,
         router_current,

web/src/NetworkMode.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Feature } from "geojson";
   import { FillLayer, GeoJSON, hoverStateFilter, Popup } from "svelte-maplibre";
-  import { isPolygon, notNull } from "./common";
+  import { notNull } from "./common";
   import ManageSavefiles from "./ManageSavefiles.svelte";
   import ModalFilterLayer from "./ModalFilterLayer.svelte";
   import SplitComponent from "./SplitComponent.svelte";
@@ -76,7 +76,7 @@
   <div slot="map">
     <GeoJSON data={gj} generateId>
       <FillLayer
-        filter={isPolygon}
+        filter={["==", ["get", "kind"], "boundary"]}
         paint={{
           "fill-color": "red",
           "fill-opacity": hoverStateFilter(0.3, 0.5),

web/src/title/MapLoader.svelte

@@ -34,7 +34,7 @@
   function loadMap(buffer: ArrayBuffer) {
     msg = "Building map model from OSM input";
     console.time("load");
-    $app = new LTN(new Uint8Array(buffer));
+    $app = new LTN(new Uint8Array(buffer), $example == "" ? undefined : $example);
     console.timeEnd("load");
 
     // Autoload from local storage