fix

maplibre · Aug 25, 2024 · 820ea08 · 820ea08
1 parent 89a616b
commit 820ea08
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/maplibre/src/sdf/layout/symbol_feature.rs b/maplibre/src/sdf/layout/symbol_feature.rs
@@ -6,11 +6,13 @@ use std::cmp::Ordering;
 
 // TODO: Actual feature data with properties
 #[derive(Clone)]
-pub struct VectorGeometryTileFeature;
+pub struct VectorGeometryTileFeature {
+    pub geometry: GeometryCollection,
+}
 
 #[derive(Clone)]
 pub struct SymbolGeometryTileFeature {
-    pub feature: Box<VectorGeometryTileFeature>,
+    feature: Box<VectorGeometryTileFeature>,
     pub geometry: GeometryCollection, // we need a mutable copy of the geometry for mergeLines()
     pub formattedText: Option<TaggedString>,
     pub icon: Option<expression::Image>,
@@ -51,11 +53,10 @@ impl SymbolGeometryTileFeature {
 }
 
 impl SymbolGeometryTileFeature {
-    fn new(feature: Box<SymbolGeometryTileFeature>) -> Self {
+    pub fn new(feature: Box<VectorGeometryTileFeature>) -> Self {
         Self {
-            feature: Box::new(VectorGeometryTileFeature),
             geometry: feature.geometry.clone(), // we need a mutable copy of the geometry for mergeLines()
-            //feature: feature, // we need a mutable copy of the geometry for mergeLines(),
+            feature: feature,
             formattedText: None,
             icon: None,
             sortKey: 0.0,

diff --git a/maplibre/src/sdf/layout/symbol_layout.rs b/maplibre/src/sdf/layout/symbol_layout.rs
@@ -1758,15 +1758,11 @@ mod tests {
             }],
             Box::new(SymbolGeometryTileLayer {
                 name: "layer".to_string(),
-                features: vec![SymbolGeometryTileFeature {
-                    feature: Box::new(VectorGeometryTileFeature),
-                    geometry: vec![GeometryCoordinates(vec![Point2D::new(1024, 1024)])],
-                    formattedText: None,
-                    icon: None,
-                    sortKey: 0.0,
-                    index: 0,
-                    allowsVerticalWritingMode: false,
-                }],
+                features: vec![SymbolGeometryTileFeature::new(Box::new(
+                    VectorGeometryTileFeature {
+                        geometry: vec![GeometryCoordinates(vec![Point2D::new(1024, 1024)])],
+                    },
+                ))],
             }),
             &mut LayoutParameters {
                 bucketParameters: &mut parameters.clone(),