From 3f67e060eb36781c3f8b0557b4cfa0be2e8a57a0 Mon Sep 17 00:00:00 2001
From: louis-e <44675238+louis-e@users.noreply.github.com>
Date: Wed, 3 Sep 2025 15:01:08 +0200
Subject: [PATCH] Refine elements based on taginfo feedback

---
 Cargo.lock                          |  2 +-
 src/element_processing/amenities.rs |  7 -----
 src/element_processing/leisure.rs   |  1 +
 src/element_processing/man_made.rs  |  3 +-
 taginfo.json                        | 49 +++++------------------------
 5 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1623f63..67fdf5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -191,7 +191,7 @@ dependencies = [
 
 [[package]]
 name = "arnis"
-version = "2.2.1"
+version = "2.3.0"
 dependencies = [
  "clap",
  "colored",
diff --git a/src/element_processing/amenities.rs b/src/element_processing/amenities.rs
index c35079b..bf40f42 100644
--- a/src/element_processing/amenities.rs
+++ b/src/element_processing/amenities.rs
@@ -92,13 +92,6 @@ pub fn generate_amenities(editor: &mut WorldEditor, element: &ProcessedElement,
                     }
                 }
             }
-            "vending" => {
-                // Place vending machine blocks
-                if let Some(pt) = first_node {
-                    editor.set_block(IRON_BLOCK, pt.x, 1, pt.z, None, None);
-                    editor.set_block(IRON_BLOCK, pt.x, 2, pt.z, None, None);
-                }
-            }
             "shelter" => {
                 let roof_block: Block = STONE_BRICK_SLAB;
 
diff --git a/src/element_processing/leisure.rs b/src/element_processing/leisure.rs
index 1563ca9..3b5c26e 100644
--- a/src/element_processing/leisure.rs
+++ b/src/element_processing/leisure.rs
@@ -18,6 +18,7 @@ pub fn generate_leisure(editor: &mut WorldEditor, element: &ProcessedWay, args:
             "park" | "nature_reserve" | "garden" | "disc_golf_course" | "golf_course" => {
                 GRASS_BLOCK
             }
+            "schoolyard" => BLACK_CONCRETE,
             "playground" | "recreation_ground" | "pitch" | "beach_resort" | "dog_park" => {
                 if let Some(surface) = element.tags.get("surface") {
                     match surface.as_str() {
diff --git a/src/element_processing/man_made.rs b/src/element_processing/man_made.rs
index 6b51b2c..7e5ee6d 100644
--- a/src/element_processing/man_made.rs
+++ b/src/element_processing/man_made.rs
@@ -25,6 +25,7 @@ pub fn generate_man_made(editor: &mut WorldEditor, element: &ProcessedElement, _
             "chimney" => generate_chimney(editor, element),
             "water_well" => generate_water_well(editor, element),
             "water_tower" => generate_water_tower(editor, element),
+            "mast" => generate_antenna(editor, element),
             _ => {} // Unknown man_made type, ignore
         }
     }
@@ -96,7 +97,6 @@ fn generate_antenna(editor: &mut WorldEditor, element: &ProcessedElement) {
             Some(h) => h.parse::<i32>().unwrap_or(20).min(40), // Max 40 blocks
             None => match element.tags().get("tower:type").map(|s| s.as_str()) {
                 Some("communication") => 20,
-                Some("transmission") => 25,
                 Some("cellular") => 15,
                 _ => 20,
             },
@@ -249,6 +249,7 @@ pub fn generate_man_made_nodes(editor: &mut WorldEditor, node: &ProcessedNode) {
             "chimney" => generate_chimney(editor, &element),
             "water_well" => generate_water_well(editor, &element),
             "water_tower" => generate_water_tower(editor, &element),
+            "mast" => generate_antenna(editor, &element),
             _ => {} // Unknown man_made type, ignore
         }
     }
diff --git a/taginfo.json b/taginfo.json
index a7b0d84..76666c7 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -178,19 +178,14 @@
         },
         {
             "key": "highway",
-            "value": "secondary",
-            "description": "Generates medium-width roads."
+            "value": "residential",
+            "description": "Generates standard residential roads."
         },
         {
             "key": "highway",
             "value": "tertiary",
             "description": "Generates medium-width roads with lane markings."
         },
-        {
-            "key": "highway",
-            "value": "residential",
-            "description": "Generates standard residential roads."
-        },
         {
             "key": "highway",
             "value": "footway",
@@ -330,31 +325,6 @@
             "value": "concrete",
             "description": "Generates light gray concrete surfaces."
         },
-        {
-            "key": "surface",
-            "value": "clay",
-            "description": "Generates terracotta surfaces."
-        },
-        {
-            "key": "surface",
-            "value": "tartan",
-            "description": "Generates red terracotta surfaces."
-        },
-        {
-            "key": "surface",
-            "value": "pebblestone",
-            "description": "Generates cobblestone surfaces."
-        },
-        {
-            "key": "surface",
-            "value": "cobblestone",
-            "description": "Generates cobblestone surfaces."
-        },
-        {
-            "key": "surface",
-            "value": "unhewn_cobblestone",
-            "description": "Generates cobblestone surfaces."
-        },
         {
             "key": "lanes",
             "description": "Used to determine road width and lane markings."
@@ -714,11 +684,6 @@
             "value": "bench",
             "description": "Generates benches using smooth stone and oak logs."
         },
-        {
-            "key": "amenity",
-            "value": "vending",
-            "description": "Generates vending facilities using iron blocks."
-        },
         {
             "key": "amenity",
             "value": "shelter",
@@ -823,6 +788,11 @@
             "value": "ice_rink",
             "description": "Generates ice rink areas with packed ice surfaces."
         },
+        {
+            "key": "leisure",
+            "value": "schoolyard",
+            "description": "Generates schoolyard areas with asphalt surfaces used for play at schools."
+        },
         {
             "key": "waterway",
             "description": "Used to generate rivers, streams, and other waterways with appropriate depths and banks."
@@ -1135,11 +1105,6 @@
             "value": "transmission",
             "description": "Generates transmission towers with increased height."
         },
-        {
-            "key": "tower:type",
-            "value": "cellular",
-            "description": "Generates cellular towers with reduced height."
-        },
         {
             "key": "aeroway",
             "description": "Used to generate airport infrastructure including runways and taxiways."