Merge pull request #232 from louis-e/multipolygon-building-levels-fix

fix: respect building:levels tag from OSM relations

src/data_processing.rs

@@ -64,7 +64,7 @@ pub fn generate_world(
         match element {
             ProcessedElement::Way(way) => {
                 if way.tags.contains_key("building") || way.tags.contains_key("building:part") {
-                    buildings::generate_buildings(&mut editor, way, ground_level, args);
+                    buildings::generate_buildings(&mut editor, way, ground_level, args, None);
                 } else if way.tags.contains_key("highway") {
                     highways::generate_highways(&mut editor, element, ground_level, args);
                 } else if way.tags.contains_key("landuse") {

src/element_processing/buildings.rs

@@ -14,6 +14,7 @@ pub fn generate_buildings(
     element: &ProcessedWay,
     ground_level: i32,
     args: &Args,
+    relation_levels: Option<i32>,
 ) {
     let mut previous_node: Option<(i32, i32)> = None;
     let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
@@ -80,6 +81,10 @@ pub fn generate_buildings(
         }
     }
 
+    if let Some(levels) = relation_levels {
+        building_height = levels * 4 + 2;
+    }
+
     if let Some(amenity_type) = element.tags.get("amenity") {
         if amenity_type == "shelter" {
             let roof_block: Block = STONE_BRICK_SLAB;
@@ -410,15 +415,28 @@ pub fn generate_building_from_relation(
     ground_level: i32,
     args: &Args,
 ) {
+    // Extract levels from relation tags
+    let relation_levels = relation
+        .tags
+        .get("building:levels")
+        .and_then(|l| l.parse::<i32>().ok())
+        .unwrap_or(2); // Default to 2 levels
+
     // Process the outer way to create the building walls
     for member in &relation.members {
         if member.role == ProcessedMemberRole::Outer {
-            generate_buildings(editor, &member.way, ground_level, args);
+            generate_buildings(
+                editor,
+                &member.way,
+                ground_level,
+                args,
+                Some(relation_levels),
+            );
         }
     }
 
     // Handle inner ways (holes, courtyards, etc.)
-    for member in &relation.members {
+    /*for member in &relation.members {
         if member.role == ProcessedMemberRole::Inner {
             let polygon_coords: Vec<(i32, i32)> =
                 member.way.nodes.iter().map(|n| (n.x, n.z)).collect();
@@ -430,7 +448,7 @@ pub fn generate_building_from_relation(
                 editor.set_block(AIR, x, ground_level, z, None, Some(&[SPONGE]));
             }
         }
-    }
+    }*/
 }
 
 fn find_nearest_block_in_color_map(

src/main.rs

@@ -128,12 +128,13 @@ fn main() {
         panic::set_hook(Box::new(|panic_info| {
             let message = format!("Application panicked: {:?}", panic_info);
             error!("{}", message);
+            std::process::exit(1);
         }));
 
         tauri::Builder::default()
             .plugin(
                 LogBuilder::default()
-                    .level(LevelFilter::Trace)
+                    .level(LevelFilter::Warn)
                     .targets([
                         Target::new(TargetKind::LogDir {
                             file_name: Some("arnis.log".into()),

src/osm_parser.rs

@@ -65,9 +65,9 @@ pub struct ProcessedMember {
 
 #[derive(Debug)]
 pub struct ProcessedRelation {
-    id: u64,
-    pub members: Vec<ProcessedMember>,
+    pub id: u64,
     pub tags: HashMap<String, String>,
+    pub members: Vec<ProcessedMember>,
 }
 
 #[derive(Debug)]
@@ -240,12 +240,7 @@ pub fn parse_osm_data(
                 let role = match mem.role.as_str() {
                     "outer" => ProcessedMemberRole::Outer,
                     "inner" => ProcessedMemberRole::Inner,
-                    _ => {
-                        // We only care about outer/inner because
-                        // we just want multipolygons at the current time
-
-                        return None;
-                    }
+                    _ => return None,
                 };
 
                 let way: ProcessedWay = ways_map