From a2f879ba1446ade4b4bbdd334c0f5a740f579519 Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Mon, 18 Apr 2022 20:17:00 +0200
Subject: [PATCH] Remove custom vector_tile library because we use geozero now

---
 Cargo.lock                                 |  36 +--
 Cargo.toml                                 |   3 +-
 libs/vector_tile/Cargo.toml                |  19 --
 libs/vector_tile/build.rs                  |  18 --
 libs/vector_tile/spec                      |   1 -
 libs/vector_tile/src/encoding.rs           | 259 ---------------------
 libs/vector_tile/src/error.rs              |  21 --
 libs/vector_tile/src/geometry.rs           |  68 ------
 libs/vector_tile/src/lib.rs                |  37 ---
 libs/vector_tile/src/protos/.gitignore     |   2 -
 libs/vector_tile/src/protos/mod.rs         |   3 -
 libs/vector_tile/src/tests.rs              |  24 --
 libs/vector_tile/src/tile.rs               |  96 --------
 libs/vector_tile/test_data/europe.pbf      | Bin 15822 -> 0 bytes
 src/tessellation/layer.rs                  | 106 ---------
 {libs/vector_tile/src => src/util}/grid.rs |   0
 src/util/mod.rs                            |   1 +
 17 files changed, 4 insertions(+), 690 deletions(-)
 delete mode 100644 libs/vector_tile/Cargo.toml
 delete mode 100644 libs/vector_tile/build.rs
 delete mode 160000 libs/vector_tile/spec
 delete mode 100644 libs/vector_tile/src/encoding.rs
 delete mode 100644 libs/vector_tile/src/error.rs
 delete mode 100644 libs/vector_tile/src/geometry.rs
 delete mode 100644 libs/vector_tile/src/lib.rs
 delete mode 100644 libs/vector_tile/src/protos/.gitignore
 delete mode 100644 libs/vector_tile/src/protos/mod.rs
 delete mode 100644 libs/vector_tile/src/tests.rs
 delete mode 100644 libs/vector_tile/src/tile.rs
 delete mode 100644 libs/vector_tile/test_data/europe.pbf
 delete mode 100644 src/tessellation/layer.rs
 rename {libs/vector_tile/src => src/util}/grid.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index ab381c0d..b23f3476 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1777,6 +1777,7 @@ dependencies = [
  "reqwest-middleware-cache",
  "rstar 0.9.2",
  "style-spec",
+ "tile-grid",
  "tilejson-spec",
  "tokio",
  "tracing",
@@ -2359,31 +2360,6 @@ dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "protobuf"
-version = "2.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
-
-[[package]]
-name = "protobuf-codegen"
-version = "2.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707"
-dependencies = [
- "protobuf",
-]
-
-[[package]]
-name = "protobuf-codegen-pure"
-version = "2.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f8122fdb18e55190c796b088a16bdb70cd7acdcd48f7a8b796b58c62e532cc6"
-dependencies = [
- "protobuf",
- "protobuf-codegen",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.17"
@@ -3392,16 +3368,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vector-tile"
-version = "0.1.0"
-dependencies = [
- "log",
- "protobuf",
- "protobuf-codegen-pure",
- "tile-grid",
-]
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
diff --git a/Cargo.toml b/Cargo.toml
index cd17c7e0..afb197f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 
 members = [
-    "libs/vector_tile",
     "libs/style_spec",
     "libs/tilejson_spec",
     "libs/wgsl_validate",
@@ -87,6 +86,8 @@ rstar = { version = "0.9" }
 prost = "0.9"
 geozero = { git = "https://github.com/georust/geozero", rev = "373b731", default-features = false, features = ["with-mvt", "with-geo"]}
 
+tile-grid = "0.3"
+
 # Rendering
 wgpu = { version = "0.12" }
 lyon = { version = "0.17", features = [] }
diff --git a/libs/vector_tile/Cargo.toml b/libs/vector_tile/Cargo.toml
deleted file mode 100644
index ef7d0682..00000000
--- a/libs/vector_tile/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "vector-tile"
-version = "0.1.0"
-description = "A library for decoding vector tiles"
-readme = "README.md"
-categories = ["encoding"]
-edition = "2021"
-build = "build.rs"
-
-[dependencies]
-log = "0.4"
-protobuf = { version = "2.27", features = [] }
-tile-grid = "0.3"
-
-
-[build-dependencies]
-protobuf-codegen-pure = "2.27"
-
-
diff --git a/libs/vector_tile/build.rs b/libs/vector_tile/build.rs
deleted file mode 100644
index d4127f86..00000000
--- a/libs/vector_tile/build.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use protobuf_codegen_pure::Customize;
-use std::path::PathBuf;
-
-fn main() {
-    let out_path = PathBuf::from("src/protos");
-    protobuf_codegen_pure::Codegen::new()
-        .customize(Customize {
-            //carllerche_bytes_for_bytes: Some(true),
-            //carllerche_bytes_for_string: Some(true),
-            lite_runtime: Some(true),
-            ..Default::default()
-        })
-        .out_dir(out_path)
-        .inputs(&["spec/2.1/vector_tile.proto"])
-        .include("spec/2.1")
-        .run()
-        .expect("Codegen failed.");
-}
diff --git a/libs/vector_tile/spec b/libs/vector_tile/spec
deleted file mode 160000
index c8d178da..00000000
--- a/libs/vector_tile/spec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c8d178da65cce0ea474e3d99e3368970ce217093
diff --git a/libs/vector_tile/src/encoding.rs b/libs/vector_tile/src/encoding.rs
deleted file mode 100644
index 99895746..00000000
--- a/libs/vector_tile/src/encoding.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-use std::collections::HashMap;
-
-use crate::geometry::{
-    Command, Geometry, GeometryLineString, GeometryPoint, GeometryPolygon, LineTo, MoveTo,
-    MultiPoint, Point,
-};
-use crate::protos::vector_tile::{
-    Tile as ProtoTile, Tile_Feature as ProtoFeature, Tile_GeomType, Tile_Layer as ProtoLayer,
-    Tile_Value as ProtoValue,
-};
-use crate::tile::{Feature, Layer, PropertyValue, Tile};
-
-pub trait Decode<T> {
-    fn decode(self) -> T;
-}
-
-/// Decode a PropertyValue
-impl Decode<PropertyValue> for ProtoValue {
-    fn decode(mut self) -> PropertyValue {
-        if self.has_bool_value() {
-            PropertyValue::BoolValue(self.get_bool_value())
-        } else if self.has_string_value() {
-            PropertyValue::StringValue(self.take_string_value())
-        } else if self.has_float_value() {
-            PropertyValue::FloatValue(self.get_float_value())
-        } else if self.has_int_value() {
-            PropertyValue::IntValue(self.get_int_value())
-        } else if self.has_sint_value() {
-            PropertyValue::SIntValue(self.get_sint_value())
-        } else if self.has_uint_value() {
-            PropertyValue::UIntValue(self.get_uint_value())
-        } else if self.has_double_value() {
-            PropertyValue::DoubleValue(self.get_double_value())
-        } else {
-            PropertyValue::Unknown
-        }
-    }
-}
-
-/// Decode a list of PropertyValues
-impl Decode<Vec<PropertyValue>> for Vec<ProtoValue> {
-    fn decode(self) -> Vec<PropertyValue> {
-        self.into_iter().map(|value| value.decode()).collect()
-    }
-}
-
-const CMD_MOVE_TO: u32 = 1;
-const CMD_LINE_TO: u32 = 2;
-const CMD_CLOSE_PATH: u32 = 7;
-
-const CMD_MOVE_TO_PARAMETERS: usize = 2;
-const CMD_LINE_TO_PARAMETERS: usize = 2;
-const CMD_CLOSE_PATH_PARAMETERS: usize = 0;
-
-trait ZigZag {
-    /// Decodes a value from zigzag encoding
-    fn zagzig(self) -> i32;
-}
-
-impl ZigZag for u32 {
-    fn zagzig(self) -> i32 {
-        ((self >> 1) as i32) ^ (-((self & 1) as i32))
-    }
-}
-
-impl Decode<GeometryPoint> for Vec<u32> {
-    fn decode(self) -> GeometryPoint {
-        let mut points = vec![];
-        let mut i = 0;
-
-        while i < self.len() {
-            let command = self[i] & 0x7;
-
-            if command != CMD_MOVE_TO {
-                // FIXME: Not allowed in Points
-                panic!("error")
-            }
-
-            let count = self[i] >> 3;
-            i += 1;
-
-            for _ in 0..count {
-                points.push(Point::new(self[i].zagzig(), self[i + 1].zagzig()));
-
-                i += CMD_MOVE_TO_PARAMETERS;
-            }
-        }
-
-        match points.len() {
-            0 => GeometryPoint::Point(Point::new(0, 0)),
-            1 => GeometryPoint::Point(points.remove(0)),
-            _ => GeometryPoint::MultiPoint(MultiPoint::new(points)),
-        }
-    }
-}
-
-impl Decode<GeometryLineString> for Vec<u32> {
-    fn decode(self) -> GeometryLineString {
-        let mut commands = Vec::with_capacity(self.len()); // Create vec of maximum size
-        let mut i = 0;
-
-        while i < self.len() {
-            let command = self[i] & 0x7;
-
-            let count = self[i] >> 3;
-            i += 1;
-
-            match command {
-                CMD_MOVE_TO => {
-                    for _ in 0..count {
-                        commands.push(Command::MoveTo(MoveTo {
-                            x: self[i].zagzig(),
-                            y: self[i + 1].zagzig(),
-                        }));
-                        i += CMD_MOVE_TO_PARAMETERS;
-                    }
-                }
-                CMD_LINE_TO => {
-                    for _ in 0..count {
-                        commands.push(Command::LineTo(LineTo {
-                            x: self[i].zagzig(),
-                            y: self[i + 1].zagzig(),
-                        }));
-                        i += CMD_LINE_TO_PARAMETERS;
-                    }
-                }
-                CMD_CLOSE_PATH => {
-                    // FIXME: Not allowed in LineStrings
-                    panic!("error")
-                }
-                _ => {
-                    panic!("error")
-                }
-            }
-        }
-
-        GeometryLineString { commands }
-    }
-}
-
-impl Decode<GeometryPolygon> for Vec<u32> {
-    fn decode(self) -> GeometryPolygon {
-        let mut commands = vec![];
-        let mut i = 0;
-
-        while i < self.len() {
-            let command = self[i] & 0x7;
-            let count = self[i] >> 3;
-
-            // parsed command and count => +1
-            i += 1;
-
-            match command {
-                CMD_MOVE_TO => {
-                    for _ in 0..count {
-                        commands.push(Command::MoveTo(MoveTo {
-                            x: self[i].zagzig(),
-                            y: self[i + 1].zagzig(),
-                        }));
-                        i += CMD_MOVE_TO_PARAMETERS;
-                    }
-                }
-                CMD_LINE_TO => {
-                    for _ in 0..count {
-                        commands.push(Command::LineTo(LineTo {
-                            x: self[i].zagzig(),
-                            y: self[i + 1].zagzig(),
-                        }));
-                        i += CMD_LINE_TO_PARAMETERS;
-                    }
-                }
-                CMD_CLOSE_PATH => {
-                    if count != 1 {
-                        panic!("error")
-                    }
-                    commands.push(Command::Close);
-                    i += CMD_CLOSE_PATH_PARAMETERS;
-                }
-                _ => {
-                    panic!("error")
-                }
-            }
-        }
-
-        GeometryPolygon { commands }
-    }
-}
-
-/// Decode a Geometry
-impl Decode<Geometry> for ProtoFeature {
-    fn decode(self) -> Geometry {
-        match &self.get_field_type() {
-            Tile_GeomType::UNKNOWN => Geometry::Unknown,
-            Tile_GeomType::POINT => Geometry::GeometryPoint(self.geometry.decode()),
-            Tile_GeomType::LINESTRING => Geometry::GeometryLineString(self.geometry.decode()),
-            Tile_GeomType::POLYGON => Geometry::GeometryPolygon(self.geometry.decode()),
-        }
-    }
-}
-
-/// Decode a Feature
-// FIXME: Decoding is very slow right now on development builds of wasm: (Development: 15s, Production: 60ms)
-impl Decode<Feature> for (&mut ProtoLayer, ProtoFeature) {
-    fn decode(self) -> Feature {
-        let (layer, feature) = self;
-
-        let mut properties = HashMap::with_capacity(feature.tags.len());
-
-        let keys = &mut layer.keys;
-
-        for chunk in feature.tags.chunks(2) {
-            let key = chunk[0];
-            let value = chunk[1];
-
-            if let Some(actual_key) = keys.get(key as usize) {
-                let values = &layer.values;
-                if let Some(actual_value) = values.get(value as usize) {
-                    properties.insert(actual_key.clone(), actual_value.clone().decode());
-                }
-            }
-        }
-
-        let id = feature.get_id();
-        let geometry = feature.decode();
-
-        Feature::new(id, geometry, properties)
-    }
-}
-
-/// Decode a Layer
-impl Decode<Layer> for ProtoLayer {
-    fn decode(mut self) -> Layer {
-        let mut features = Vec::new();
-
-        while let Some(feature) = self.features.pop() {
-            features.insert(0, (&mut self, feature).decode())
-        }
-
-        Layer::new(
-            self.take_name(),
-            self.get_version(),
-            features,
-            self.get_extent(),
-        )
-    }
-}
-
-/// Decode a whole Tile
-impl Decode<Tile> for ProtoTile {
-    fn decode(mut self) -> Tile {
-        let mut layers = Vec::new();
-
-        while let Some(layer) = self.layers.pop() {
-            layers.insert(0, layer.decode())
-        }
-
-        Tile::new(layers)
-    }
-}
diff --git a/libs/vector_tile/src/error.rs b/libs/vector_tile/src/error.rs
deleted file mode 100644
index 2087a8d8..00000000
--- a/libs/vector_tile/src/error.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use protobuf::ProtobufError;
-use std::io;
-
-#[derive(Debug)]
-pub enum Error {
-    Generic(String),
-    Protobuf(ProtobufError),
-    IO(io::Error),
-}
-
-impl From<ProtobufError> for Error {
-    fn from(err: ProtobufError) -> Self {
-        Error::Protobuf(err)
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Self {
-        Error::IO(err)
-    }
-}
diff --git a/libs/vector_tile/src/geometry.rs b/libs/vector_tile/src/geometry.rs
deleted file mode 100644
index 9d972407..00000000
--- a/libs/vector_tile/src/geometry.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-#[derive(Debug, Clone)]
-pub enum GeometryPoint {
-    Point(Point),
-    MultiPoint(MultiPoint),
-    Unknown,
-}
-
-#[derive(Debug, Clone)]
-pub struct MultiPoint {
-    points: Vec<Point>,
-}
-
-#[derive(Debug, Clone)]
-pub struct Point {
-    x: i32,
-    y: i32,
-}
-
-/// Contains relative coordinates to which the cursor is moved
-#[derive(Debug, Clone)]
-pub struct MoveTo {
-    pub x: i32,
-    pub y: i32,
-}
-
-/// Contains relative coordinates to which a line is drawn
-#[derive(Debug, Clone)]
-pub struct LineTo {
-    pub x: i32,
-    pub y: i32,
-}
-
-#[derive(Debug, Clone)]
-pub enum Command {
-    MoveTo(MoveTo),
-    LineTo(LineTo),
-    Close,
-}
-
-#[derive(Debug, Clone)]
-pub struct GeometryLineString {
-    pub commands: Vec<Command>,
-}
-
-#[derive(Debug, Clone)]
-pub struct GeometryPolygon {
-    pub commands: Vec<Command>,
-}
-
-#[derive(Debug, Clone)]
-pub enum Geometry {
-    GeometryPoint(GeometryPoint),
-    GeometryLineString(GeometryLineString),
-    GeometryPolygon(GeometryPolygon),
-    Unknown,
-}
-
-impl Point {
-    pub(crate) fn new(x: i32, y: i32) -> Self {
-        Self { x, y }
-    }
-}
-
-impl MultiPoint {
-    pub(crate) fn new(points: Vec<Point>) -> Self {
-        Self { points }
-    }
-}
diff --git a/libs/vector_tile/src/lib.rs b/libs/vector_tile/src/lib.rs
deleted file mode 100644
index 1ec59064..00000000
--- a/libs/vector_tile/src/lib.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::fs::File;
-use std::io::{BufRead, BufReader};
-use std::path::Path;
-
-use protobuf::Message;
-
-use crate::encoding::Decode;
-use crate::error::Error;
-use crate::protos::vector_tile::Tile as TileProto;
-use crate::tile::Tile;
-
-mod encoding;
-mod protos;
-
-#[cfg(test)]
-mod tests;
-
-pub mod error;
-pub mod geometry;
-pub mod grid;
-pub mod tile;
-
-pub fn parse_tile<P: AsRef<Path>>(path: P) -> Result<Tile, Error> {
-    let f = File::open(path)?;
-    let mut reader = BufReader::new(f);
-    parse_tile_reader(&mut reader)
-}
-
-pub fn parse_tile_reader<B: BufRead>(reader: &mut B) -> Result<Tile, Error> {
-    let proto_tile = TileProto::parse_from_reader(reader)?;
-    Ok(proto_tile.decode())
-}
-
-pub fn parse_tile_bytes(bytes: &[u8]) -> Result<Tile, Error> {
-    let proto_tile = TileProto::parse_from_bytes(bytes)?;
-    Ok(proto_tile.decode())
-}
diff --git a/libs/vector_tile/src/protos/.gitignore b/libs/vector_tile/src/protos/.gitignore
deleted file mode 100644
index 1efd6264..00000000
--- a/libs/vector_tile/src/protos/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rs
-!mod.rs
\ No newline at end of file
diff --git a/libs/vector_tile/src/protos/mod.rs b/libs/vector_tile/src/protos/mod.rs
deleted file mode 100644
index 8851aed1..00000000
--- a/libs/vector_tile/src/protos/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#[path = "vector_tile.rs"]
-#[rustfmt::skip] // Skip because it does not exist without building
-pub mod vector_tile;
diff --git a/libs/vector_tile/src/tests.rs b/libs/vector_tile/src/tests.rs
deleted file mode 100644
index e6a71b8e..00000000
--- a/libs/vector_tile/src/tests.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use std::fs::File;
-use std::io::{BufReader, Cursor};
-
-use protobuf::Message;
-
-use crate::encoding::Decode;
-use crate::grid::{google_mercator, tile_coordinates_bavaria};
-use crate::protos::vector_tile::Tile;
-use crate::{parse_tile, parse_tile_reader};
-
-#[test]
-fn test_parsing_europe_pbf() {
-    parse_tile("libs/vector_tile/test_data/europe.pbf");
-}
-
-#[test]
-fn test_tile_coordinates_bavaria() {
-    println!("{:?}", tile_coordinates_bavaria(&google_mercator(), 6));
-}
-
-#[test]
-fn test_empty_fail() {
-    assert!(parse_tile_reader(&mut Cursor::new(&[])).is_err())
-}
diff --git a/libs/vector_tile/src/tile.rs b/libs/vector_tile/src/tile.rs
deleted file mode 100644
index f1dcbee1..00000000
--- a/libs/vector_tile/src/tile.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use crate::geometry::Geometry;
-use std::collections::HashMap;
-
-#[derive(Debug, Clone)]
-pub struct Tile {
-    layers: Vec<Layer>,
-}
-
-#[derive(Debug, Clone)]
-pub struct Layer {
-    name: String,
-    version: u32,
-    features: Vec<Feature>,
-    extent: u32,
-}
-
-#[derive(Debug, Clone)]
-pub struct Feature {
-    id: u64,
-    geometry: Geometry,
-    properties: HashMap<String, PropertyValue>,
-}
-
-#[derive(Debug, Clone)]
-pub enum PropertyValue {
-    StringValue(String),
-    FloatValue(f32),
-    DoubleValue(f64),
-    IntValue(i64),
-    UIntValue(u64),
-    SIntValue(i64),
-    BoolValue(bool),
-    Unknown,
-}
-
-impl Feature {
-    pub(crate) fn new(
-        id: u64,
-        geometry: Geometry,
-        properties: HashMap<String, PropertyValue>,
-    ) -> Self {
-        Feature {
-            id,
-            geometry,
-            properties,
-        }
-    }
-
-    pub fn id(&self) -> u64 {
-        self.id
-    }
-
-    pub fn geometry(&self) -> &Geometry {
-        &self.geometry
-    }
-    pub fn properties(&self) -> &HashMap<String, PropertyValue> {
-        &self.properties
-    }
-}
-
-impl Layer {
-    pub(crate) fn new(name: String, version: u32, features: Vec<Feature>, extent: u32) -> Self {
-        Layer {
-            name,
-            version,
-            features,
-            extent,
-        }
-    }
-
-    pub fn extent(&self) -> u32 {
-        self.extent
-    }
-
-    pub fn version(&self) -> u32 {
-        self.version
-    }
-
-    pub fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    pub fn features(&self) -> &Vec<Feature> {
-        &self.features
-    }
-}
-
-impl Tile {
-    pub(crate) fn new(layers: Vec<Layer>) -> Self {
-        Tile { layers }
-    }
-
-    pub fn layers(&self) -> &Vec<Layer> {
-        &self.layers
-    }
-}
diff --git a/libs/vector_tile/test_data/europe.pbf b/libs/vector_tile/test_data/europe.pbf
deleted file mode 100644
index bd48bf59e835f6d7231ef9704defef44e78aabf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15822
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

diff --git a/src/tessellation/layer.rs b/src/tessellation/layer.rs
deleted file mode 100644
index ae1c951f..00000000
--- a/src/tessellation/layer.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use std::ops::Add;
-
-use bytemuck::Pod;
-use lyon::geom::point;
-
-use lyon::lyon_tessellation::VertexBuffers;
-use lyon::path::{FillRule, Path};
-use lyon::tessellation::geometry_builder::MaxIndex;
-use lyon::tessellation::{
-    BuffersBuilder, FillOptions, FillTessellator, StrokeOptions, StrokeTessellator,
-};
-
-use crate::error::Error;
-
-use crate::render::ShaderVertex;
-use crate::tessellation::{Tessellated, VertexConstructor, DEFAULT_TOLERANCE};
-
-impl<I: Add + From<lyon::lyon_tessellation::VertexId> + MaxIndex + Pod> Tessellated<I> for Layer {
-    #[tracing::instrument(skip_all)]
-    fn tessellate(&self) -> Result<(VertexBuffers<ShaderVertex, I>, Vec<u32>), Error> {
-        let mut buffer: VertexBuffers<ShaderVertex, I> = VertexBuffers::new();
-        let mut feature_indices: Vec<u32> = Vec::new();
-        let mut current_index = 0;
-
-        for feature in self.features() {
-            match feature.geometry() {
-                Geometry::GeometryPolygon(polygon) => {
-                    let mut polygon_builder = Path::builder();
-                    let mut cursor = point(0.0, 0.0);
-                    for command in &polygon.commands {
-                        match command {
-                            Command::MoveTo(cmd) => {
-                                let delta = lyon::path::math::vector(cmd.x as f32, cmd.y as f32);
-                                cursor += delta;
-                                polygon_builder.begin(cursor);
-                            }
-                            Command::LineTo(cmd) => {
-                                let delta = lyon::path::math::vector(cmd.x as f32, cmd.y as f32);
-                                cursor += delta;
-                                polygon_builder.line_to(cursor);
-                            }
-                            Command::Close => {
-                                polygon_builder.close();
-                            }
-                        };
-                    }
-
-                    let mut fill_tessellator = FillTessellator::new();
-                    fill_tessellator.tessellate_path(
-                        &polygon_builder.build(),
-                        &FillOptions::tolerance(DEFAULT_TOLERANCE)
-                            .with_fill_rule(FillRule::NonZero),
-                        &mut BuffersBuilder::new(&mut buffer, VertexConstructor {}),
-                    )?;
-                }
-                Geometry::GeometryLineString(line_string) => {
-                    let mut line_string_builder = Path::builder();
-                    let mut cursor = point(0.0, 0.0);
-                    let mut subpath_open = false;
-                    for command in &line_string.commands {
-                        match command {
-                            Command::MoveTo(cmd) => {
-                                if subpath_open {
-                                    line_string_builder.end(false);
-                                }
-
-                                let delta = lyon::path::math::vector(cmd.x as f32, cmd.y as f32);
-                                cursor += delta;
-                                line_string_builder.begin(cursor);
-                                subpath_open = true;
-                            }
-                            Command::LineTo(cmd) => {
-                                let delta = lyon::path::math::vector(cmd.x as f32, cmd.y as f32);
-                                cursor += delta;
-                                line_string_builder.line_to(cursor);
-                            }
-                            Command::Close => {
-                                panic!("error")
-                            }
-                        };
-                    }
-
-                    if subpath_open {
-                        line_string_builder.end(false);
-                    }
-
-                    let mut stroke_tessellator = StrokeTessellator::new();
-
-                    stroke_tessellator.tessellate_path(
-                        &line_string_builder.build(),
-                        &StrokeOptions::tolerance(DEFAULT_TOLERANCE),
-                        &mut BuffersBuilder::new(&mut buffer, VertexConstructor {}),
-                    )?;
-                }
-                _ => {}
-            };
-
-            let next_index = buffer.indices.len();
-            let indices = (next_index - current_index) as u32;
-            feature_indices.push(indices);
-            current_index = next_index;
-        }
-
-        Ok((buffer, feature_indices))
-    }
-}
diff --git a/libs/vector_tile/src/grid.rs b/src/util/grid.rs
similarity index 100%
rename from libs/vector_tile/src/grid.rs
rename to src/util/grid.rs
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 1f1f2243..8a757f63 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,6 +1,7 @@
 //! Utils which are used internally
 
 mod fps_meter;
+pub mod grid;
 pub mod math;
 
 use crate::coords::WorldTileCoords;