From d205c381f156cd38442373ad09066e6324511b12 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Sun, 2 Apr 2023 20:39:44 -0400 Subject: [PATCH] Tessellator was broken for years! Revert-fixing. * Due to a typo in the cfg flag, tessellator was never built properly (we can even remove it as it is clearly not being used by anyone). * This is a known issues in the rust compiler: https://github.com/rust-lang/cargo/issues/10554 * I reverted Lyon to 0.16.2 and it worked fine. Do we want to keep this and spend the effort to upgrade to the latest Lyon crate, or is this a useless feature and should be removed? --- geozero/Cargo.toml | 2 +- geozero/src/lib.rs | 2 +- geozero/src/tessellator/tessellator.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geozero/Cargo.toml b/geozero/Cargo.toml index ca12b9b3..e122f616 100644 --- a/geozero/Cargo.toml +++ b/geozero/Cargo.toml @@ -40,7 +40,7 @@ geos = { version = "8.1", optional = true } gdal = { version = "0.14", default-features = false, optional = true } gdal-sys = { version = "0.8", optional = true } gpx = { version = "0.8", default-features = false, optional = true } -lyon = { version = "1.0", optional = true } +lyon = { version = "0.16.2", optional = true } log = "0.4.17" scroll = { version = "0.11", optional = true } sqlx = { version = "0.6", default-features = false, optional = true } diff --git a/geozero/src/lib.rs b/geozero/src/lib.rs index f7434b22..d772e85a 100644 --- a/geozero/src/lib.rs +++ b/geozero/src/lib.rs @@ -105,7 +105,7 @@ pub mod svg; #[cfg(feature = "with-svg")] pub use crate::svg::conversion::*; -#[cfg(feature = "with-tesselator")] +#[cfg(feature = "with-tessellator")] pub mod tessellator; #[cfg(feature = "with-wkb")] diff --git a/geozero/src/tessellator/tessellator.rs b/geozero/src/tessellator/tessellator.rs index 182ed2b0..0270cc09 100644 --- a/geozero/src/tessellator/tessellator.rs +++ b/geozero/src/tessellator/tessellator.rs @@ -135,7 +135,7 @@ impl VertexOutput for ObjWriter { #[cfg(test)] mod test { use super::*; - use crate::geojson_reader::read_geojson; + use crate::geojson::geojson_reader::read_geojson; #[test] fn point_geom() {