diff --git a/jts-test-runner/Cargo.toml b/jts-test-runner/Cargo.toml index d1b117839..775b64537 100644 --- a/jts-test-runner/Cargo.toml +++ b/jts-test-runner/Cargo.toml @@ -10,7 +10,7 @@ include_dir = { version = "0.6.0", features = ["glob"] } log = "0.4.14" serde = { version = "1.0.105", features = ["derive"] } serde-xml-rs = "0.5.0" -wkt = { version = "0.10.0", features = ["geo-types", "serde"] } +wkt = { version = "0.10.3", features = ["geo-types", "serde"] } [dev-dependencies] pretty_env_logger = "0.4.0" diff --git a/jts-test-runner/src/input.rs b/jts-test-runner/src/input.rs index 4a6a5594f..74134ebaa 100644 --- a/jts-test-runner/src/input.rs +++ b/jts-test-runner/src/input.rs @@ -38,7 +38,7 @@ pub(crate) struct Case { #[serde(default)] pub(crate) desc: String, - #[serde(deserialize_with = "wkt::deserialize_geometry")] + #[serde(deserialize_with = "wkt::deserialize_wkt")] pub(crate) a: Geometry, #[serde(deserialize_with = "deserialize_opt_geometry", default)] @@ -66,7 +66,7 @@ pub struct CentroidInput { pub struct ConvexHullInput { pub(crate) arg1: String, - #[serde(rename = "$value", deserialize_with = "wkt::deserialize_geometry")] + #[serde(rename = "$value", deserialize_with = "wkt::deserialize_wkt")] pub(crate) expected: geo::Geometry, } @@ -215,7 +215,7 @@ where D: Deserializer<'de>, { #[derive(Debug, Deserialize)] - struct Wrapper(#[serde(deserialize_with = "wkt::deserialize_geometry")] Geometry); + struct Wrapper(#[serde(deserialize_with = "wkt::deserialize_wkt")] Geometry); Option::::deserialize(deserializer).map(|opt_wrapped| opt_wrapped.map(|w| w.0)) }