store the tile id an object belongs to as well as an optional title for an object

Author: Yatekii

src/lib/object.rs

@@ -1,3 +1,5 @@
+use crate::math::TileId;
+
 use super::css::Selector;
 
 use lyon::math::Point;
@@ -25,16 +27,26 @@ pub struct Object {
     tags: HashMap<String, String>,
     /// The object type.
     _object_type: ObjectType,
+    pub title: Option<String>,
+    pub tile_id: TileId,
 }
 
 impl Object {
     /// Creates a new object with no tags.
-    pub fn new(selector: Selector, points: Vec<Point>, object_type: ObjectType) -> Self {
+    pub fn new(
+        selector: Selector,
+        points: Vec<Point>,
+        object_type: ObjectType,
+        tile_id: TileId,
+        title: Option<String>,
+    ) -> Self {
         Self {
             selector,
             points,
             tags: HashMap::new(),
             _object_type: object_type,
+            title,
+            tile_id,
         }
     }
 
@@ -44,12 +56,16 @@ impl Object {
         points: Vec<Point>,
         tags: HashMap<String, String>,
         object_type: ObjectType,
+        tile_id: TileId,
+        title: Option<String>,
     ) -> Self {
         Self {
             selector,
             points,
             tags,
             _object_type: object_type,
+            title,
+            tile_id,
         }
     }
 

src/lib/vector_tile/tile.rs

@@ -1,5 +1,4 @@
 use crate::*;
-use egui::TextBuffer;
 use feature::collection::LayerInfo;
 use glyphon::{
     Attrs, Buffer, Color, Family, FontSystem, Metrics, Shaping, TextArea, TextBounds, Weight,
@@ -9,8 +8,8 @@ use lyon::{
     tessellation::{geometry_builder::VertexBuffers, FillOptions, FillTessellator},
 };
 use quick_protobuf::{BytesReader, MessageRead};
+use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
-use std::{collections::HashMap, thread::spawn};
 use std::{fmt::Display, ops::Range};
 use vector_tile::vector_tile::mod_Tile::{Feature, GeomType, Layer, Value};
 
@@ -168,12 +167,14 @@ impl Tile {
 
                 let paths = geometry_commands_to_paths(feature.type_pb, &feature.geometry);
 
+                let mut title = None;
                 if let Some(tag) = tags.get("name:en") {
                     let point = paths[0][ControlPointId(0)];
                     text.push((
                         (point.x / extent as f32, point.y / extent as f32),
                         tag.clone(),
                     ));
+                    title = Some(tag.clone());
                 }
 
                 // If we have a valid object at hand, insert it into the object list
@@ -191,6 +192,8 @@ impl Tile {
                         paths[0].points().to_vec(),
                         tags,
                         ot,
+                        *tile_id,
+                        title,
                     ));
                 }
 
@@ -341,7 +344,13 @@ impl Tile {
             .tessellate_path(&path, &FillOptions::tolerance(0.0001), builder)
             .expect("This is a bug. Please report it.");
 
-        let object = Object::new(selector, path.points().to_vec(), ObjectType::Polygon);
+        let object = Object::new(
+            selector,
+            path.points().to_vec(),
+            ObjectType::Polygon,
+            TileId::new(0, 0, 0),
+            Some("background".to_string()),
+        );
 
         (
             current_feature_id,